[DebianGIS-dev] [SCM] polsarpro branch, master, updated. upstream/4.1.5+ds-6-g4ba1c31

Antonio Valentino antonio.valentino at tiscali.it
Fri Jan 7 18:09:23 UTC 2011


The following commit has been merged in the master branch:
commit b736048c76b004c488cacf03be8d9701d831af0d
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Fri Jan 7 11:02:10 2011 +0100

    New package layout
    
    * the GUI program (tcl/tk code) and all arch independent files are
      now in the main polsarpro package (dropped polsarpro-data package)
    * all arch dependent files are in the new polsarpro-bin sub-package

diff --git a/debian/README.Debian b/debian/README.Debian
index 16c1e42..04d289d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,7 +2,7 @@ PolSARpro for Debian
 --------------------
 
 In order be run properly PolSARpro needs to be started from a specific
-folder, the root folder of the SW distribution that must have the
+folder, the root folder of the SW distribution, that must have the
 expected directory layout. It also needs write permission on some
 configuration files that are expected to be located inside the
 SW distribution tree itself.
diff --git a/debian/control b/debian/control
index 2365e41..99a4167 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,9 @@ Standards-Version: 3.9.1
 Homepage: http://earth.esa.int/polsarpro
 
 Package: polsarpro
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
-         polsarpro-data (=${source:Version}),
+Architecture: all
+Depends: ${misc:Depends}, polsarpro-bin (>=${source:Upstream-Version}),
+         polsarpro-bin (<<${source:Upstream-Version}+1),
          tcl8.5, tk8.5, bwidget, itcl3, itk3, iwidgets4, libtk-img
 Recommends: polsarpro-doc, xdg-utils, pdf-viewer
 Suggests: mapready, gimp, googleearth, imagemagick
@@ -33,11 +33,11 @@ Description: Polarimetric SAR Data Processing and Educational Tool
  initiative is a direct result of recommendations made at the POLInSAR
  Workshops held at ESRIN in January 2003, 2005 and 2007.
 
-Package: polsarpro-data
-Architecture: all
-Depends: ${misc:Depends}
+Package: polsarpro-bin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: polsarpro
-Description: Polarimetric SAR Data Processing and Educational Tool data
+Description: Polarimetric SAR Data Processing and Educational Tool binary files
  The Polarimetric SAR Data Processing and Educational Tool aims to
  facilitate the accessibility and exploitation of multi-polarised SAR
  datasets including those from ESA Third Party Missions (ALOS PALSAR),
@@ -56,4 +56,4 @@ Description: Polarimetric SAR Data Processing and Educational Tool data
  initiative is a direct result of recommendations made at the POLInSAR
  Workshops held at ESRIN in January 2003, 2005 and 2007.
  .
- This package contains support data for PolSARPro.
+ This package contains binary programs for PolSARPro.
diff --git a/debian/polsarpro-bin.install b/debian/polsarpro-bin.install
new file mode 100644
index 0000000..25828b2
--- /dev/null
+++ b/debian/polsarpro-bin.install
@@ -0,0 +1 @@
+usr/lib/polsarpro
diff --git a/debian/polsarpro-data.install b/debian/polsarpro-data.install
deleted file mode 100644
index 732beca..0000000
--- a/debian/polsarpro-data.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/polsarpro/ColorMap
-usr/share/polsarpro/Config
-usr/share/pixmaps/polsarpro/*
diff --git a/debian/polsarpro-data.links b/debian/polsarpro-data.links
deleted file mode 100644
index 55fa0cb..0000000
--- a/debian/polsarpro-data.links
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/polsarpro/ColorMap usr/lib/polsarpro/ColorMap
-usr/share/polsarpro/Config usr/lib/polsarpro/Config
-usr/share/pixmaps/polsarpro usr/lib/polsarpro/GUI/Images
diff --git a/debian/polsarpro.install b/debian/polsarpro.install
index d2cdf84..4e62e35 100644
--- a/debian/polsarpro.install
+++ b/debian/polsarpro.install
@@ -1,6 +1,8 @@
 usr/bin/polsarpro
-usr/lib/polsarpro/GUI
-usr/lib/polsarpro/Soft
-usr/lib/polsarpro/PolSARpro_v4.1.5.tcl
+usr/share/polsarpro/ColorMap
+usr/share/polsarpro/Config
+usr/share/polsarpro/GUI
+usr/share/polsarpro/PolSARpro_v4.1.5.tcl
 usr/share/pixmaps/polsarpro.xpm
+usr/share/pixmaps/polsarpro/*
 usr/share/applications/polsarpro.desktop
diff --git a/debian/polsarpro.links b/debian/polsarpro.links
new file mode 100644
index 0000000..a08fb3b
--- /dev/null
+++ b/debian/polsarpro.links
@@ -0,0 +1,2 @@
+usr/share/pixmaps/polsarpro usr/share/polsarpro/GUI/Images
+usr/lib/polsarpro usr/share/polsarpro/Soft
diff --git a/debian/polsarpro.sh b/debian/polsarpro.sh
index a9d8365..2315de1 100644
--- a/debian/polsarpro.sh
+++ b/debian/polsarpro.sh
@@ -1,32 +1,32 @@
 #!/bin/sh
 
-LIBROOT=/usr/lib/polsarpro
-DATAROOT=/usr/share/polsarpro
+SHAREROOT=/usr/share/polsarpro
 DOCROOT=/usr/share/doc/polsarpro-doc
 PSPROOT=${HOME}/.polsarpro
 
 mkdir -p ${PSPROOT}
 cd ${PSPROOT}
 
-ln -s -f ${DATAROOT}/ColorMap
-ln -s -f ${LIBROOT}/GUI
+ln -s -f ${SHAREROOT}/PolSARpro_v4.1.5.tcl
+ln -s -f ${SHAREROOT}/ColorMap
+ln -s -f ${SHAREROOT}/GUI
+ln -s -f ${SHAREROOT}/Soft
 ln -s -f ${DOCROOT}/Help
-ln -s -f ${LIBROOT}/Soft
 ln -s -f ${DOCROOT}/TechDoc
 ln -s -f ${DOCROOT}/Tutorial
 
 mkdir -p ${PSPROOT}/Config
-cp -n ${DATAROOT}/Config/gpl*.txt ${DATAROOT}/Config/Version.txt ${PSPROOT}/Config
-for f in ${DATAROOT}/Config/*.txt; do
+cp -n ${SHAREROOT}/Config/gpl*.txt ${SHAREROOT}/Config/Version.txt ${PSPROOT}/Config
+for f in ${SHAREROOT}/Config/*.txt; do
     if [ ! -f ${PSPROOT}/Config/$(basename $f) ]; then
         cp $f ${PSPROOT}/Config
     fi
 done
 
-cp -s ${DATAROOT}/Config/* ${PSPROOT}/Config >> /dev/null 2>&1
+cp -s ${SHAREROOT}/Config/* ${PSPROOT}/Config >> /dev/null 2>&1
 
 if [ ! -d ${PSPROOT}/Config/MyRoutines ]; then
-    cp -R ${DATAROOT}/Config/MyRoutines ${PSPROOT}/Config
+    cp -R ${SHAREROOT}/Config/MyRoutines ${PSPROOT}/Config
 fi
 
-exec wish8.5 ${LIBROOT}/PolSARpro_v4.1.5.tcl "$@"
+exec wish8.5 ${PSPROOT}/PolSARpro_v4.1.5.tcl "$@"
diff --git a/debian/rules b/debian/rules
index 50a5d73..1ba7af2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,42 +4,17 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 
-build/polsarpro::
+build/polsarpro-bin::
 	$(MAKE) -f $(CURDIR)/debian/Makefile -C $(CURDIR)/Soft
 
 
 install/polsarpro::
-	# usr/lib/polsarpro
-	mkdir -p $(DEB_DESTDIR)/usr/lib/polsarpro
-	cp -R --no-preserve=mode $(CURDIR)/GUI  $(DEB_DESTDIR)/usr/lib/polsarpro
-	cp -R --no-preserve=mode $(CURDIR)/Soft $(DEB_DESTDIR)/usr/lib/polsarpro
-	install -D --mode=0755 $(CURDIR)/PolSARpro_v4.1.5.tcl $(DEB_DESTDIR)/usr/lib/polsarpro/PolSARpro_v4.1.5.tcl
-
-	find $(DEB_DESTDIR)/usr/lib/polsarpro -name '*.[hc]' -delete
-	rmdir $(DEB_DESTDIR)/usr/lib/polsarpro/Soft/lib
-	rmdir $(DEB_DESTDIR)/usr/lib/polsarpro/Soft/tools/MyRoutines
-	rm -rf $(DEB_DESTDIR)/usr/lib/polsarpro/GUI/Images
-
-	rm -f $(DEB_DESTDIR)/usr/lib/polsarpro/Soft/Compil_*.bat
-	rm -f $(DEB_DESTDIR)/usr/lib/polsarpro/Soft/Makefile
-	rm -f $(DEB_DESTDIR)/usr/lib/polsarpro/Soft/speckle_filter/dir.txt
-
-	dos2unix $(DEB_DESTDIR)/usr/lib/polsarpro/GUI/*.bat
-	find $(DEB_DESTDIR)/usr/lib/polsarpro/GUI -name '*.tcl' -exec dos2unix '{}' \;
-	find $(DEB_DESTDIR)/usr/lib/polsarpro/GUI -name '*.tcl' -exec chmod 0755 '{}' \;
-	find $(DEB_DESTDIR)/usr/lib/polsarpro/Soft -name '*.exe' -exec chmod 0755 '{}' \;
-
-	# misc
-	install -D --mode=0755 $(CURDIR)/debian/polsarpro.sh $(DEB_DESTDIR)/usr/bin/polsarpro
-	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-data::
 	# 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_v4.1.5.tcl $(DEB_DESTDIR)/usr/share/polsarpro/PolSARpro_v4.1.5.tcl
 
 	find $(DEB_DESTDIR)/usr/share/polsarpro/Config -name Thumbs.db -delete
 
@@ -49,19 +24,40 @@ install/polsarpro-data::
 	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 '{}' \;
 
 	# usr/lib/share/pixmaps/polsarpro
 	mkdir -p $(DEB_DESTDIR)/usr/share/pixmaps
-	cp -R --no-preserve=mode $(CURDIR)/GUI/Images $(DEB_DESTDIR)/usr/share/pixmaps/polsarpro
+	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
 
 	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
 
+	# misc
+	install -D --mode=0755 $(CURDIR)/debian/polsarpro.sh $(DEB_DESTDIR)/usr/bin/polsarpro
+	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 '*.[hc]' -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
@@ -70,10 +66,6 @@ clean::
 	touch $(CURDIR)/Config/PDFReaderUnix.txt
 
 
-cleanbuilddir/polsarpro::
-	$(MAKE) -f $(CURDIR)/debian/Makefile -C $(CURDIR)/Soft clean
-
-
 # Orig source
 UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
 ORIGDIR=$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig

-- 
Polarimetric SAR Data Processing and Educational Tool



More information about the Pkg-grass-devel mailing list