Hello community,
here is the log from the commit of package deb for openSUSE:Factory
checked in at Thu Mar 5 16:43:32 CET 2009.
--------
--- deb/deb.changes 2009-03-03 10:17:46.000000000 +0100
+++ /mounts/work_src_done/STABLE/deb/deb.changes 2009-03-05 15:32:32.000000000 +0100
@@ -1,0 +2,13 @@
+Thu Mar 5 15:26:28 CET 2009 - puzel(a)suse.cz
+
+- update to debhelper-7.2.2
+ * dh_installmodules: Give files in /etc/modprobe.d a .conf
+ syntax, as required by new module-init-tools.
+ * dh_installmodules: Add preinst and postinst code to handle
+ cleanly renaming the modprobe.d files on upgrade.
+ * Two updates to conffile moving code from wiki:
+ - Support case where the conffile name is a substring of another
+ conffile's name.
+ - Support case where dpkg-query says the file is obsolete.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
debhelper_7.2.1.tar.bz2
New:
----
debhelper_7.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deb.spec ++++++
--- /var/tmp/diff_new_pack.df1005/_old 2009-03-05 16:41:43.000000000 +0100
+++ /var/tmp/diff_new_pack.df1005/_new 2009-03-05 16:41:43.000000000 +0100
@@ -17,7 +17,7 @@
# norootforbuild
-%define debhelper_ver 7.2.1
+%define debhelper_ver 7.2.2
Name: deb
BuildRequires: gcc-c++ ncurses-devel texlive-latex update-alternatives zlib-devel
@@ -31,7 +31,7 @@
Requires: cpio patch make html2text update-alternatives
AutoReqProv: on
Version: 1.15.0
-Release: 1
+Release: 2
Summary: Tools for Debian Packages
Source: dpkg_%{version}.tar.bz2
Source1: debhelper_%{debhelper_ver}.tar.bz2
@@ -169,6 +169,16 @@
%{perl_vendorlib}/Dpkg.pm
%changelog
+* Thu Mar 05 2009 puzel(a)suse.cz
+- update to debhelper-7.2.2
+ * dh_installmodules: Give files in /etc/modprobe.d a .conf
+ syntax, as required by new module-init-tools.
+ * dh_installmodules: Add preinst and postinst code to handle
+ cleanly renaming the modprobe.d files on upgrade.
+ * Two updates to conffile moving code from wiki:
+ - Support case where the conffile name is a substring of another
+ conffile's name.
+ - Support case where dpkg-query says the file is obsolete.
* Tue Mar 03 2009 puzel(a)suse.cz
- update to dpkg-1.15.0 and debhelper-7.2.1
- huge number of changes, please see
++++++ debhelper_7.2.1.tar.bz2 -> debhelper_7.2.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/autoscripts/postinst-moveconffile new/debhelper/autoscripts/postinst-moveconffile
--- old/debhelper/autoscripts/postinst-moveconffile 1970-01-01 01:00:00.000000000 +0100
+++ new/debhelper/autoscripts/postinst-moveconffile 2009-03-03 02:56:59.000000000 +0100
@@ -0,0 +1,9 @@
+if [ "$1" = configure ]; then
+ if [ -e "#OLD#" ]; then
+ echo "Preserving user changes to #NEW# ..."
+ if [ -e "#NEW#" ]; then
+ mv -f "#NEW#" "#NEW#.dpkg-new"
+ fi
+ mv -f "#OLD#" "#NEW#"
+ fi
+fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/autoscripts/postinst-udev new/debhelper/autoscripts/postinst-udev
--- old/debhelper/autoscripts/postinst-udev 2008-12-17 00:13:03.000000000 +0100
+++ new/debhelper/autoscripts/postinst-udev 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-if [ "$1" = configure ]; then
- if [ -e "#OLD#" ]; then
- echo "Preserving user changes to #RULE# ..."
- if [ -e "#RULE#" ]; then
- mv -f "#RULE#" "#RULE#.dpkg-new"
- fi
- mv -f "#OLD#" "#RULE#"
- fi
-fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/autoscripts/preinst-moveconffile new/debhelper/autoscripts/preinst-moveconffile
--- old/debhelper/autoscripts/preinst-moveconffile 1970-01-01 01:00:00.000000000 +0100
+++ new/debhelper/autoscripts/preinst-moveconffile 2009-03-03 03:19:57.000000000 +0100
@@ -0,0 +1,9 @@
+if [ "$1" = install ] || [ "$1" = upgrade ]; then
+ if [ -e "#OLD#" ]; then
+ if [ "`md5sum \"#OLD#\" | sed -e \"s/ .*//\"`" = \
+ "`dpkg-query -W -f='${Conffiles}' #PACKAGE# | sed -n -e \"\\\\' #OLD# '{s/ obsolete$//;s/.* //p}\"`" ]
+ then
+ rm -f "#OLD#"
+ fi
+ fi
+fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/autoscripts/preinst-udev new/debhelper/autoscripts/preinst-udev
--- old/debhelper/autoscripts/preinst-udev 2008-12-17 00:13:03.000000000 +0100
+++ new/debhelper/autoscripts/preinst-udev 2009-03-03 03:16:52.000000000 +0100
@@ -1,11 +1,4 @@
if [ "$1" = install ] || [ "$1" = upgrade ]; then
- if [ -e "#OLD#" ]; then
- if [ "`md5sum \"#OLD#\" | sed -e \"s/ .*//\"`" = \
- "`dpkg-query -W -f='${Conffiles}' #PACKAGE# | sed -n -e \"\\\\' #OLD#'s/.* //p\"`" ]
- then
- rm -f "#OLD#"
- fi
- fi
if [ -L "#RULE#" ]; then
rm -f "#RULE#"
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/debian/changelog new/debhelper/debian/changelog
--- old/debhelper/debian/changelog 2009-03-01 02:01:54.000000000 +0100
+++ new/debhelper/debian/changelog 2009-03-05 01:37:45.000000000 +0100
@@ -1,3 +1,16 @@
+debhelper (7.2.2) unstable; urgency=low
+
+ * dh_installmodules: Give files in /etc/modprobe.d a .conf
+ syntax, as required by new module-init-tools.
+ * dh_installmodules: Add preinst and postinst code to handle
+ cleanly renaming the modprobe.d files on upgrade.
+ * Two updates to conffile moving code from wiki:
+ - Support case where the conffile name is a substring of another
+ conffile's name.
+ - Support case where dpkg-query says the file is obsolete.
+
+ -- Joey Hess <joeyh(a)debian.org> Wed, 04 Mar 2009 19:37:33 -0500
+
debhelper (7.2.1) experimental; urgency=low
* Merged debhelper 7.0.52.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh_installmodules new/debhelper/dh_installmodules
--- old/debhelper/dh_installmodules 2008-12-17 00:13:03.000000000 +0100
+++ new/debhelper/dh_installmodules 2009-03-03 03:06:56.000000000 +0100
@@ -21,7 +21,7 @@
registering kernel modules.
Files named debian/package.modprobe will be installed in
-etc/modprobe.d/package in the package build directory, to be used by
+etc/modprobe.d/package.conf in the package build directory, to be used by
module-init-tools's version of modprobe.
Kernel modules are searched for in the package build directory and if
@@ -102,7 +102,11 @@
if (! -e "$tmp/etc/modprobe.d") {
doit("install","-d","$tmp/etc/modprobe.d");
}
- doit("install","-m","0644",$modprobe_file,"$tmp/etc/modprobe.d/".pkgfilename($package));
+ my $old="/etc/modprobe.d/".pkgfilename($package);
+ my $new=$old.".conf";
+ doit("install","-m","0644",$modprobe_file,"$tmp/$new");
+ autoscript($package,"preinst","preinst-moveconffile","s!#OLD#!$old!g;s!#PACKAGE#!$package!g");
+ autoscript($package,"postinst","postinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$new!g");
}
if (! $dh{NOSCRIPTS}) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/debhelper/dh_installudev new/debhelper/dh_installudev
--- old/debhelper/dh_installudev 2008-12-17 00:13:03.000000000 +0100
+++ new/debhelper/dh_installudev 2009-03-03 03:16:59.000000000 +0100
@@ -79,8 +79,9 @@
if (! $dh{NOSCRIPTS}) {
my $old="/etc/udev/$filename";
my $rule="/etc/udev/rules.d/$dh{PRIORITY}$filename";
- autoscript($package,"preinst","preinst-udev","s!#OLD#!$old!g;s!#RULE#!$rule!g;s!#PACKAGE#!$package!g");
- autoscript($package,"postinst","postinst-udev","s!#OLD#!$old!g;s!#RULE#!$rule!g");
+ autoscript($package,"preinst","preinst-moveconffile","s!#OLD#!$old!g;s!#PACKAGE#!$package!g");
+ autoscript($package,"postinst","postinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$rule!g");
+ autoscript($package,"preinst","preinst-udev","s!#RULE#!$rule!g");
}
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
