r37834 - in /trunk/jifty/debian: changelog rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sun Jun  7 22:06:57 2009
New Revision: 37834

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=37834
Log:
* debian/rules:
  - set PERL5_CPANPLUS_IS_RUNNING to stop the broken Module::Install 0.85
    from loading CPAN.pm
  - unset http_proxy for tests

Modified:
    trunk/jifty/debian/changelog
    trunk/jifty/debian/rules

Modified: trunk/jifty/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/changelog?rev=37834&op=diff
==============================================================================
--- trunk/jifty/debian/changelog (original)
+++ trunk/jifty/debian/changelog Sun Jun  7 22:06:57 2009
@@ -32,6 +32,12 @@
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
 
+  [ gregor herrmann ]
+  * debian/rules:
+    - set PERL5_CPANPLUS_IS_RUNNING to stop the broken Module::Install 0.85
+      from loading CPAN.pm
+    - unset http_proxy for tests
+
  -- AGOSTINI Yves <agostini at univ-metz.fr>  Wed, 20 May 2009 09:55:55 +0200
 
 jifty (0.80408-2) unstable; urgency=low

Modified: trunk/jifty/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/rules?rev=37834&op=diff
==============================================================================
--- trunk/jifty/debian/rules (original)
+++ trunk/jifty/debian/rules Sun Jun  7 22:06:57 2009
@@ -22,9 +22,9 @@
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	$(PERL) Makefile.PL --skipdeps INSTALLDIRS=vendor
+	PERL5_CPANPLUS_IS_RUNNING=1 $(PERL) Makefile.PL --skipdeps INSTALLDIRS=vendor
 	$(MAKE)
-	LANG=C $(MAKE) test
+	LANG=C http_proxy= $(MAKE) test
 	touch $@
 
 clean: unpatch