r33510 - in /trunk/libmodule-pluggable-perl/debian: changelog patches/installdir.patch patches/series rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sat Apr 18 00:03:05 2009
New Revision: 33510

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=33510
Log:
Add patch installdir.patch to get the modules installed into
/usr/share/perl5.

Added:
    trunk/libmodule-pluggable-perl/debian/patches/installdir.patch
Modified:
    trunk/libmodule-pluggable-perl/debian/changelog
    trunk/libmodule-pluggable-perl/debian/patches/series
    trunk/libmodule-pluggable-perl/debian/rules

Modified: trunk/libmodule-pluggable-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-pluggable-perl/debian/changelog?rev=33510&op=diff
==============================================================================
--- trunk/libmodule-pluggable-perl/debian/changelog (original)
+++ trunk/libmodule-pluggable-perl/debian/changelog Sat Apr 18 00:03:05 2009
@@ -1,10 +1,4 @@
 libmodule-pluggable-perl (3.9-1) UNRELEASED; urgency=low
-
-  PROBLEM:
-  the modules get installed into /usr/lib/perl5. lintian complains, and this
-  seems indeed wrong.
-  the interesting thing is that Makefile.PL does this on purpose:
-  'INST_LIB'     => ($] >= 5.008009) ? 'blib/arch' : 'blib/lib',
 
   [ Brian Cassidy ]
   * New upstream release
@@ -19,6 +13,8 @@
     Debian Policy since 3.8.0.
   * Add a notice to the patch.
   * debian/control: change my email address.
+  * Add patch installdir.patch to get the modules installed into
+    /usr/share/perl5.
 
  -- Brian Cassidy <brian.cassidy at gmail.com>  Wed, 15 Apr 2009 16:29:16 -0300
 

Added: trunk/libmodule-pluggable-perl/debian/patches/installdir.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-pluggable-perl/debian/patches/installdir.patch?rev=33510&op=file
==============================================================================
--- trunk/libmodule-pluggable-perl/debian/patches/installdir.patch (added)
+++ trunk/libmodule-pluggable-perl/debian/patches/installdir.patch Sat Apr 18 00:03:05 2009
@@ -1,0 +1,16 @@
+Author: gregor herrmann <gregoa at debian.org>
+Description: we want the modules in /usr/share/perl5
+
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -40,8 +40,8 @@
+                            'Test::More' => '0.62'
+                          },
+           'EXE_FILES'    => [],
+-          'INSTALLDIRS'  => ($] >= 5.008009) ? "perl" : "site",
+-          'INST_LIB'     => ($] >= 5.008009) ? 'blib/arch' : 'blib/lib',
++#          'INSTALLDIRS'  => ($] >= 5.008009) ? "perl" : "site",
++#          'INST_LIB'     => ($] >= 5.008009) ? 'blib/arch' : 'blib/lib',
+           'PL_FILES'     => {},
+           'realclean'    => {FILES=> join ' ', @files},
+           # In the core pods will be built by installman.

Modified: trunk/libmodule-pluggable-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-pluggable-perl/debian/patches/series?rev=33510&op=diff
==============================================================================
--- trunk/libmodule-pluggable-perl/debian/patches/series (original)
+++ trunk/libmodule-pluggable-perl/debian/patches/series Sat Apr 18 00:03:05 2009
@@ -1,1 +1,2 @@
 fix-manifest.patch
+installdir.patch

Modified: trunk/libmodule-pluggable-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-pluggable-perl/debian/rules?rev=33510&op=diff
==============================================================================
--- trunk/libmodule-pluggable-perl/debian/rules (original)
+++ trunk/libmodule-pluggable-perl/debian/rules Sat Apr 18 00:03:05 2009
@@ -8,6 +8,8 @@
 	touch $@
 
 clean: unpatch
+	# we need to update Makefile's timestamp after unpatching Makefile.PL
+	[ ! -f Makefile ] || touch Makefile
 	dh $@
 
 install: install-stamp