[DebianGIS-dev] r2436 - in packages/postgis/trunk/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-09-14 05:36:38 +0000 (Mon, 14 Sep 2009)
New Revision: 2436

Added:
   packages/postgis/trunk/debian/patches/install.dpatch
Modified:
   packages/postgis/trunk/debian/changelog
   packages/postgis/trunk/debian/patches/00list
   packages/postgis/trunk/debian/rules
Log:


Modified: packages/postgis/trunk/debian/changelog
===================================================================
--- packages/postgis/trunk/debian/changelog	2009-09-13 18:07:54 UTC (rev 2435)
+++ packages/postgis/trunk/debian/changelog	2009-09-14 05:36:38 UTC (rev 2436)
@@ -16,8 +16,10 @@
     (closes: #529503)
   * Removed Fabio Tranchitella among Uploaders because retired from DebianGis.
   * Now build-dep on imagemagick because doc generation requires convert tool.
+  * Added patch install.dpatch to manage minor inconsistencies in the java
+    inatallation scripts. 
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 12 Sep 2009 10:50:15 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 14 Sep 2009 07:27:06 +0200
 
 postgis (1.3.5-1) unstable; urgency=low
 

Modified: packages/postgis/trunk/debian/patches/00list
===================================================================
--- packages/postgis/trunk/debian/patches/00list	2009-09-13 18:07:54 UTC (rev 2435)
+++ packages/postgis/trunk/debian/patches/00list	2009-09-14 05:36:38 UTC (rev 2436)
@@ -1 +1 @@
-# no patches
+install

Added: packages/postgis/trunk/debian/patches/install.dpatch
===================================================================
--- packages/postgis/trunk/debian/patches/install.dpatch	                        (rev 0)
+++ packages/postgis/trunk/debian/patches/install.dpatch	2009-09-14 05:36:38 UTC (rev 2436)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## java.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixing missing var
+
+ at DPATCH@
+diff -urNad postgis-1.4.0~/java/jdbc/Makefile postgis-1.4.0/java/jdbc/Makefile
+--- postgis-1.4.0~/java/jdbc/Makefile	2008-07-03 19:08:49.000000000 +0200
++++ postgis-1.4.0/java/jdbc/Makefile	2009-09-12 12:28:26.000000000 +0200
+@@ -251,8 +251,8 @@
+ install: jar installdirs
+ 	@echo Testing for successful inclusion of ../Makefile.config
+ 	test ../Makefile.config
+-	$(INSTALL_DATA) postgis.jar $(DESTDIR)
+-	$(INSTALL_DATA) postgis_debug.jar $(DESTDIR)
++	install -m 644 postgis.jar $(DESTDIR)
++	install -m 644 postgis_debug.jar $(DESTDIR)
+ 
+ installdirs:
+ 	@mkdir -p $(DESTDIR)


Property changes on: packages/postgis/trunk/debian/patches/install.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/postgis/trunk/debian/rules
===================================================================
--- packages/postgis/trunk/debian/rules	2009-09-13 18:07:54 UTC (rev 2435)
+++ packages/postgis/trunk/debian/rules	2009-09-14 05:36:38 UTC (rev 2436)
@@ -73,7 +73,8 @@
 	$(MAKE) -C java/jdbc clean
 	DEBUGJAR=postgis_debug.fastjar JAR=fastjar JAVAC=javac $(MAKE) -C java/jdbc jar
 	DEBUGJAR=postgis_debug.fastjar JAR=fastjar JAVAC=javac $(MAKE) -C java/jdbc install DESTDIR=$(CURDIR)/debian/libpostgis-java/usr/share/java/$(JAVA_PATH)
-	$(MAKE) distclean
+	# regress target uses pushd/popd
+	$(MAKE) SHELL=/bin/bash distclean
 	dh_install -i
 
 install-arch: