X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/410801ac8f9ba8eb9b2aba42140892d1e1f4f745..18f94073fa55c7d32d0e84ee0d8d033a950a77b0:/debian/rules

diff --git a/debian/rules b/debian/rules
index e030330..1861c13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,24 +2,26 @@
 #
 # Copyright (C) 2004-2008 Richard Kettlewell
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+cgiexecdir=/usr/lib/cgi-bin
+httpdir=/var/www
+browser=x-www-browser
+
 # Options to configure.  This can be overridden by the caller if necessary.
-CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man --with-browser=x-www-browser
+CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man --with-browser=${browser} cgiexecdir="${cgiexecdir}" httpdir="${httpdir}"
 
 # Set DEB_BUILD_OPTIONS=noopt to produce a non-optimized build.
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -41,6 +43,12 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 INSTALL_PROGRAM += -s
 endif
 
+# Set DEB_BUILD_OPTIONS=parallel=N to do make -jN
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+PARALLEL = -j$(NUMJOBS)
+endif
+
 export INSTALL_DATA
 export INSTALL_SCRIPT
 export INSTALL_PROGRAM
@@ -52,12 +60,14 @@ SENDMAIL=/usr/sbin/sendmail
 LIBTOOL=./libtool
 FAKEROOT=fakeroot
 
-# ./prepare is the script that generates configure etc.  It only needs to be
+SHELL=bash
+
+# ./autogen.sh is the script that generates configure etc.  It only needs to be
 # run if building from a checkout rather than a tarball.
 build:
 	@set -e;if test ! -f configure; then \
-	  echo ./prepare;\
-	  ./prepare;\
+	  echo ./autogen.sh;\
+	  ./autogen.sh;\
 	fi
 	@set -e;if test ! -f config.status; then \
 	  echo ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
@@ -66,7 +76,7 @@ build:
 	  echo ./config.status;\
 	  ./config.status;\
 	fi
-	$(MAKE) SENDMAIL=${SENDMAIL}
+	$(MAKE) SENDMAIL=${SENDMAIL} ${PARALLEL}
 
 pkg-disorder: build
 	rm -rf debian/disorder
@@ -77,9 +87,15 @@ pkg-disorder: build
 	$(INSTALL_DATA) debian/copyright \
 		debian/disorder/usr/share/doc/disorder/copyright
 	$(INSTALL_DATA) debian/changelog \
-		debian/disorder/usr/share/doc/disorder/changelog.Debian
-	gzip -9 debian/disorder/usr/share/doc/disorder/changelog.Debian
-	@for f in preinst postinst prerm postrm conffiles templates config; do\
+		debian/disorder/usr/share/doc/disorder/changelog
+	gzip -9 debian/disorder/usr/share/doc/disorder/changelog*
+	@for f in conffiles templates; do\
+	  if test -e debian/$$f.disorder; then\
+	    echo $(INSTALL_DATA) debian/$$f.disorder debian/disorder/DEBIAN/$$f; \
+	    $(INSTALL_DATA) debian/$$f.disorder debian/disorder/DEBIAN/$$f; \
+	  fi;\
+	done
+	@for f in preinst postinst prerm postrm config; do\
 	  if test -e debian/$$f.disorder; then\
 	    echo $(INSTALL_SCRIPT) debian/$$f.disorder debian/disorder/DEBIAN/$$f; \
 	    $(INSTALL_SCRIPT) debian/$$f.disorder debian/disorder/DEBIAN/$$f; \
