[SCM] polsarpro branch, master, updated. upstream/4.2.0+dfsg-31-g9c54c29

[Antonio Valentino]

The following commit has been merged in the master branch:
commit 686907dfae60ee18e98dabaa6721945b98e060af
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Oct 27 18:50:01 2013 +0100

    Avoid duplicate license files

diff --git a/debian/polsarpro.links b/debian/polsarpro.links
index a7d4975..63af4a5 100644
--- a/debian/polsarpro.links
+++ b/debian/polsarpro.links
@@ -1,3 +1,4 @@
 usr/share/polsarpro/PolSARpro.sh usr/bin/polsarpro
 usr/share/pixmaps/polsarpro usr/share/polsarpro/GUI/Images
 usr/lib/polsarpro usr/share/polsarpro/Soft
+usr/share/common-licenses/GPL-2 usr/share/polsarpro/Config/gpl.txt
diff --git a/debian/rules b/debian/rules
index f2a3176..ca4241c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,7 @@ override_dh_auto_install:
 		debian/tmp/usr/share/polsarpro/PolSARpro.sh
 
 	find debian/tmp/usr/share/polsarpro/Config -name Thumbs.db -delete
+	rm -f debian/tmp/usr/share/polsarpro/Config/gpl.txt
 
 	dos2unix debian/tmp/usr/share/polsarpro/*.sh
 	dos2unix debian/tmp/usr/share/polsarpro/ColorMap/*.pal

-- 
Polarimetric SAR Data Processing and Educational Tool