The following commit has been merged in the master branch: commit 34567e36684de3205f024b6f65064601ab3a88c4 Author: Antonio Valentino <antonio.valent...@tiscali.it> Date: Mon Feb 14 20:08:10 2011 +0100
Now the new upstream launch script is used diff --git a/debian/README.Debian b/debian/README.Debian index 04d289d..bcb3e36 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,25 +1,9 @@ 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 -expected directory layout. It also needs write permission on some -configuration files that are expected to be located inside the -SW distribution tree itself. +PolSARpro files are installed following the Debian FHS policy. +The original directory structure, needed to run PolSARpro properly, is +reconstructed in /usr/share/polsarpro using symbolic links. -This is not compatible with the Debian packaging guidelines so, to -overcome the issue, a small launch script has been written to re-create -the PolSARpro working environment in the user $HOME/.polsarpro and run -PolSARpro from there. - -In more detail the launch script: - -* creates a .polsarpro in the user $HOME -* creates symbolic links to all required folders in $HOME/.polsarpro -* makes a copy of configuration files in $HOME/.polsarpro (if not - already present) -* finally runs the main application (a Tcl/Tk program) from within of - $HOME/.polsarpro - - -- Antonio Valentino <antonio.valent...@tiscali.it> Sat, 06 Nov 2010 19:14:51 +0100 + -- Antonio Valentino <antonio.valent...@tiscali.it> Sun, 26 Dec 2010 19:43:32 +0100 diff --git a/debian/changelog b/debian/changelog index d14cb2c..7d37f19 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:05:20 +0100 + -- Antonio Valentino <antonio.valent...@tiscali.it> Mon, 14 Feb 2011 20:06:37 +0100 diff --git a/debian/patches/launch-script.patch b/debian/patches/launch-script.patch new file mode 100644 index 0000000..28dafec --- /dev/null +++ b/debian/patches/launch-script.patch @@ -0,0 +1,11 @@ +Improve the launch script to be more conformant to the Debian policy +--- a/PolSARpro.sh ++++ b/PolSARpro.sh +@@ -1,4 +1,6 @@ + #!/bin/sh + ++set -e + cd $(dirname $(readlink -f $0)) +-./PolSARpro_v4.2.0.tcl ++exec wish8.5 PolSARpro_v4.2.0.tcl "@" ++ diff --git a/debian/patches/series b/debian/patches/series index a4b2fde..fc9a9ff 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ default-config.patch fix-build.patch spelling.patch +launch-script.patch diff --git a/debian/polsarpro.install b/debian/polsarpro.install index 4e62e35..00161bf 100644 --- a/debian/polsarpro.install +++ b/debian/polsarpro.install @@ -1,8 +1,8 @@ -usr/bin/polsarpro usr/share/polsarpro/ColorMap usr/share/polsarpro/Config usr/share/polsarpro/GUI -usr/share/polsarpro/PolSARpro_v4.1.5.tcl +usr/share/polsarpro/PolSARpro_v*.tcl +usr/share/polsarpro/PolSARpro.sh usr/share/pixmaps/polsarpro.xpm usr/share/pixmaps/polsarpro/* usr/share/applications/polsarpro.desktop diff --git a/debian/polsarpro.links b/debian/polsarpro.links index a08fb3b..a7d4975 100644 --- a/debian/polsarpro.links +++ b/debian/polsarpro.links @@ -1,2 +1,3 @@ +usr/share/polsarpro/PolSARpro.sh usr/bin/polsarpro 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 deleted file mode 100644 index 8e33d3b..0000000 --- a/debian/polsarpro.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -set -e - -SHAREROOT=/usr/share/polsarpro -DOCROOT=/usr/share/doc/polsarpro-doc -PSPROOT=${HOME}/.polsarpro - -mkdir -p ${PSPROOT} -cd ${PSPROOT} - -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 ${DOCROOT}/TechDoc -ln -s -f ${DOCROOT}/Tutorial - -mkdir -p ${PSPROOT}/Config -cp -u ${SHAREROOT}/Config/gpl*.txt ${SHAREROOT}/Config/Version.txt ${PSPROOT}/Config -cp -n ${SHAREROOT}/Config/*.txt ${PSPROOT}/Config - -cp -sn ${SHAREROOT}/Config/*.pal ${PSPROOT}/Config -cp -sn ${SHAREROOT}/Config/*.kml ${PSPROOT}/Config -cp -sn ${SHAREROOT}/Config/*.bat ${PSPROOT}/Config -cp -sn ${SHAREROOT}/Config/*.bmp ${PSPROOT}/Config -cp -sn ${SHAREROOT}/Config/*.tif ${PSPROOT}/Config -cp -sn ${SHAREROOT}/Config/*.gif ${PSPROOT}/Config - -if [ ! -d ${PSPROOT}/Config/MyRoutines ]; then - cp -R ${SHAREROOT}/Config/MyRoutines ${PSPROOT}/Config -fi - -exec wish8.5 ${PSPROOT}/PolSARpro_v4.1.5.tcl "$@" diff --git a/debian/rules b/debian/rules index 9eec86a..fbfafa1 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk +UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p') build/polsarpro-bin:: $(MAKE) -f $(CURDIR)/debian/Makefile -C $(CURDIR)/Soft @@ -14,10 +15,14 @@ install/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 + 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 @@ -39,7 +44,6 @@ install/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 @@ -68,7 +72,6 @@ clean:: # Orig source -UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p') ORIGDIR=$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig .PHONY: get-orig-source -- Polarimetric SAR Data Processing and Educational Tool _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel