r17402 - in /trunk/libxml-sax-machines-perl/debian: changelog patches/vendorlibs.patch

[ntyni at users.alioth.debian.org]

Author: ntyni
Date: Thu Mar 13 15:01:43 2008
New Revision: 17402

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=17402
Log:
* debian/patches/vendorlib.patch: always write out SiteConfig.pm, even if
  there's already a system-wide installation of XML::SAX::Machines.

Modified:
    trunk/libxml-sax-machines-perl/debian/changelog
    trunk/libxml-sax-machines-perl/debian/patches/vendorlibs.patch

Modified: trunk/libxml-sax-machines-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-machines-perl/debian/changelog?rev=17402&op=diff
==============================================================================
--- trunk/libxml-sax-machines-perl/debian/changelog (original)
+++ trunk/libxml-sax-machines-perl/debian/changelog Thu Mar 13 15:01:43 2008
@@ -32,6 +32,8 @@
     Makefile.PL
   * Add myself to Uploaders.
   * Build-depend on quilt (>= 0.40), for /usr/share/quilt/quilt.make
+  * debian/patches/vendorlib.patch: always write out SiteConfig.pm, even if
+    there's already a system-wide installation of XML::SAX::Machines.
 
  -- Niko Tyni <ntyni at debian.org>  Thu, 13 Mar 2008 15:49:55 +0200
 

Modified: trunk/libxml-sax-machines-perl/debian/patches/vendorlibs.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-machines-perl/debian/patches/vendorlibs.patch?rev=17402&op=diff
==============================================================================
--- trunk/libxml-sax-machines-perl/debian/patches/vendorlibs.patch (original)
+++ trunk/libxml-sax-machines-perl/debian/patches/vendorlibs.patch Thu Mar 13 15:01:43 2008
@@ -1,11 +1,15 @@
 --- libxml-sax-machines-perl.orig/Makefile.PL
 +++ libxml-sax-machines-perl/Makefile.PL
-@@ -46,6 +46,6 @@
+@@ -46,6 +46,10 @@
  
  ## NOTE THE LITERAL TABS!!
  sub MY::postamble { return <<'POSTAMBLE_END' }
 -install_site_config:
 -	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -I$(INST_LIB) -I$(INSTALLSITELIB) -MXML::SAX::Machines::ConfigHelper -we 'XML::SAX::Machines::ConfigHelper::_write_site_config_if_absent(shift)' $(INSTALLSITELIB)
++# we explicitly want to purge everything but the Perl core libs 
++# and the install directory from @INC, so that a system-wide install
++# of XML::SAX::Machines is not found by _write_site_config_if_absent()
++
 +install_site_config: pure_vendor_install
-+	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -I$(INST_LIB) -I$(DESTINSTALLVENDORLIB) -MXML::SAX::Machines::ConfigHelper -we 'XML::SAX::Machines::ConfigHelper::_write_site_config_if_absent(shift)' $(DESTINSTALLVENDORLIB)
++	$(PERL) -we "@INC=(qw($(DESTINSTALLVENDORLIB) $(PERL_LIB) $(PERL_ARCHLIB))); require XML::SAX::Machines::ConfigHelper; XML::SAX::Machines::ConfigHelper::_write_site_config_if_absent(shift)" $(DESTINSTALLVENDORLIB)
  POSTAMBLE_END