[SCM] polsarpro branch, master, updated. upstream/4.1.5+ds-16-g2221d32

[Antonio Valentino]

The following commit has been merged in the master branch:
commit b5117d5062e0ad6cc37d1a15c969ffc99bd15fd7
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Mon Feb 14 19:46:56 2011 +0100

    Prepare for new upstream version
    
     * updated version in debian changelog (now dfsg suffix is used)
     * wacth file updated to use dfsg suffix
     * updated get-orig-source rule to play nice with the new upstream tarball

diff --git a/debian/changelog b/debian/changelog
index 5c953fd..bfbc0fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-polsarpro (4.1.5+ds-1) unstable; urgency=low
+polsarpro (4.2.0+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #606876)
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Thu, 30 Dec 2010 13:17:40 +0100
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Mon, 14 Feb 2011 19:46:01 +0100
diff --git a/debian/rules b/debian/rules
index 1ba7af2..c89ef7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,13 +77,18 @@ get-orig-source:
 	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
diff --git a/debian/watch b/debian/watch
index 927ef2d..172443d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,9 +2,9 @@
 version=3
 
 # HTTP
-#opts=dversionmangle=s/\+ds// \
+#opts=dversionmangle=s/\+dfsg// \
 #    http://earth.esa.int/pub/polsarpro_ftp/PolSARpro_v(.*)_Install_Linux\.zip
 
 # FTP
-opts=dversionmangle=s/\+ds// \
+opts=dversionmangle=s/\+dfsg// \
     ftp://ftp.esrin.esa.it/pub/polsarpro_ftp/PolSARpro_v(.*)_Install_Linux\.zip

-- 
Polarimetric SAR Data Processing and Educational Tool