[SCM] jxplorer - Java LDAP browser branch, master, updated. debian/3.2.2_rc1+dfsg-3-15-g03b0afc

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit 0d29651bff260e3ead3cecf29c4587bfa7a7b8ee
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Aug 11 01:37:47 2012 +0200

    Fix Perl path in scripts for translation.

diff --git a/debian/rules b/debian/rules
index 019bdac..c6fef3b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ CLASSPATH := $(CLASSPATH):./jxplorer.jar:./jxplorer_help.jar
 export CLASSPATH
 
 VERSION := $(shell dpkg-parsechangelog|sed -n '/^Version/{s/Version: \(.*\)-[0-9]*$$/\1/;s/+dfsg//p}')
-DESTDIR := debian/jxplorer
+USRSHARE:= debian/jxplorer/usr/share
 TEMPDIR := .tmp-orig-source
 
 %:
@@ -35,25 +35,27 @@ override_dh_auto_clean:
 	rm -f build-stamp jxplorer.jar
 	rm -rf help/SearchData
 
-override_dh_auto_install:
+override_dh_install:
 	dh_install
-	install -d -m 755 $(DESTDIR)/usr/share/icons/hicolor/16x16/apps
+	install -d -m 755 $(USRSHARE)/icons/hicolor/16x16/apps
 	convert images/logo_64.png -scale 16x16 \
-		$(DESTDIR)/usr/share/icons/hicolor/16x16/apps/jxplorer.png
-	install -d -m 755 $(DESTDIR)/usr/share/icons/hicolor/22x22/apps
+		$(USRSHARE)/icons/hicolor/16x16/apps/jxplorer.png
+	install -d -m 755 $(USRSHARE)/icons/hicolor/22x22/apps
 	convert images/logo_64.png -scale 22x22 \
-		$(DESTDIR)/usr/share/icons/hicolor/22x22/apps/jxplorer.png
-	install -d -m 755 $(DESTDIR)/usr/share/icons/hicolor/48x48/apps
+		$(USRSHARE)/icons/hicolor/22x22/apps/jxplorer.png
+	install -d -m 755 $(USRSHARE)/icons/hicolor/48x48/apps
 	convert images/logo_64.png -scale 48x48 \
-		$(DESTDIR)/usr/share/icons/hicolor/48x48/apps/jxplorer.png
-	install -d -m 755 $(DESTDIR)/usr/share/pixmaps
+		$(USRSHARE)/icons/hicolor/48x48/apps/jxplorer.png
+	install -d -m 755 $(USRSHARE)/pixmaps
 	convert images/logo_64.png -scale 32x32 \
-		$(DESTDIR)/usr/share/pixmaps/jxplorer.xpm
-	install -d -m 755 $(DESTDIR)/usr/share/applications
+		$(USRSHARE)/pixmaps/jxplorer.xpm
+	install -d -m 755 $(USRSHARE)/applications
 	install -m 644 debian/jxplorer.desktop \
-		$(DESTDIR)/usr/share/applications
-	install -d -m 755 $(DESTDIR)/usr/share/jxplorer/plugins
+		$(USRSHARE)/applications
+	install -d -m 755 $(USRSHARE)/jxplorer/plugins
 	dh_installchangelogs README.*.TXT
+	# fix perl path in scripts for translation
+	sed -i '1s/local\///' $(USRSHARE)/jxplorer/language/*pl
 
 NAME=jxplorer
 SRCTGZ=../$(NAME)-$(VERSION)-src.tar.gz

-- 
jxplorer - Java LDAP browser