[SCM] Debian packaging of libdbd-oracle-perl branch, master, updated. debian/1.34-1-15-g60b97da

Julián Moreno Patiñ?==?UTF-8?Q?o darkjunix at gmail.com
Sat Jan 21 22:35:21 UTC 2012


The following commit has been merged in the master branch:
commit b90c13bc778b0f0ef84b55a67cecb2c77a10177d
Author: Julián Moreno Patiño <darkjunix at gmail.com>
Date:   Sat Jan 21 17:33:10 2012 -0500

    Add sed call in override_dh_installexamples to fix wrong path for interpreter

diff --git a/debian/changelog b/debian/changelog
index 5593cdb..ebb5615 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,4 @@
-libdbd-oracle-perl (1.38-1) UNRELEASED; urgency=low
-
-  TODO:
-  - the path in the examples could also be fixed from d/rules
-  (haven't looked further so far)
+libdbd-oracle-perl (1.38-1) unstable; urgency=low
 
   * New upstream release. (Closes: #651211)
   * Remove debian/libdbd-oracle-perl.docs.
@@ -15,8 +11,14 @@ libdbd-oracle-perl (1.38-1) UNRELEASED; urgency=low
     spelling errors.
   * Add fix-manpage-has-bad-whatis-entry.diff to
     fix manpage.
-  * Add fix-wrong-path-for-interpreter.diff patch
-    to fix wrong path for interpreter.
+  * Add sed call in override_dh_installexamples to
+    fix wrong path for interpreter.
+  * Add optional use of Basic Lite client in
+    debian/README.maintainer.
+
+  [ Gregor Herrmann ]
+  * Override substvars in debian/rules to get our
+    alternative dependency.
 
  -- Julián Moreno Patiño <darkjunix at gmail.com>  Sat, 14 Jan 2012 18:12:22 -0500
 
diff --git a/debian/patches/fix-wrong-path-for-interpreter.diff b/debian/patches/fix-wrong-path-for-interpreter.diff
deleted file mode 100644
index 30986ca..0000000
--- a/debian/patches/fix-wrong-path-for-interpreter.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix wrong path for perl
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=74001
-Author: Julián Moreno Patiño <darkjunix at gmail.com>
-Last-Update: 2012-01-14
---- a/examples/inserting_longs.pl
-+++ b/examples/inserting_longs.pl
-@@ -1,4 +1,4 @@
--#!perl 
-+#!/usr/bin/perl
- 
- use strict;
- use warnings;
---- a/examples/read_long_via_blob_read.pl
-+++ b/examples/read_long_via_blob_read.pl
-@@ -1,4 +1,4 @@
--#!perl
-+#!/usr/bin/perl
- 
- use strict;
- use warnings;
diff --git a/debian/patches/series b/debian/patches/series
index 3e3fbb8..a328607 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 00_Fix_Spelling_Errors.diff
-fix-wrong-path-for-interpreter.diff
 fix-manpage-has-bad-whatis-entry.diff
diff --git a/debian/rules b/debian/rules
index 7c5781c..62ad514 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,10 +24,10 @@ override_dh_auto_install:
 
 override_dh_installexamples:
 	dh_installexamples
+	sed -i '1s|^#!perl|#!/usr/bin/perl|' $(TMP)/usr/share/doc/$(PKG)/examples/*
 	chmod a-x $(addprefix $(TMP),/usr/share/doc/libdbd-oracle-perl/examples/README)
 
 override_dh_shlibdeps:
 	dh_shlibdeps
 	sed -i -e 's/oracle-instantclient11.2-basic/oracle-instantclient11.2-basic | oracle-instantclient11.2-basiclite/' \
 		$(CURDIR)/debian/libdbd-oracle-perl.substvars
-	

-- 
Debian packaging of libdbd-oracle-perl



More information about the Pkg-perl-cvs-commits mailing list