The following commit has been merged in the 6.2 branch: commit e97c54a7aba7b15dbb6e835b7efc7b582d0975b4 Author: Alan Boudreault <aboudrea...@mapgears.com> Date: Tue May 1 13:36:06 2012 +0000
Fix a bunch of lintian errors diff --git a/debian/control b/debian/control index bb29d10..ee2645f 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 8), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev (>= libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9), libjpeg-dev, libgdal1-dev (>=1.5.0), libproj-dev, libpq-dev, php5-dev, swig, python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), libgeos-dev (>= 3.2.1-1~), ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev, - sharutils, libsdl1.2-dev, libfreetype6-dev, + sharutils, libsdl1.2-dev, libfreetype6-dev, chrpath, libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, libreadline-dev, libfribidi-dev, libedit-dev, libepsilon-dev, libcairo2-dev Build-Conflicts: libcurl3-openssl-dev diff --git a/debian/rules b/debian/rules index 30c0e8d..34d3cbd 100755 --- a/debian/rules +++ b/debian/rules @@ -135,6 +135,7 @@ clean: clean-first-build dh_testdir dh_prep -$(RM) install-arch-stamp install-indep-stamp + -$(RM) -rf $(CURDIR)/debian/files [ ! -f Makefile ] || $(MAKE) distclean rm -f debian/*.debhelper.log @@ -153,16 +154,6 @@ install-arch-stamp: build-arch dh_installdirs -a dh_auto_install - -mkdir -p debian/tmp/usr/lib/ \ - debian/tmp/usr/lib/cgi-bin/ \ - debian/tmp/usr/bin - - # Main make install - #$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/ - - # CGI mapserver - install -m755 debian/tmp/usr/bin/mapserv debian/tmp/usr/lib/cgi-bin/mapserv - # Perl mapscript cd $(CURDIR)/mapscript/perl && \ $(MAKE) install DESTDIR=$(CURDIR)/debian/libmapscript-perl @@ -181,13 +172,19 @@ install-arch-stamp: build-arch $(MAKE) distclean ; \ done - # Mapserver Binary -# install -m755 legend scalebar shp2img shptree \ - shptreetst shptreevis sortshp tile4ms msencrypt \ - debian/tmp/usr/bin - touch install-arch-stamp + # removing embedded rpath in binaries + -find $(CURDIR)/debian/tmp/usr/bin -type f -exec chrpath --delete {} \; -# echo 'misc:Depends=phpapi-'$(PHP5API) >> debian/php5-mapscript.substvars + # remove la file in php ext dir + -$(RM) -rf $(CURDIR)/debian/tmp/usr/lib/php5/20090626/*.la + + # CGI mapserver + -mkdir -p debian/tmp/usr/lib/cgi-bin + install -m755 debian/tmp/usr/bin/mapserv debian/tmp/usr/lib/cgi-bin/mapserv + + echo 'misc:Depends=phpapi-'$(PHP5API) >> debian/php5-mapscript.substvars + + touch install-arch-stamp binary-indep: install-indep dh_testdir -i -- Mapserver _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel