User: pabs-guest Date: 06/01/31 13:22:54 Modified: debian changelog rules Log: Update debian/rules to use -arch/-indep targets for binary/install/build, and fix error moving mapserv to cgi-bin. Revision Changes Path 1.56 +2 -1 mapserver/debian/changelog CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/changelog?annotate=1.56&cvsroot= CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/changelog?rev=1.56&content-type=text/x-cvsweb-markup&cvsroot= CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/changelog.diff?r1=1.56&r2=1.55&cvsroot= ----------------------------------- Index: changelog =================================================================== RCS file: /cvsroot/pkg-grass/mapserver/debian/changelog,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- changelog 23 Jan 2006 09:02:18 -0000 1.55 +++ changelog 31 Jan 2006 13:22:54 -0000 1.56 @@ -12,8 +12,9 @@ and gdal, which are both priority extra. * Remove minor version from Standards-Version, since it is not needed. * Fix gdal build-dep - new upstream is libgdal1-1.3.1-dev + * Update debian/rules to use -arch/-indep targets for binary/install/build - -- Paul Wise <[EMAIL PROTECTED]> Mon, 23 Jan 2006 17:01:00 +0800 + -- Paul Wise <[EMAIL PROTECTED]> Tue, 31 Jan 2006 21:20:18 +0800 mapserver (4.6.1-6) unstable; urgency=low 1.16 +56 -31 mapserver/debian/rules CVSWEB Options: ------------------- CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/rules?annotate=1.16&cvsroot= CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/rules?rev=1.16&content-type=text/x-cvsweb-markup&cvsroot= CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/rules.diff?r1=1.16&r2=1.15&cvsroot= ----------------------------------- Index: rules =================================================================== RCS file: /cvsroot/pkg-grass/mapserver/debian/rules,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- rules 28 Dec 2005 10:48:11 -0000 1.15 +++ rules 31 Jan 2006 13:22:54 -0000 1.16 @@ -72,7 +72,13 @@ touch configure-php5-stamp -build-stamp: configure-stamp mapscriptvars +build: build-indep build-arch + +build-indep: + # No building required yet + +build-arch: build-arch-stamp +build-arch-stamp: configure-stamp mapscriptvars dh_testdir # Build binary lib @@ -87,7 +93,7 @@ cd $(CURDIR)/mapscript/python && \ $(PYTHON) setup.py build - touch build-stamp + touch build-arch-stamp build-php4-stamp: configure-php4-stamp dh_testdir @@ -112,7 +118,7 @@ clean-first-build: mapscriptvars dh_testdir - -$(RM) configure-stamp build-stamp + -$(RM) configure-stamp build-arch-stamp -$(RM) tile4ms -cd mapscript/perl && $(MAKE) distclean @@ -136,22 +142,29 @@ clean: unpatch clean-first-build dh_testdir dh_clean - -$(RM) configure-php4-stamp configure-php5-stamp build-php4-stamp build-php5-stamp install-stamp install-php4-stamp install-php5-stamp + -$(RM) configure-php4-stamp configure-php5-stamp build-php4-stamp build-php5-stamp install-arch-stamp install-indep-stamp install-php4-stamp install-php5-stamp -$(MAKE) distclean - -install: install-stamp install-php4-stamp install-php5-stamp -install-stamp: build-stamp - dh_testdir - dh_testroot - dh_installdirs +install-indep: install-indep-stamp +install-indep-stamp: + dh_testdir -i + dh_testroot -i + dh_installdirs -i + dh_install -i + touch install-indep-stamp + +install-arch: install-arch-stamp install-php4-stamp install-php5-stamp +install-arch-stamp: build-arch-stamp + dh_testdir -a + dh_testroot -a + dh_installdirs -a -mkdir -p debian/tmp/usr/lib/ debian/tmp/usr/include/ \ debian/tmp/usr/lib/cgi-bin/ \ debian/tmp/usr/bin # CGI mapserver - install -m755 mapserv debian/tmp/usr/bin/mapserv + install -m755 mapserv debian/tmp/usr/lib/cgi-bin/mapserv # Perl mapscript cd $(CURDIR)/mapscript/perl && \ @@ -167,7 +180,7 @@ install -m755 shp2mysql.pl legend scalebar shp2img shptree \ shptreetst shptreevis sortshp \ debian/tmp/usr/bin - touch install-stamp + touch install-arch-stamp install-php4-stamp: build-php4-stamp @@ -198,31 +211,43 @@ touch install-php5-stamp -binary-indep: install - -binary-arch: install - dh_testdir - dh_testroot - dh_movefiles - dh_installchangelogs HISTORY.TXT - dh_installdocs +binary-indep: install-indep + dh_testdir -i + dh_testroot -i + dh_installchangelogs -i HISTORY.TXT + dh_installdocs -i + dh_installdebconf -i + dh_compress -i + dh_link -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: install-arch + dh_testdir -a + dh_testroot -a + dh_movefiles -a + dh_installchangelogs -a HISTORY.TXT + dh_installdocs -a dh_installdebconf -a - dh_compress - dh_link - dh_strip - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps + dh_compress -a + dh_link -a + dh_strip -a + dh_fixperms -a + dh_makeshlibs -a + dh_installdeb -a + dh_shlibdeps -a dh_perl -pperl-mapscript dh_perl -pmapserver-bin dh_python -ppython-mapscript - dh_gencontrol - dh_md5sums - dh_builddeb + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install install-indep install-arch include /usr/share/dpatch/dpatch.make
_______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