@@ -87,6 +103,8 @@ pkg-disorder: build
 	done
 	$(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C doc
 	$(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C clients
+	strip --remove-section=.comment debian/disorder/usr/bin/disorder
+	strip --remove-section=.comment debian/disorder/usr/bin/disorderfm
 	$(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C lib
 	$(INSTALL_DATA) scripts/completion.bash \
 		debian/disorder/etc/bash_completion.d/disorder
@@ -111,6 +129,10 @@ pkg-disorder: build
 		 debian/disorder/usr/share/doc/disorder/README.* \
 		 debian/disorder/usr/share/doc/disorder/BUGS \
 		 debian/disorder/usr/share/man/man*/*
+	cd debian/disorder && \
+		find -name DEBIAN -prune -o -type f -print \
+			| sed 's/^\.\///' \
+			| xargs md5sum > DEBIAN/md5sums
 	dpkg-gencontrol -isp -pdisorder -Pdebian/disorder -Tdebian/substvars.disorder
 	chown -R root:root debian/disorder
 	chmod -R g-ws debian/disorder
@@ -121,31 +143,48 @@ pkg-disorder-server: build
 	$(MKDIR) debian/disorder-server
 	$(MKDIR) debian/disorder-server/DEBIAN
 	$(MKDIR) debian/disorder-server/usr/share/doc/disorder-server
+	$(MKDIR) debian/disorder-server/usr/share/lintian/overrides
+	$(INSTALL_DATA) debian/overrides.disorder-server \
+	    debian/disorder-server/usr/share/lintian/overrides/disorder-server
 	$(INSTALL_DATA) debian/copyright \
 		debian/disorder-server/usr/share/doc/disorder-server/copyright
 	$(INSTALL_DATA) debian/changelog \
-		debian/disorder-server/usr/share/doc/disorder-server/changelog.Debian
-	gzip -9 debian/disorder-server/usr/share/doc/disorder-server/changelog.Debian
-	@for f in preinst postinst prerm postrm conffiles templates config; do\
+		debian/disorder-server/usr/share/doc/disorder-server/changelog
+	gzip -9 debian/disorder-server/usr/share/doc/disorder-server/changelog*
+	@for f in preinst postinst prerm postrm config; do\
 	  if test -e debian/$$f.disorder-server; then\
 	    echo $(INSTALL_SCRIPT) debian/$$f.disorder-server debian/disorder-server/DEBIAN/$$f; \
 	    $(INSTALL_SCRIPT) debian/$$f.disorder-server debian/disorder-server/DEBIAN/$$f; \
 	  fi;\
 	done
-	$(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C images
-	$(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C server
-	$(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C templates
-	$(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C driver
-	$(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C plugins
-	$(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C sounds
-	$(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C doc
+	@for f in conffiles templates; do\
+	  if test -e debian/$$f.disorder-server; then\
+	    echo $(INSTALL_DATA) debian/$$f.disorder-server debian/disorder-server/DEBIAN/$$f; \
+	    $(INSTALL_DATA) debian/$$f.disorder-server debian/disorder-server/DEBIAN/$$f; \
+	  fi;\
+	done
+	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C images
+	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C server
+	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C templates
+	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C plugins
+	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C sounds
+	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C doc
 	rm -rf debian/disorder-server/usr/share/man/man1
 	rm -rf debian/disorder-server/usr/share/man/man3
 	rm -f debian/disorder-server/usr/share/man/man5/disorder_config.5
+	rm -f debian/disorder-server/usr/share/man/man5/disorder_preferences.5
 	rm -f debian/disorder-server/usr/share/man/man5/disorder_protocol.5
+	find debian/disorder-server -name '*.la' -print0 | xargs -r0 rm -f
+	find debian/disorder-server -name '*.so.0' -print0 | xargs -r0 rm -f
+	@for f in debian/disorder-server/usr/lib/disorder/*.so.0.0.0; do \
+	  echo mv $$f $${f/.0.0.0};\
+	  mv $$f $${f/.0.0.0};\
+	done
+	find debian/disorder-server -name '*.so' -print0 | xargs -r0 strip --strip-unneeded
+	find debian/disorder-server -name '*.so' -print0 | xargs -r0 chmod -x
 	$(MKDIR) debian/disorder-server/etc/disorder
 	$(MKDIR) debian/disorder-server/etc/init.d
-	$(MKDIR) debian/disorder-server/usr/lib/cgi-bin
+	$(MKDIR) debian/disorder-server${cgiexecdir}
 	$(MKDIR) debian/disorder-server/var/lib/disorder
 	$(INSTALL_SCRIPT) examples/disorder.init \
 		debian/disorder-server/etc/init.d/disorder
@@ -155,14 +194,23 @@ pkg-disorder-server: build
 		debian/disorder-server/etc/disorder/options
 	$(INSTALL_DATA) debian/etc.disorder.options.user \
 		debian/disorder-server/etc/disorder/options.user
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cgi/disorder.cgi \
-		$(shell pwd)/debian/disorder-server/usr/lib/cgi-bin/disorder
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cgi/disorder \
+		$(shell pwd)/debian/disorder-server${cgiexecdir}/disorder
+	gzip -9f debian/disorder-server/usr/share/man/man*/*
 	dpkg-shlibdeps -Tdebian/substvars.disorder-server \
-		debian/disorder-server/usr/lib/cgi-bin/disorder \
+		debian/disorder-server${cgiexecdir}/disorder \
 		debian/disorder-server/usr/sbin/* \
-		debian/disorder-server/usr/lib/disorder/*.so*
+		debian/disorder-server/usr/lib/disorder/*.so
 	rm -rf debian/disorder-server/usr/share/doc/disorder-server
 	ln -s disorder debian/disorder-server/usr/share/doc/disorder-server
+	strip --remove-section=.comment \
+		debian/disorder-server/usr/sbin/* \
+		debian/disorder-server${cgiexecdir}/* \
+		debian/disorder-server/usr/lib/disorder/*.so
+	cd debian/disorder-server && \
+		find -name DEBIAN -prune -o -type f -print \
+			| sed 's/^\.\///' \
+			| xargs md5sum > DEBIAN/md5sums
 	dpkg-gencontrol -isp -pdisorder-server -Pdebian/disorder-server -Tdebian/substvars.disorder-server
 	chown -R root:root debian/disorder-server
 	chmod -R g-ws debian/disorder-server
@@ -176,8 +224,8 @@ pkg-disorder-playrtp: build
 	$(INSTALL_DATA) debian/copyright \
 		debian/disorder-playrtp/usr/share/doc/disorder-playrtp/copyright
 	$(INSTALL_DATA) debian/changelog \
-		debian/disorder-playrtp/usr/share/doc/disorder-playrtp/changelog.Debian
-	gzip -9 debian/disorder-playrtp/usr/share/doc/disorder-playrtp/changelog.Debian
+		debian/disorder-playrtp/usr/share/doc/disorder-playrtp/changelog
+	gzip -9 debian/disorder-playrtp/usr/share/doc/disorder-playrtp/changelog*
 	@for f in preinst postinst prerm postrm conffiles templates config; do\
 	  if test -e debian/$$f.disorder-playrtp; then\
 	    echo $(INSTALL_SCRIPT) debian/$$f.disorder-playrtp debian/disorder-playrtp/DEBIAN/$$f; \
@@ -188,15 +236,19 @@ pkg-disorder-playrtp: build
 	$(MKDIR) debian/disorder-playrtp/usr/share/man/man1
 	$(INSTALL_PROGRAM) clients/disorder-playrtp \
 		debian/disorder-playrtp/usr/bin/disorder-playrtp
+	strip --remove-section=.comment debian/disorder-playrtp/usr/bin/disorder-playrtp
 	$(INSTALL_DATA) doc/disorder-playrtp.1 \
 		debian/disorder-playrtp/usr/share/man/man1/disorder-playrtp.1
 	dpkg-shlibdeps -Tdebian/substvars.disorder-playrtp \
 		debian/disorder-playrtp/usr/bin/*
 	$(INSTALL_DATA) debian/README.RTP \
 		debian/disorder-playrtp/usr/share/doc/disorder-playrtp/README
-	$(INSTALL_DATA) CHANGES debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES
-	gzip -9f debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES \
-		 debian/disorder-playrtp/usr/share/man/man*/*
+	$(INSTALL_DATA) CHANGES.html debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES.html
+	gzip -9f debian/disorder-playrtp/usr/share/man/man*/*
+	cd debian/disorder-playrtp && \
+		find -name DEBIAN -prune -o -type f -print \
+			| sed 's/^\.\///' \
+			| xargs md5sum > DEBIAN/md5sums
 	dpkg-gencontrol -isp -pdisorder-playrtp -Pdebian/disorder-playrtp -Tdebian/substvars.disorder-playrtp
 	chown -R root:root debian/disorder-playrtp
 	chmod -R g-ws debian/disorder-playrtp
@@ -210,8 +262,8 @@ pkg-disobedience: build
 	$(INSTALL_DATA) debian/copyright \
 		debian/disobedience/usr/share/doc/disobedience/copyright
 	$(INSTALL_DATA) debian/changelog \
-		debian/disobedience/usr/share/doc/disobedience/changelog.Debian
-	gzip -9 debian/disobedience/usr/share/doc/disobedience/changelog.Debian
+		debian/disobedience/usr/share/doc/disobedience/changelog
+	gzip -9 debian/disobedience/usr/share/doc/disobedience/changelog*
 	@for f in preinst postinst prerm postrm conffiles templates config; do\
 	  if test -e debian/$$f.disobedience; then\
 	    echo $(INSTALL_SCRIPT) debian/$$f.disobedience debian/disobedience/DEBIAN/$$f; \
@@ -222,7 +274,9 @@ pkg-disobedience: build
 	$(MKDIR) debian/disobedience/usr/share/man/man1
 	$(MKDIR) debian/disobedience/usr/share/pixmaps
 	$(MKDIR) debian/disobedience/usr/share/menu
+	$(MKDIR) debian/disobedience/usr/share/doc-base
 	$(MAKE) -C disobedience install DESTDIR=`pwd`/debian/disobedience
+	strip --remove-section=.comment debian/disobedience/usr/bin/disobedience
 	$(INSTALL_DATA) doc/disobedience.1 \
 		debian/disobedience/usr/share/man/man1/disobedience.1
 	$(INSTALL_DATA) images/disobedience16x16.xpm \
@@ -230,10 +284,17 @@ pkg-disobedience: build
 			debian/disobedience/usr/share/pixmaps
 	$(INSTALL_DATA) debian/usr.share.menu.disobedience \
 		debian/disobedience/usr/share/menu/disobedience
+	$(INSTALL_DATA) debian/disobedience-manual \
+		debian/disobedience/usr/share/doc-base/disobedience-manual
+	gzip -9f debian/disobedience/usr/share/man/man*/*
 	dpkg-shlibdeps -Tdebian/substvars.disobedience \
 		debian/disobedience/usr/bin/*
 	rm -rf debian/disobedience/usr/share/doc/disobedience
 	ln -s disorder debian/disobedience/usr/share/doc/disobedience
+	cd debian/disobedience && \
+		find -name DEBIAN -prune -o -type f -print \
+			| sed 's/^\.\///' \
+			| xargs md5sum > DEBIAN/md5sums
 	dpkg-gencontrol -isp -pdisobedience -Pdebian/disobedience -Tdebian/substvars.disobedience
 	chown -R root:root debian/disobedience
 	chmod -R g-ws debian/disobedience
@@ -262,7 +323,7 @@ binary-arch: pkg-disorder pkg-disorder-server pkg-disorder-playrtp \
 binary-indep: 
 
 clean:
-	-$(MAKE) distclean
+	test -f Makefile && $(MAKE) distclean
 	rm -f config.cache
 	rm -f debian/files
 	rm -f debian/substvars.*