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

[kobold at alioth.debian.org]

Author: kobold
Date: 2009-03-05 22:07:20 +0000 (Thu, 05 Mar 2009)
New Revision: 1975

Added:
   packages/postgis/trunk/debian/patches/
   packages/postgis/trunk/debian/patches/00list
   packages/postgis/trunk/debian/patches/utils.dpatch
Modified:
   packages/postgis/trunk/debian/control
   packages/postgis/trunk/debian/rules
Log:
patch the utils to fix some lintian warnings

Modified: packages/postgis/trunk/debian/control
===================================================================
--- packages/postgis/trunk/debian/control	2009-03-05 21:58:15 UTC (rev 1974)
+++ packages/postgis/trunk/debian/control	2009-03-05 22:07:20 UTC (rev 1975)
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Stephen Frost <sfrost at debian.org>, Fabio Tranchitella <kobold at debian.org>, Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, flex, bison, postgresql-server-dev-8.3, libgeos-dev, proj, 
-               libssl-dev, xsltproc, docbook, docbook-xsl, libpg-java, jikes-classpath, fastjar, libjts-java (>=1.7)
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, flex, bison, postgresql-server-dev-8.3, libgeos-dev, proj, libssl-dev, xsltproc, docbook, docbook-xsl, libpg-java, jikes-classpath, fastjar, libjts-java (>=1.7), dpatch
 Standards-Version: 3.8.0
 Homepage: http://postgis.refractions.net/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/postgis/

Added: packages/postgis/trunk/debian/patches/00list
===================================================================
--- packages/postgis/trunk/debian/patches/00list	                        (rev 0)
+++ packages/postgis/trunk/debian/patches/00list	2009-03-05 22:07:20 UTC (rev 1975)
@@ -0,0 +1 @@
+utils

Added: packages/postgis/trunk/debian/patches/utils.dpatch
===================================================================
--- packages/postgis/trunk/debian/patches/utils.dpatch	                        (rev 0)
+++ packages/postgis/trunk/debian/patches/utils.dpatch	2009-03-05 22:07:20 UTC (rev 1975)
@@ -0,0 +1,36 @@
+#! /bin/sh -e
+
+## DP: fix the shebangs in the utils
+## DP: Author: Fabio Tranchitella
+
+. $(dirname $0)/DPATCH
+
+exit 0
+ at DPATCH@
+diff -urN postgis-1.3.5/utils/create_undef.pl postgis-1.3.5.debian/utils/create_undef.pl
+--- postgis-1.3.5/utils/create_undef.pl	2005-07-13 16:26:47.000000000 +0200
++++ postgis-1.3.5.debian/utils/create_undef.pl	2009-03-05 23:03:54.000000000 +0100
+@@ -1,3 +1,5 @@
++#!/bin/sh
++
+ eval "exec perl -w $0 $@"
+ 	if (0);
+ 
+diff -urN postgis-1.3.5/utils/postgis_proc_upgrade.pl postgis-1.3.5.debian/utils/postgis_proc_upgrade.pl
+--- postgis-1.3.5/utils/postgis_proc_upgrade.pl	2005-12-16 09:33:04.000000000 +0100
++++ postgis-1.3.5.debian/utils/postgis_proc_upgrade.pl	2009-03-05 23:03:38.000000000 +0100
+@@ -1,4 +1,4 @@
+-#/bin/sh
++#!/bin/sh
+ 
+ #
+ # This script produces an .sql file containing
+diff -urN postgis-1.3.5/utils/postgis_restore.pl postgis-1.3.5.debian/utils/postgis_restore.pl
+--- postgis-1.3.5/utils/postgis_restore.pl	2008-10-02 17:59:41.000000000 +0200
++++ postgis-1.3.5.debian/utils/postgis_restore.pl	2009-03-05 23:03:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#/bin/sh
++#!/bin/sh
+ #
+ # This script is aimed at restoring postgis data
+ # from a dumpfile produced by pg_dump -Fc


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

Modified: packages/postgis/trunk/debian/rules
===================================================================
--- packages/postgis/trunk/debian/rules	2009-03-05 21:58:15 UTC (rev 1974)
+++ packages/postgis/trunk/debian/rules	2009-03-05 22:07:20 UTC (rev 1975)
@@ -13,6 +13,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpatch/dpatch.make
+
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -34,7 +36,7 @@
 	CFLAGS += -O2
 endif
 
-build: build-arch build-indep
+build: patch build-arch build-indep
 
 build-arch: build-arch-stamp
 build-arch-stamp:
@@ -44,7 +46,8 @@
 build-indep-stamp:
 	touch build-indep-stamp
 
-clean:
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp