The following commit has been merged in the master branch:
commit 8853026dea3b3d067100bb5eb7f637fe8d8732f6
Author: Antonio Valentino <antonio.valent...@tiscali.it>
Date:   Fri Aug 19 18:54:36 2011 +0200

    Switch to dh8

diff --git a/debian/changelog b/debian/changelog
index 58ab39c..a40b1b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ polsarpro (4.2.0+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #606876)
 
- -- Antonio Valentino <antonio.valent...@tiscali.it>  Mon, 14 Feb 2011 
20:08:32 +0100
+ -- Antonio Valentino <antonio.valent...@tiscali.it>  Fri, 19 Aug 2011 
18:53:57 +0200
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index f0d3941..125a5f4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: contrib/science
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Antonio Valentino <antonio.valent...@tiscali.it>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), dos2unix
+Build-Depends: debhelper (>= 8.0.0), dos2unix
 Standards-Version: 3.9.2
 Homepage: http://earth.esa.int/polsarpro
 Vcs-Git: git://git.debian.org/git/pkg-grass/polsarpro.git
diff --git a/debian/rules b/debian/rules
index ccfe0dc..225bc8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,101 +1,104 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
+DH_OPTIONS=--sourcedirectory=Soft
 UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: 
([^+]+).*,\1,p')
 
-build/polsarpro-bin::
-       $(MAKE) -f $(CURDIR)/debian/Makefile -C $(CURDIR)/Soft
+%:
+       dh $@
 
+override_dh_auto_build:
+       $(MAKE) -f $(CURDIR)/debian/Makefile -C Soft
 
-install/polsarpro::
+override_dh_auto_install:
        # usr/lib/share/polsarpro
-       mkdir -p $(DEB_DESTDIR)/usr/share/polsarpro
-       cp -R --no-preserve=mode $(CURDIR)/ColorMap 
$(DEB_DESTDIR)/usr/share/polsarpro
-       cp -R --no-preserve=mode $(CURDIR)/Config   
$(DEB_DESTDIR)/usr/share/polsarpro
-       cp -R --no-preserve=mode $(CURDIR)/GUI      
$(DEB_DESTDIR)/usr/share/polsarpro
-       install -D --mode=0755 $(CURDIR)/PolSARpro_v$(UPSTREAM_VERSION).tcl \
-               
$(DEB_DESTDIR)/usr/share/polsarpro/PolSARpro_v$(UPSTREAM_VERSION).tcl
-       install -D --mode=0755 $(CURDIR)/PolSARpro.sh \
-               $(DEB_DESTDIR)/usr/share/polsarpro/PolSARpro.sh
-
-       find $(DEB_DESTDIR)/usr/share/polsarpro/Config -name Thumbs.db -delete
-
-       dos2unix $(DEB_DESTDIR)/usr/share/polsarpro/*.sh
-       dos2unix $(DEB_DESTDIR)/usr/share/polsarpro/ColorMap/*.pal
-       dos2unix $(DEB_DESTDIR)/usr/share/polsarpro/Config/*.pal
-       dos2unix $(DEB_DESTDIR)/usr/share/polsarpro/Config/*.txt
-       dos2unix $(DEB_DESTDIR)/usr/share/polsarpro/Config/*.bat
-       dos2unix $(DEB_DESTDIR)/usr/share/polsarpro/Config/*.kml
-       dos2unix $(DEB_DESTDIR)/usr/share/polsarpro/Config/MyRoutines/*.txt
-       dos2unix $(DEB_DESTDIR)/usr/share/polsarpro/GUI/*.bat
-       find $(DEB_DESTDIR)/usr/share/polsarpro/GUI -name '*.tcl' -exec 
dos2unix '{}' \;
-
-       chmod +x 
$(DEB_DESTDIR)/usr/share/polsarpro/Config/Find_Linux_FileName.bat
-       find $(DEB_DESTDIR)/usr/share/polsarpro/GUI -name '*.tcl' -exec chmod 
0755 '{}' \;
+       mkdir -p debian/tmp/usr/share/polsarpro
+       cp -R --no-preserve=mode ColorMap debian/tmp/usr/share/polsarpro
+       cp -R --no-preserve=mode Config   debian/tmp/usr/share/polsarpro
+       cp -R --no-preserve=mode GUI      debian/tmp/usr/share/polsarpro
+       install -D --mode=0755 PolSARpro_v$(UPSTREAM_VERSION).tcl \
+               
debian/tmp/usr/share/polsarpro/PolSARpro_v$(UPSTREAM_VERSION).tcl
+       install -D --mode=0755 PolSARpro.sh \
+               debian/tmp/usr/share/polsarpro/PolSARpro.sh
+
+       find debian/tmp/usr/share/polsarpro/Config -name Thumbs.db -delete
+
+       dos2unix debian/tmp/usr/share/polsarpro/*.sh
+       dos2unix debian/tmp/usr/share/polsarpro/ColorMap/*.pal
+       dos2unix debian/tmp/usr/share/polsarpro/Config/*.pal
+       dos2unix debian/tmp/usr/share/polsarpro/Config/*.txt
+       dos2unix debian/tmp/usr/share/polsarpro/Config/*.bat
+       dos2unix debian/tmp/usr/share/polsarpro/Config/*.kml
+       dos2unix debian/tmp/usr/share/polsarpro/Config/MyRoutines/*.txt
+       find debian/tmp/usr/share/polsarpro/GUI -name '*.tcl' -exec dos2unix 
'{}' \;
+
+       chmod +x debian/tmp/usr/share/polsarpro/Config/Find_Linux_FileName.bat
+       find debian/tmp/usr/share/polsarpro/GUI -name '*.tcl' -exec chmod 0755 
'{}' \;
 
        # usr/lib/share/pixmaps/polsarpro
-       mkdir -p $(DEB_DESTDIR)/usr/share/pixmaps
-       mv $(DEB_DESTDIR)/usr/share/polsarpro/GUI/Images 
$(DEB_DESTDIR)/usr/share/pixmaps/polsarpro
-       find $(DEB_DESTDIR)/usr/share/pixmaps/polsarpro -name Thumbs.db -delete
+       mkdir -p debian/tmp/usr/share/pixmaps
+       mv debian/tmp/usr/share/polsarpro/GUI/Images 
debian/tmp/usr/share/pixmaps/polsarpro
+       find debian/tmp/usr/share/pixmaps/polsarpro -name Thumbs.db -delete
 
-       install -D --mode 644 $(CURDIR)/debian/icons/*.gif 
$(DEB_DESTDIR)/usr/share/pixmaps/polsarpro
-       install -D --mode 644 $(CURDIR)/debian/icons/*.BMP 
$(DEB_DESTDIR)/usr/share/pixmaps/polsarpro
+       install -D --mode 644 debian/icons/*.gif 
debian/tmp/usr/share/pixmaps/polsarpro
+       install -D --mode 644 debian/icons/*.BMP 
debian/tmp/usr/share/pixmaps/polsarpro
 
        # misc
-       install -D --mode=0644 $(CURDIR)/debian/polsarpro.desktop 
$(DEB_DESTDIR)/usr/share/applications/polsarpro.desktop
-       install -D --mode=0644 $(CURDIR)/debian/polsarpro.xpm 
$(DEB_DESTDIR)/usr/share/pixmaps/polsarpro.xpm
-
-
-install/polsarpro-bin::
-       mkdir -p $(DEB_DESTDIR)/usr/lib/polsarpro
-       cp -R --no-preserve=mode $(CURDIR)/Soft/* 
$(DEB_DESTDIR)/usr/lib/polsarpro
-       find $(DEB_DESTDIR)/usr/lib/polsarpro -name '*.exe' -exec chmod 0755 
'{}' \;
-
-       find $(DEB_DESTDIR)/usr/lib/polsarpro -name '*.[hco]' -delete
-       find $(DEB_DESTDIR)/usr/lib/polsarpro -name '*.cpp' -delete
-       rm -rf $(DEB_DESTDIR)/usr/lib/polsarpro/lib
-       rm -rf $(DEB_DESTDIR)/usr/lib/polsarpro/tools/MyRoutines
-       rm -f $(DEB_DESTDIR)/usr/lib/polsarpro/Compil_*.bat
-       rm -f $(DEB_DESTDIR)/usr/lib/polsarpro/speckle_filter/dir.txt
-
-
-clean::
-       $(MAKE) -f $(CURDIR)/debian/Makefile -C $(CURDIR)/Soft clean
-       rm -f $(CURDIR)/debian/stamp-patched
-       touch $(CURDIR)/Config/GimpUnix.txt
-       touch $(CURDIR)/Config/GoogleEarthUnix.txt
-       touch $(CURDIR)/Config/MapReadyUnix.txt
-       touch $(CURDIR)/Config/NestUnix.txt
-       touch $(CURDIR)/Config/PDFReaderUnix.txt
-
+       install -D --mode=0644 debian/polsarpro.desktop 
debian/tmp/usr/share/applications/polsarpro.desktop
+       install -D --mode=0644 debian/polsarpro.xpm 
debian/tmp/usr/share/pixmaps/polsarpro.xpm
+
+       # binaries
+       mkdir -p debian/tmp/usr/lib/polsarpro
+       cp -R --no-preserve=mode Soft/* debian/tmp/usr/lib/polsarpro
+       find debian/tmp/usr/lib/polsarpro -name '*.exe' -exec chmod 0755 '{}' \;
+
+       find debian/tmp/usr/lib/polsarpro -name '*.[hco]' -delete
+       find debian/tmp/usr/lib/polsarpro -name '*.cpp' -delete
+       rm -rf debian/tmp/usr/lib/polsarpro/lib
+       rm -rf debian/tmp/usr/lib/polsarpro/tools/MyRoutines
+       rm -f debian/tmp/usr/lib/polsarpro/Compil_*.bat
+       rm -f debian/tmp/usr/lib/polsarpro/speckle_filter/dir.txt
+
+override_dh_auto_clean:
+       dh_auto_clean
+       $(MAKE) -f $(CURDIR)/debian/Makefile -C Soft clean
+       touch Config/GimpUnix.txt
+       touch Config/GoogleEarthUnix.txt
+       touch Config/ImageMagickUnix.txt
+       touch Config/MapReadyUnix.txt
+       touch Config/NestUnix.txt
+       touch Config/PDFReaderUnix.txt
 
 # Orig source
-ORIGDIR=$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig
-
-.PHONY: get-orig-source
+ORIGDIR=polsarpro-$(UPSTREAM_VERSION)+dfsg.orig
 
 get-orig-source:
-       uscan --force-download --no-symlink --download-current-version 
--destdir .. --verbose
-       rm -rf ../$(ORIGDIR)
-       mkdir ../$(ORIGDIR)
-       unzip ../PolSARpro_v$(UPSTREAM_VERSION)_Install_Linux.zip -d 
../$(ORIGDIR)
-       mv 
../$(ORIGDIR)/PolSARpro_v$(UPSTREAM_VERSION)_Install_Linux/PolSARpro_v$(UPSTREAM_VERSION)/*
 ../$(ORIGDIR)
-       rm -rf ../$(ORIGDIR)/PolSARpro_v$(UPSTREAM_VERSION)_Install_Linux
-       rm -rf ../$(ORIGDIR)/Help
-       rm -rf ../$(ORIGDIR)/TechDoc
-       rm -rf ../$(ORIGDIR)/Tutorial
-       rm -rf ../$(ORIGDIR)/Tmp
-       rm -rf ../$(ORIGDIR)/Log
-       rm -rf ../$(ORIGDIR)/Soft/lib/wgnuplot
-       rm -rf ../$(ORIGDIR)/*.pdf
-       find ../$(ORIGDIR)/Soft -name '*.exe' -delete
-       find ../$(ORIGDIR)/Soft -name '*.o' -delete
-       find ../$(ORIGDIR)/Soft -name '*.bak' -delete
-       find ../$(ORIGDIR) -name Thumbs.db -delete
-       rm ../$(ORIGDIR)/GUI/Images/google_earth.BMP
-       rm ../$(ORIGDIR)/GUI/Images/google_earth.gif
-       rm ../$(ORIGDIR)/GUI/Images/adobe_pdf.gif
-       rm ../$(ORIGDIR)/GUI/Images/adobe_pdf2.gif
-       tar -C .. -cf - $(ORIGDIR) | gzip -9f - > 
../$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-       rm -rf ../$(ORIGDIR)
+       uscan --no-symlink --download-current-version --destdir . --verbose
+       rm -rf $(ORIGDIR)
+       mkdir $(ORIGDIR)
+       unzip PolSARpro_v$(UPSTREAM_VERSION)_Install_Linux.zip -d $(ORIGDIR)
+       mv 
$(ORIGDIR)/PolSARpro_v$(UPSTREAM_VERSION)_Install_Linux/PolSARpro_v$(UPSTREAM_VERSION)/*
 $(ORIGDIR)
+       rm -rf $(ORIGDIR)/PolSARpro_v$(UPSTREAM_VERSION)_Install_Linux
+       rm -rf $(ORIGDIR)/Help
+       rm -rf $(ORIGDIR)/TechDoc
+       rm -rf $(ORIGDIR)/Tutorial
+       rm -rf $(ORIGDIR)/Tmp
+       rm -rf $(ORIGDIR)/Log
+       rm -rf $(ORIGDIR)/Soft/lib/wgnuplot
+       rm -rf $(ORIGDIR)/*.pdf
+       find $(ORIGDIR)/Soft -name '*.exe' -delete
+       find $(ORIGDIR)/Soft -name '*.o' -delete
+       find $(ORIGDIR)/Soft -name '*.bak' -delete
+       find $(ORIGDIR) -name Thumbs.db -delete
+       rm $(ORIGDIR)/GUI/Images/google_earth.BMP
+       rm $(ORIGDIR)/GUI/Images/google_earth.gif
+       rm $(ORIGDIR)/GUI/Images/adobe_pdf.gif
+       rm $(ORIGDIR)/GUI/Images/adobe_pdf2.gif
+       tar -cf - $(ORIGDIR) | gzip -9f - > 
polsarpro_$(UPSTREAM_VERSION)+dfsg.orig.tar.gz
+       rm -rf $(ORIGDIR)
+
+.PHONY: get-orig-source override_dh_auto_build override_dh_auto_install \
+        override_dh_auto_clean
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes

-- 
Polarimetric SAR Data Processing and Educational Tool

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

Reply via email to