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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-02-22 16:09:13 +0200 (Thu, 22 Feb 2007)
New Revision: 10175

Modified:
   projects/haf/trunk/dpkg/configure
   projects/haf/trunk/dpkg/configure.ac
   projects/haf/trunk/dpkg/debian/changelog
   projects/haf/trunk/dpkg/debian/rules
Log:
Released 1.13.25.osso5.


Modified: projects/haf/trunk/dpkg/configure
===================================================================
--- projects/haf/trunk/dpkg/configure	2007-02-22 14:02:14 UTC (rev 10174)
+++ projects/haf/trunk/dpkg/configure	2007-02-22 14:09:13 UTC (rev 10175)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dpkg 1.13.25.osso4.
+# Generated by GNU Autoconf 2.59 for dpkg 1.13.25.osso5.
 #
 # Report bugs to <marius.vollmer at nokia.com>.
 #
@@ -269,8 +269,8 @@
 # Identity of this package.
 PACKAGE_NAME='dpkg'
 PACKAGE_TARNAME='dpkg'
-PACKAGE_VERSION='1.13.25.osso4'
-PACKAGE_STRING='dpkg 1.13.25.osso4'
+PACKAGE_VERSION='1.13.25.osso5'
+PACKAGE_STRING='dpkg 1.13.25.osso5'
 PACKAGE_BUGREPORT='marius.vollmer at nokia.com'
 
 ac_unique_file="lib/dpkg.h"
@@ -812,7 +812,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dpkg 1.13.25.osso4 to adapt to many kinds of systems.
+\`configure' configures dpkg 1.13.25.osso5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -879,7 +879,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dpkg 1.13.25.osso4:";;
+     short | recursive ) echo "Configuration of dpkg 1.13.25.osso5:";;
    esac
   cat <<\_ACEOF
 
@@ -1032,7 +1032,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-dpkg configure 1.13.25.osso4
+dpkg configure 1.13.25.osso5
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1046,7 +1046,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dpkg $as_me 1.13.25.osso4, which was
+It was created by dpkg $as_me 1.13.25.osso5, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1838,7 +1838,7 @@
 
 # Define the identity of the package.
  PACKAGE='dpkg'
- VERSION='1.13.25.osso4'
+ VERSION='1.13.25.osso5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16425,7 +16425,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by dpkg $as_me 1.13.25.osso4, which was
+This file was extended by dpkg $as_me 1.13.25.osso5, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16488,7 +16488,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-dpkg config.status 1.13.25.osso4
+dpkg config.status 1.13.25.osso5
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

Modified: projects/haf/trunk/dpkg/configure.ac
===================================================================
--- projects/haf/trunk/dpkg/configure.ac	2007-02-22 14:02:14 UTC (rev 10174)
+++ projects/haf/trunk/dpkg/configure.ac	2007-02-22 14:09:13 UTC (rev 10175)
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dpkg], [1.13.25.osso4], [marius.vollmer at nokia.com])
+AC_INIT([dpkg], [1.13.25.osso5], [marius.vollmer at nokia.com])
 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-02-22 14:02:14 UTC (rev 10174)
+++ projects/haf/trunk/dpkg/debian/changelog	2007-02-22 14:09:13 UTC (rev 10175)
@@ -1,3 +1,12 @@
+dpkg (1.13.25.osso5) unstable; urgency=low
+
+  [ Marius Vollmer, for maemo ]
+
+  * debian/rules: Pin perl to /usr/bin/perl, so that we don't pick up
+    Scratchbox' perl by accident.
+
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Thu, 22 Feb 2007 15:59:36 +0200
+
 dpkg (1.13.25.osso4) unstable; urgency=low
 
   [ Marius Vollmer, for maemo ]

Modified: projects/haf/trunk/dpkg/debian/rules
===================================================================
--- projects/haf/trunk/dpkg/debian/rules	2007-02-22 14:02:14 UTC (rev 10174)
+++ projects/haf/trunk/dpkg/debian/rules	2007-02-22 14:09:13 UTC (rev 10175)
@@ -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 \