diff options
-rw-r--r-- | Makefile.am | 5 | ||||
-rwxr-xr-x | bootstrap.sh | 31 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | doc/README.html.in | 21 | ||||
-rw-r--r-- | doc/style.css | 15 |
5 files changed, 41 insertions, 35 deletions
diff --git a/Makefile.am b/Makefile.am index f084ca4..e5c5d80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,9 +33,6 @@ homepage: all dist mkdir -p $$HOME/homepage/private/projects/paman cp paman-@PACKAGE_VERSION@.tar.gz $$HOME/homepage/private/projects/paman cp doc/README.html doc/screenshot.png doc/style.css $$HOME/homepage/private/projects/paman - cp $$HOME/homepage/private/projects/paman/README.html $$HOME/homepage/private/projects/paman/index.html - -distcleancheck: - @: + ln -sf README.html $$HOME/homepage/private/projects/paman/index.html .PHONY: homepage distcleancheck diff --git a/bootstrap.sh b/bootstrap.sh index 62135f7..cf3c414 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -17,28 +17,41 @@ # along with Polypaudio Manager; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +VERSION=1.9 + run_versioned() { local P - type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1" + local V + + V=$(echo "$2" | sed -e 's,\.,,g') + + if [ -e "`which $1$V`" ] ; then + P="$1$V" + else + if [ -e "`which $1-$2`" ] ; then + P="$1-$2" + else + P="$1" + fi + fi shift 2 "$P" "$@" } +set -ex + if [ "x$1" = "xam" ] ; then - set -ex - run_versioned automake 1.7 -a -c --foreign + run_versioned automake "$VERSION" -a -c --foreign ./config.status else - set -ex - rm -rf autom4te.cache rm -f config.cache - run_versioned aclocal 1.7 - autoheader - run_versioned automake 1.7 -a -c --foreign - autoconf -Wall + run_versioned aclocal "$VERSION" + run_versioned autoconf 2.59 -Wall + run_versioned autoheader 2.59 + run_versioned automake "$VERSION" -a -c --foreign CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@" diff --git a/configure.ac b/configure.ac index c227e56..90ec48a 100644 --- a/configure.ac +++ b/configure.ac @@ -20,10 +20,10 @@ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. AC_PREREQ(2.57) -AC_INIT([paman],[0.7],[mzcnzna (at) 0pointer (dot) de]) +AC_INIT([paman],[0.8],[mzcnzna (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([src/paman.cc]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([foreign -Wall]) +AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/paman/]) diff --git a/doc/README.html.in b/doc/README.html.in index d886227..516f3c6 100644 --- a/doc/README.html.in +++ b/doc/README.html.in @@ -10,13 +10,13 @@ <body> <h1><a name="top">Polypaudio Manager @PACKAGE_VERSION@</a></h1> -<p><i>Copyright 2004 Lennart Poettering <@PACKAGE_BUGREPORT@></i></p> +<p><i>Copyright 2004-2006 Lennart Poettering <@PACKAGE_BUGREPORT@></i></p> <ul class="toc"> <li><a href="#license">License</a></li> <li><a href="#news">News</a></li> <li><a href="#overview">Overview</a></li> - <li><a href="#status">Status</a></li> + <li><a href="#status">Current Status</a></li> <li><a href="#documentation">Documentation</a></li> <li><a href="#requirements">Requirements</a></li> <li><a href="#installation">Installation</a></li> @@ -42,6 +42,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</p> <h2><a name="news">News</a></h2> +<div class="news-date">Fri Apr 21 2006: </div> <p class="news-text"><a +href="@PACKAGE_URL@paman-0.8.tar.gz">Version 0.8</a> released; changes include: compatibility with polypaudio 0.8</p> + <div class="news-date">Sun Nov 21 2004: </div> <p class="news-text"><a href="@PACKAGE_URL@paman-0.6.tar.gz">Version 0.6</a> released; changes include: compatibility with polypaudio 0.7</p> @@ -63,15 +66,15 @@ href="@PACKAGE_URL@paman-0.1.tar.gz">Version 0.1</a> released</p> <h2><a name="overview">Overview</a></h2> <p>Polypaudio Manager (<tt>paman</tt>) is a simple GTK frontend for the <a -href="http://0pointer.de/lennart/projects/polypaudio/">polypaudio</a> +href="http://0pointer.de/lennart/projects/polypaudio/">Polypaudio</a> sound server.</p> <p>Everybody loves <a href="@PACKAGE_URL@/screenshot.png">screenshots</a>.</p> -<h2><a name="status">Status</a></h2> +<h2><a name="status">Current Status</a></h2> <p>With the current version of <tt>paman</tt> you may browser most of -polypaudio's internals. There is support for changing volume of sinks +Polypaudio's internals. There is support for changing volume of sinks and sink outputs. You're able to play samples from the sample cache.</p> @@ -90,7 +93,7 @@ source code configuration.</p> <p><tt>paman</tt> requires <a href="http://gtkmm.sf.net/"><tt>gtkmm</tt></a> and <tt>glademmm</tt> installed.</p> -<p>Obviously <tt>paman</tt> requires an installation of <tt>polypaudio</tt> (version 0.7).</p> +<p>Obviously <tt>paman</tt> requires an installation of <tt>polypaudio</tt> (version 0.8).</p> <p>If you want to have the "Volume Meter" buttons working, your need to install <a href="http://0pointer.de/lennart/projects/pavumeter/">pavumeter</a>.</p> @@ -112,14 +115,14 @@ compilation and <tt>make install</tt> (as root) for installation of <p>The current release is <a href="@PACKAGE_URL@paman-@PACKAGE_VERSION@.tar.gz">@PACKAGE_VERSION@</a></p> -<p>Get <tt>paman</tt>'s development sources from the <a href="http://subversion.tigris.org/">Subversion</a> <a href="svn://seth.intheinter.net/paman">repository</a> (<a href="http://0pointer.de/cgi-bin/viewcvs.cgi/?root=paman">viewcvs</a>): </p> +<p>Get <tt>paman</tt>'s development sources from the <a href="http://subversion.tigris.org/">Subversion</a> <a href="svn://svn.0pointer.net/paman">repository</a> (<a href="http://0pointer.net/cgi-bin/viewcvs.cgi/?root=paman">viewcvs</a>): </p> -<pre>svn checkout svn://seth.intheinter.net/paman/trunk paman</pre> +<pre>svn checkout svn://svn.0pointer.net/paman/trunk paman</pre> <p>If you want to be notified whenever I release a new version of this software use the subscription feature of <a href="http://freshmeat.net/projects/paman/">Freshmeat</a>.</p> <hr/> -<address class="grey">Lennart Poettering <@PACKAGE_BUGREPORT@>, November 2004</address> +<address class="grey">Lennart Poettering <@PACKAGE_BUGREPORT@>, April 2006</address> <div class="grey"><i>$Id$</i></div> </body> diff --git a/doc/style.css b/doc/style.css index d44a401..8676969 100644 --- a/doc/style.css +++ b/doc/style.css @@ -18,17 +18,10 @@ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ***/ -body { color: black; background-color: white; margin: 0.5cm; } +body { color: black; background-color: white; } a:link, a:visited { color: #900000; } -p { margin-left: 0.5cm; margin-right: 0.5cm; } -div.news-date { margin-left: 0.5cm; font-size: 80%; color: #4f0000; } -p.news-text { margin-left: 1cm; } -h1 { color: #00009F; } -h2 { color: #00009F; } -h3 { color: #00004F; margin-left: 0.5cm; } -ul { margin-left: .5cm; } -ol { margin-left: .5cm; } -pre { margin-left: .5cm; background-color: #f0f0f0; padding: 0.4cm;} -.grey { color: #afafaf; } +div.news-date { font-size: 80%; font-style: italic; } +pre { background-color: #f0f0f0; padding: 0.4cm; } +.grey { color: #8f8f8f; font-size: 80%; } table { margin-left: 1cm; border:1px solid lightgrey; padding: 0.2cm; } td { padding-left:10px; padding-right:10px; } |