r11838 - in /trunk/libauthen-sasl-cyrus-perl/debian: changelog rules

[rra at users.alioth.debian.org]

Author: rra
Date: Sat Dec 29 22:49:34 2007
New Revision: 11838

URL: http://svn.debian.org/wsvn/?sc=1&rev=11838
Log:
* Tell Makefile.PL not to create /usr/share/perl5 and remove the
  rmdir, which fails with Perl 5.10.

Modified:
    trunk/libauthen-sasl-cyrus-perl/debian/changelog
    trunk/libauthen-sasl-cyrus-perl/debian/rules

Modified: trunk/libauthen-sasl-cyrus-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libauthen-sasl-cyrus-perl/debian/changelog?rev=11838&op=diff
==============================================================================
--- trunk/libauthen-sasl-cyrus-perl/debian/changelog (original)
+++ trunk/libauthen-sasl-cyrus-perl/debian/changelog Sat Dec 29 22:49:34 2007
@@ -1,8 +1,13 @@
 libauthen-sasl-cyrus-perl (0.13-server-2) UNRELEASED; urgency=low
 
+  [ gregor herrmann ]
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
     field (source stanza); Homepage field (source stanza). Removed:
     Homepage pseudo-field (Description); XS-Vcs-Svn fields.
+
+  [ Russ Allbery ]
+  * Tell Makefile.PL not to create /usr/share/perl5 and remove the
+    rmdir, which fails with Perl 5.10.
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:27:20 +0200
 

Modified: trunk/libauthen-sasl-cyrus-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libauthen-sasl-cyrus-perl/debian/rules?rev=11838&op=diff
==============================================================================
--- trunk/libauthen-sasl-cyrus-perl/debian/rules (original)
+++ trunk/libauthen-sasl-cyrus-perl/debian/rules Sat Dec 29 22:49:34 2007
@@ -24,7 +24,9 @@
 build-indep:
 build-stamp:
 	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor LIBS="-lsasl2" DEFINE="-DSASL2"
+	$(PERL) Makefile.PL LIBS="-lsasl2" DEFINE="-DSASL2" \
+	    INSTALLDIRS=vendor INSTALLVENDORARCH=/usr/lib/perl5/ \
+	    VENDORARCHEXP=/usr/lib/perl5/
 	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
 	touch build-stamp
 
@@ -44,7 +46,6 @@
 	USER=testuser $(MAKE) test
 	$(MAKE) install PREFIX=$(PREFIX)
 	chmod 644 $(PREFIX)/lib/perl5/Authen/SASL/Cyrus.pod
-	rmdir --ignore-fail-on-non-empty --parents $(PREFIX)/share/perl5
 	touch install-stamp
 
 binary: binary-arch binary-indep