r77544 - in /trunk/libalgorithm-diff-xs-perl/debian: changelog rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sat Jul 16 18:37:12 2011
New Revision: 77544

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=77544
Log:
update changelog

Modified:
    trunk/libalgorithm-diff-xs-perl/debian/changelog
    trunk/libalgorithm-diff-xs-perl/debian/rules

Modified: trunk/libalgorithm-diff-xs-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalgorithm-diff-xs-perl/debian/changelog?rev=77544&op=diff
==============================================================================
--- trunk/libalgorithm-diff-xs-perl/debian/changelog (original)
+++ trunk/libalgorithm-diff-xs-perl/debian/changelog Sat Jul 16 18:37:12 2011
@@ -1,13 +1,11 @@
 libalgorithm-diff-xs-perl (0.04-2) UNRELEASED; urgency=low
-
-  TODO:
-  ansgar has some ideas on how to improve d/rules
 
   [ Steve McIntyre ]
   * Configure perl C compilation for cross builds
     Closes: #633950
 
   [ gregor herrmann ]
+  * Improvements to Steve's patch by Ansgar.
   * Switch to source format 3.0 (quilt).
   * Update debian/copyright formatting.
   * Add /me to Uploaders.

Modified: trunk/libalgorithm-diff-xs-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalgorithm-diff-xs-perl/debian/rules?rev=77544&op=diff
==============================================================================
--- trunk/libalgorithm-diff-xs-perl/debian/rules (original)
+++ trunk/libalgorithm-diff-xs-perl/debian/rules Sat Jul 16 18:37:12 2011
@@ -4,18 +4,14 @@
 DEB_HOST_GNU_TYPE       := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-        HOST_PERL = $(shell which perl)
-        PERL_VER = $(shell $(HOST_PERL) -v | $(HOST_PERL) -e 'while(<>) {/v(\d+\.\d+\.\d+)/ and print "$$1\n";}')
+	PERL_VER := $(shell perl -MConfig -e'print "$$Config{version}\n"')
+	export PERL5LIB=/usr/$(DEB_HOST_GNU_TYPE)/lib/perl/$(PERL_VER)
 
-        export PERL5LIB=/usr/$(DEB_HOST_GNU_TYPE)/lib/perl/$(PERL_VER)
-clean:
-	@if [ ! -f $(PERL5LIB)/Config.pm ] || [ ! -f $(PERL5LIB)/Config_heavy.pl ]	;\
-	then	\
-		echo "Config.pm & Config_heavy.pl for cross building not found in $(PERL5LIB)"	;\
-	exit 1	;\
-	fi
-	dh $@
+	ifneq (true,$(shell [ -f $(PERL5LIB)/Config.pm -a -f $(PERL5LIB)/Config_heavy.pl ] && echo true))
+		$(error Config.pm & Config_heavy.pl for cross building not found in $(PERL5LIB))
+	endif
 endif
+
 
 %:
 	dh $@