[med-svn] r159 - in trunk/packages/perlprimer/trunk: . debian debian/patches

[Charles Plessy]

Author: charles-guest
Date: 2006-11-19 14:38:57 +0100 (Sun, 19 Nov 2006)
New Revision: 159

Added:
   trunk/packages/perlprimer/trunk/debian/patches/
   trunk/packages/perlprimer/trunk/debian/patches/00list
   trunk/packages/perlprimer/trunk/debian/patches/10-perlprimer.dpatch
Modified:
   trunk/packages/perlprimer/trunk/debian/changelog
   trunk/packages/perlprimer/trunk/debian/control
   trunk/packages/perlprimer/trunk/debian/rules
   trunk/packages/perlprimer/trunk/perlprimer.pl
Log:
using dpatch to handle the modifications to perlprimer.pl

Modified: trunk/packages/perlprimer/trunk/debian/changelog
===================================================================
--- trunk/packages/perlprimer/trunk/debian/changelog	2006-11-08 15:25:39 UTC (rev 158)
+++ trunk/packages/perlprimer/trunk/debian/changelog	2006-11-19 13:38:57 UTC (rev 159)
@@ -1,3 +1,10 @@
+perlprimer (1.1.14-2) unstable; urgency=low
+
+  * Using dephelper 5 or greater.
+  * Using dpatch.
+
+ -- Charles Plessy <charles-debian-nospam at plessy.org>  Sat, 11 Nov 2006 13:49:46 +0900
+
 perlprimer (1.1.14-1) unstable; urgency=medium
 
   * New upstream release: Ensembl compatibility restored once again.

Modified: trunk/packages/perlprimer/trunk/debian/control
===================================================================
--- trunk/packages/perlprimer/trunk/debian/control	2006-11-08 15:25:39 UTC (rev 158)
+++ trunk/packages/perlprimer/trunk/debian/control	2006-11-19 13:38:57 UTC (rev 159)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <steffen_moeller at gmx.de>, Charles Plessy <charles-debian-nospam at plessy.org>
-Build-Depends: debhelper (>= 4.0.0)
+Build-Depends: debhelper (>= 5), dpatch
 Standards-Version: 3.7.2
 
 Package: perlprimer

Added: trunk/packages/perlprimer/trunk/debian/patches/00list
===================================================================
--- trunk/packages/perlprimer/trunk/debian/patches/00list	2006-11-08 15:25:39 UTC (rev 158)
+++ trunk/packages/perlprimer/trunk/debian/patches/00list	2006-11-19 13:38:57 UTC (rev 159)
@@ -0,0 +1 @@
+10-perlprimer.dpatch

Added: trunk/packages/perlprimer/trunk/debian/patches/10-perlprimer.dpatch
===================================================================
--- trunk/packages/perlprimer/trunk/debian/patches/10-perlprimer.dpatch	2006-11-08 15:25:39 UTC (rev 158)
+++ trunk/packages/perlprimer/trunk/debian/patches/10-perlprimer.dpatch	2006-11-19 13:38:57 UTC (rev 159)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-perlprimer.dpatch by Charles Plessy <charles-debian-nospam at plessy.org>
+## This patch is hereby released in the public domain.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Updades FSF address, and adds a path to find the gcg.* file in Debian.
+
+ at DPATCH@
+
+--- perlprimer/perlprimer.pl	2006-11-19 22:20:44.000000000 +0900
++++ perlprimer/perlprimer.pl.debian	2006-11-19 22:20:28.000000000 +0900
+@@ -18,7 +18,7 @@
+ # 
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
+ # USA
+ 
+ use strict;
+@@ -3840,7 +3840,15 @@
+ 		# search for the file in the program directory
+ 		@gcg_paths = glob("$program_directory"."gcg.*");
+ 	}
+-	
++	unless (@gcg_paths) {
++		# search for the file where it should be
++		@gcg_paths = glob("/usr/share/perlprimer/"."gcg.*");
++	}
++	unless (@gcg_paths) {
++		# search for the file in the current directory
++		@gcg_paths = glob("./"."gcg.*");
++	}
++
+ 	my $gcg_path;
+ 	foreach (@gcg_paths) {
+ 		if (/.*gcg\.\d*$/) {


Property changes on: trunk/packages/perlprimer/trunk/debian/patches/10-perlprimer.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/perlprimer/trunk/debian/rules
===================================================================
--- trunk/packages/perlprimer/trunk/debian/rules	2006-11-08 15:25:39 UTC (rev 158)
+++ trunk/packages/perlprimer/trunk/debian/rules	2006-11-19 13:38:57 UTC (rev 159)
@@ -1,32 +1,25 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
+patch:
+	dpatch apply-all
+	dpatch cat-all --desc-only > patch-stamp
 
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
 
 
-CFLAGS = -Wall -g
+clean: clean-patched unpatch
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-clean:
+clean-patched:
 	dh_testdir
 	dh_testroot
 
 	dh_clean 
 
-install: 
+
+install: patch
 	dh_testdir
 	dh_testroot
 	dh_clean -k 

Modified: trunk/packages/perlprimer/trunk/perlprimer.pl
===================================================================
--- trunk/packages/perlprimer/trunk/perlprimer.pl	2006-11-08 15:25:39 UTC (rev 158)
+++ trunk/packages/perlprimer/trunk/perlprimer.pl	2006-11-19 13:38:57 UTC (rev 159)
@@ -18,7 +18,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
 # USA
 
 use strict;
@@ -3840,15 +3840,7 @@
 		# search for the file in the program directory
 		@gcg_paths = glob("$program_directory"."gcg.*");
 	}
-	unless (@gcg_paths) {
-		# search for the file where it should be
-		@gcg_paths = glob("/usr/share/perlprimer/"."gcg.*");
-	}
-	unless (@gcg_paths) {
-		# search for the file in the current directory
-		@gcg_paths = glob("./"."gcg.*");
-	}
-
+	
 	my $gcg_path;
 	foreach (@gcg_paths) {
 		if (/.*gcg\.\d*$/) {