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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-04-18 21:32:31 +0300 (Wed, 18 Apr 2007)
New Revision: 11138

Modified:
   projects/haf/trunk/dpkg/configure.ac
   projects/haf/trunk/dpkg/debian/changelog
   projects/haf/trunk/dpkg/debian/dpkg.postinst
Log:
dpkg (1.13.25.osso6) unstable; urgency=low

  [ Marius Vollmer, for maemo ]

  * debian/dpkg.postinst: Do not call remove_duplicate_daemons or
    fix_damaged_info ever.  This doesn't seem to work when creating images
    from scratch and is not necessary for maemo.

 -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 18 Apr 2007 21:22:39 +0300


Modified: projects/haf/trunk/dpkg/configure.ac
===================================================================
--- projects/haf/trunk/dpkg/configure.ac	2007-04-18 15:53:03 UTC (rev 11137)
+++ projects/haf/trunk/dpkg/configure.ac	2007-04-18 18:32:31 UTC (rev 11138)
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dpkg], [1.13.25.osso5], [marius.vollmer at nokia.com])
+AC_INIT([dpkg], [1.13.25.osso6], [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-04-18 15:53:03 UTC (rev 11137)
+++ projects/haf/trunk/dpkg/debian/changelog	2007-04-18 18:32:31 UTC (rev 11138)
@@ -1,3 +1,13 @@
+dpkg (1.13.25.osso6) unstable; urgency=low
+
+  [ Marius Vollmer, for maemo ]
+
+  * debian/dpkg.postinst: Do not call remove_duplicate_daemons or
+    fix_damaged_info ever.  This doesn't seem to work when creating images
+    from scratch and is not necessary for maemo.
+
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 18 Apr 2007 21:22:39 +0300
+
 dpkg (1.13.25.osso5) unstable; urgency=low
 
   [ Marius Vollmer, for maemo ]

Modified: projects/haf/trunk/dpkg/debian/dpkg.postinst
===================================================================
--- projects/haf/trunk/dpkg/debian/dpkg.postinst	2007-04-18 15:53:03 UTC (rev 11137)
+++ projects/haf/trunk/dpkg/debian/dpkg.postinst	2007-04-18 18:32:31 UTC (rev 11138)
@@ -154,15 +154,21 @@
 	create_database
 	create_logfile
 
-	case "$2" in
-	    0.* | 1.0.* | 1.1.0 | 1.1.0[^0-9]* | '' )
-	        remove_duplicate_daemons
-		;;
-	    1.1.6 | 1.1.6elf | 1.2.[0123] | 1.2.[0123]elf)
-	        fix_damaged_info
-	        ;;
-	esac
+ 	case "$2" in
 
+# remove_duplicate_daemons seems to fail when creating a maemo image
+# from scratch, and is not needed for maemo.  So we don't run it,
+# ever.
+#
+# 	    0.* | 1.0.* | 1.1.0 | 1.1.0[^0-9]* | '' )
+# 	        remove_duplicate_daemons
+# 		;;
+
+ 	    1.1.6 | 1.1.6elf | 1.2.[0123] | 1.2.[0123]elf)
+ 	        fix_damaged_info
+ 	        ;;
+ 	esac
+
 	move_info_directory
 	remove_info_symlink
 	;;