[maemo-commits] [maemo-commits] r14863 - in projects/haf/trunk/dpkg: . debian

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-12-05 17:00:47 +0200 (Wed, 05 Dec 2007)
New Revision: 14863

Modified:
   projects/haf/trunk/dpkg/configure.ac
   projects/haf/trunk/dpkg/debian/changelog
   projects/haf/trunk/dpkg/debian/rules
Log:
dpkg (1.14.7maemo2) unstable; urgency=low

  [ Marius Vollmer, for maemo ]

  * Pin perl to /usr/bin/perl so that we don't pick up the Scratchbox
    version of perl.  Thank you Scratchbox.

 -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 05 Dec 2007 16:40:02 +0200


Modified: projects/haf/trunk/dpkg/configure.ac
===================================================================
--- projects/haf/trunk/dpkg/configure.ac	2007-12-04 18:14:06 UTC (rev 14862)
+++ projects/haf/trunk/dpkg/configure.ac	2007-12-05 15:00:47 UTC (rev 14863)
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dpkg], [1.14.7], [debian-dpkg at lists.debian.org])
+AC_INIT([dpkg], [1.14.7maemo2], [maemo-developers at maemo.org])
 AC_CONFIG_SRCDIR([lib/dpkg.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])

Modified: projects/haf/trunk/dpkg/debian/changelog
===================================================================
--- projects/haf/trunk/dpkg/debian/changelog	2007-12-04 18:14:06 UTC (rev 14862)
+++ projects/haf/trunk/dpkg/debian/changelog	2007-12-05 15:00:47 UTC (rev 14863)
@@ -1,3 +1,12 @@
+dpkg (1.14.7maemo2) unstable; urgency=low
+
+  [ Marius Vollmer, for maemo ]
+
+  * Pin perl to /usr/bin/perl so that we don't pick up the Scratchbox
+    version of perl.  Thank you Scratchbox.
+
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 05 Dec 2007 16:40:02 +0200
+
 dpkg (1.14.7maemo1) experimental; urgency=low
 
   [ Marius Vollmer, for maemo ]

Modified: projects/haf/trunk/dpkg/debian/rules
===================================================================
--- projects/haf/trunk/dpkg/debian/rules	2007-12-04 18:14:06 UTC (rev 14862)
+++ projects/haf/trunk/dpkg/debian/rules	2007-12-05 15:00:47 UTC (rev 14863)
@@ -44,7 +44,7 @@
 	dh_testdir
 
 	install -d build-tree
-	cd build-tree && ../configure $(confflags) \
+	cd build-tree && PERL=/usr/bin/perl ../configure $(confflags) \
 		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 		--prefix=/usr \
 		--mandir=\$${datadir}/man \