Author: frankie
Date: 2009-02-11 17:18:10 +0000 (Wed, 11 Feb 2009)
New Revision: 1874

Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/rules
Log:
Some minor fixes for lintian complaining.


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog        2009-02-11 16:03:58 UTC (rev 
1873)
+++ packages/gdal/trunk/debian/changelog        2009-02-11 17:18:10 UTC (rev 
1874)
@@ -6,12 +6,15 @@
   * Removed gcc4.4.dpatch merged upstream.
   * Debhelper compatibility level moved to 7.
   * Deprecated dh_movefiles changed in dh_install. 
-  * Now uses the more capable internal TIFF libraries which enables BigTIFF 
support.
+  * Now uses the more capable internal TIFF library which allows BigTIFF 
+    support.
     It also fixes http://trac.osgeo.org/gdal/ticket/2486 issue.
-    Also, removed libtiff4-dev dependencies.
+    Removed libtiff4-dev dependencies.
     (closes: #501127)
   * [PATCH] doxygen.dpatch: missing gdalwarp.1 man page generation due to 
moving
     of doxygen stuff into source. This will be fixed in 1.6.1.
+  * Now uses dh_prep instead of deprecated dh_clean -k.
+  * Some minor clean-ups in debian/rules.
 
  -- Francesco Paolo Lovergine <fran...@debian.org>  Mon, 09 Feb 2009 17:32:12 
+0100
 

Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules    2009-02-11 16:03:58 UTC (rev 1873)
+++ packages/gdal/trunk/debian/rules    2009-02-11 17:18:10 UTC (rev 1874)
@@ -26,7 +26,7 @@
 configure: configure-stamp
 configure-stamp: patch-stamp
        dh_testdir
-
+       
        for V in $(PYVERS); do \
                PYTHON=/usr/bin/python$$V ./configure --prefix=/usr \
                        --mandir=\$$\{prefix\}/share/man \
@@ -51,11 +51,11 @@
                        --with-cfitsio=no; \
                mv GDALmake.opt GDALmake.opt-$$V; \
        done
-
+       
        # Overrides the generated libtool with official one, due to 
        # breakage in upstream version.
        cp /usr/bin/libtool $(CURDIR)/libtool
-
+       
        # Patch the generated libtool to avoid passing -rpath when linking,
        # and to explicitly link libraries against the libraries they
        # depend on.
@@ -65,18 +65,18 @@
        -e 's/^hardcode_into_libs.*$$/hardcode_into_libs=no/'
        mv libtool-2 libtool
        chmod 755 libtool 
+       
+       touch $@
 
-       touch configure-stamp
-
 build: configure-stamp build-stamp
 build-stamp: 
        dh_testdir
-
+       
        cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
        $(MAKE) lib-target apps-target 
        $(MAKE) -C $(CURDIR)/swig/perl generate build
        $(MAKE) -C $(CURDIR)/swig/ruby generate build
-
+       
        # it needs pre-installing just after the building due to intermediate 
cleaning
        for V in $(PYVERS); do \
                cp GDALmake.opt-$$V GDALmake.opt; \
@@ -88,29 +88,29 @@
        done
        $(MAKE) docs
        $(MAKE) man
+       
+       touch $@
 
-       touch build-stamp
-
 clean: clean-unpatched unpatch
 clean-unpatched:
        dh_testdir
        dh_testroot
-
+       
        [ ! -f GDALmake.opt ] || $(MAKE) distclean
        rm -rf $(CURDIR)/swig/ruby/.libs $(CURDIR)/swig/perl/*.bs
        rm -rf $(CURDIR)/swig/perl/*.c  $(CURDIR)/swig/perl/*.cpp
        rm -f GDALmake.opt-*
        rm -rf $(CURDIR)/man/man1
        rm -rf $(CURDIR)/debian/tmp $(CURDIR)/debian/python-tmp
+       
+       dh_clean 
 
-       dh_clean build-stamp configure-stamp
-
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k
+       dh_prep
        dh_installdirs
-
+       
        cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
        $(MAKE) install BINDINGS="perl ruby" DESTDIR=$(CURDIR)/debian/tmp \
                        INST_DATA="\$$(prefix)/share/gdal16" 
@@ -120,19 +120,19 @@
        $(MAKE) install-man DESTDIR=$(CURDIR)/debian/tmp \
                "INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\
                "INST_MAN=\$$(prefix)/share/man" 
-
+       
        # install python stuff previuosly built and pre-installed
        cp -a $(CURDIR)/debian/python-tmp/usr/lib/* 
$(CURDIR)/debian/tmp/usr/lib/.
        install -o root -g root -d $(CURDIR)/debian/tmp/usr/bin
        install -o root -g root -m 755 $(CURDIR)/swig/python/scripts/*.py 
$(CURDIR)/debian/tmp/usr/bin/.                                        
-
+       
        # removing license file
        rm -f $(CURDIR)/debian/tmp/usr/share/gdal16/LICENSE.TXT
        # removing empty packlist MakeMaker files 
        -find $(CURDIR)/debian/tmp/usr/local/lib/perl -type f -name .packlist 
-exec rm -f {} \;
        # removing embedded rpath in perl shlibs
        -find $(CURDIR)/debian/tmp/usr/local/lib/perl -type f -name "*.so" 
-exec chrpath --delete {} \;
-
+       
        # moves ruby/perl stuff the right dirs
        install -o root -g root -d $(CURDIR)/debian/tmp/usr/lib/perl5/auto
        install -o root -g root -d $(CURDIR)/debian/tmp/usr/lib/ruby/$(RUBYDEF)
@@ -167,4 +167,5 @@
        $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 binary: binary-arch binary-indep
+
 .PHONY: build clean binary-arch binary-indep binary-common binary install 
patch unpatch clean-unpatched gdal-grass-dist


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to