[SCM] Debian packaging of libembperl-perl branch, master, updated. upstream/2.5.0_rc2-71-g4d9b45b

Florian Schlichting fschlich at zedat.fu-berlin.de
Tue Oct 2 21:10:10 UTC 2012


The following commit has been merged in the master branch:
commit 0e5760f637c831e4f30e3e98a2964a6d8dc27672
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Tue Oct 2 20:55:34 2012 +0200

    Makefile.PL.patch: strip .pl suffix in debian/rules instead of Makefile.PL

diff --git a/debian/patches/Makefile.PL.patch b/debian/patches/Makefile.PL.patch
index 35645c8..ff5d12a 100644
--- a/debian/patches/Makefile.PL.patch
+++ b/debian/patches/Makefile.PL.patch
@@ -1,5 +1,4 @@
 Description: 
- - remove extensions from scripts
  - add the output of `apxs2 -q CFLAGS` to CCFLAGS
 
 --- a/Makefile.PL
@@ -15,37 +14,6 @@ Description:
              }
          else
              {
-@@ -305,7 +306,14 @@
-          }
-      }
- 
-- foreach my $hash (qw(MAN3PODS PM))
-+    # Debian hack - strip .pl from executables
-+    while (($k, $v) = each %{$self->{MAN1PODS}})
-+      {
-+        $v =~ s/\.pl// or next;
-+        $self->{MAN1PODS}{$k} = $v;
-+      }
-+
-+foreach my $hash (qw(MAN3PODS PM))
-      {
-      foreach (keys %{$self->{$hash}})
-          {
-@@ -318,6 +326,14 @@
-        $self -> MM::post_initialize (@_) ;
-        }
- 
-+sub MY::libscan {
-+  my ($self, $path) = @_;
-+
-+  # Debian hack - strip .pl from executables
-+  return $path if $path =~ s/\.pl\b//;
-+
-+  $self->MM::libscan($path);
-+}
- 
-  sub MY::post_constants
-        {
 @@ -1337,6 +1341,7 @@
      'INC'	   => "-I$EPPATH $i",     			 
      'VERSION'      => undef,
diff --git a/debian/rules b/debian/rules
index 4bee5d8..ca80aea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,4 +36,8 @@ override_dh_auto_install: $(POD2TEXT)
 	# ship Apache config in mods-available
 	install -m 644 debian/zembperl.conf debian/zembperl.load \
 	    $(TMP)/etc/apache2/mods-available/
+	
+	# strip .pl off executables (and their manpages)
+	rename -v 's/\.pl//' $(TMP)/usr/bin/emb*
+	rename -v 's/\.pl//' $(TMP)/usr/share/man/man1/emb*
 

-- 
Debian packaging of libembperl-perl



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