[pkg-java] r16863 - trunk/derby/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-06-08 07:56:39 +0000 (Sat, 08 Jun 2013)
New Revision: 16863

Modified:
   trunk/derby/debian/changelog
   trunk/derby/debian/rules
Log:
The script files for the tools are now in /usr/share/derby instead of /usr/lib/derby



Modified: trunk/derby/debian/changelog
===================================================================
--- trunk/derby/debian/changelog	2013-06-08 06:49:25 UTC (rev 16862)
+++ trunk/derby/debian/changelog	2013-06-08 07:56:39 UTC (rev 16863)
@@ -20,8 +20,10 @@
   * Added lintian overrides:
     - remove the codeless-jar warning on the localisation jars
     - remove the duplicate-files warning on the Javadoc files
+  * The script files for the tools are now in /usr/share/derby
+    instead of /usr/lib/derby
 
- -- Emmanuel Bourg <ebourg at apache.org>  Sat, 08 Jun 2013 08:48:36 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 08 Jun 2013 09:55:25 +0200
 
 apache-derby (10.10.1.1+repack-0ubuntu2) precise; urgency=low
 

Modified: trunk/derby/debian/rules
===================================================================
--- trunk/derby/debian/rules	2013-06-08 06:49:25 UTC (rev 16862)
+++ trunk/derby/debian/rules	2013-06-08 07:56:39 UTC (rev 16863)
@@ -30,7 +30,7 @@
 	ant buildsource buildjars binscripts javadoc
 
 override_dh_install:
-	chmod a+x debian/derby-tools/usr/lib/derby/bin/*
+	chmod a+x debian/derby-tools/usr/share/derby/bin/*
 
 override_dh_installdocs:
 	rm -Rf javadoc/testing
@@ -52,8 +52,8 @@
 	
 	mh_installpoms -pderby-tools -e$(version)
 	mh_installjar -pderby-tools -e$(version) --java-lib maven2/tools/pom.xml  jars/insane/derbytools.jar
-	dh_install -pderby-tools bin/set*CP /usr/lib/derby/bin
-	dh_install -pderby-tools generated/bin/* /usr/lib/derby/bin
+	dh_install -pderby-tools bin/set*CP /usr/share/derby/bin
+	dh_install -pderby-tools generated/bin/* /usr/share/derby/bin
 	
 	mh_installpoms -plibderby-java -e$(version)
 	mh_installjar -plibderby-java -e$(version) --java-lib maven2/engine/pom.xml jars/insane/derby.jar