[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#775026: unblock: gfs2-utils/3.1.3-1.2 (pre-approval)



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package gfs2-utils

Fix an upgrade issue by removing the conflicting obsolete gfs2-tools
initscript from the obsolete gfs2-tools package. (#698375)

NMU uploaded to DELAYED/2

Andreas

unblock gfs2-utils/3.1.3-1.2
diff -Nru gfs2-utils-3.1.3/debian/changelog gfs2-utils-3.1.3/debian/changelog
--- gfs2-utils-3.1.3/debian/changelog	2013-01-11 19:18:10.000000000 +0100
+++ gfs2-utils-3.1.3/debian/changelog	2015-01-10 12:21:37.000000000 +0100
@@ -1,3 +1,20 @@
+gfs2-utils (3.1.3-1.2) unstable; urgency=low
+
+  [ Salvatore Bonaccorso ]
+  * Remove old conffile /etc/init.d/gfs2-tools from gfs2-tools package.
+    Add a Pre-Depends on dpkg to use dpkg-maintscript-helper. Add
+    ${misc:Pre-Depends} to Pre-Depends control file field.
+    Add debian/gfs2-utils.maintscript containing the rm_conffile command to
+    remove /etc/init.d/gfs2-tools init script from superseeded gfs2-tools
+    package. (Closes: #698375)
+
+  [ Andreas Beckmann ]
+  * Non-maintainer upload.
+  * Trick dpkg-maintscript-helper to also run on initial install.
+  * Do not pass obsolete 'start' arguments to update-rc.d
+
+ -- Andreas Beckmann <anbe@debian.org>  Sat, 10 Jan 2015 12:21:37 +0100
+
 gfs2-utils (3.1.3-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru gfs2-utils-3.1.3/debian/control gfs2-utils-3.1.3/debian/control
--- gfs2-utils-3.1.3/debian/control	2013-01-11 19:18:10.000000000 +0100
+++ gfs2-utils-3.1.3/debian/control	2015-01-10 11:49:29.000000000 +0100
@@ -10,6 +10,7 @@
 
 Package: gfs2-utils
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}, gfs2-cluster (= ${binary:Version}), psmisc, cman
 Replaces: gfs2-tools (<= 3.0.17)
 Conflicts: gfs2-tools (<= 3.0.17)
diff -Nru gfs2-utils-3.1.3/debian/gfs2-utils.maintscript gfs2-utils-3.1.3/debian/gfs2-utils.maintscript
--- gfs2-utils-3.1.3/debian/gfs2-utils.maintscript	1970-01-01 01:00:00.000000000 +0100
+++ gfs2-utils-3.1.3/debian/gfs2-utils.maintscript	2015-01-10 12:21:30.000000000 +0100
@@ -0,0 +1,2 @@
+# HACK: trick dpkg-maintscript-helper to also do the rm_conffile on initial install by always giving a not-empty "old version" argument
+rm_conffile /etc/init.d/gfs2-tools 3.1.3-1.2~ gfs2-tools -- "$@" 0
diff -Nru gfs2-utils-3.1.3/debian/rules gfs2-utils-3.1.3/debian/rules
--- gfs2-utils-3.1.3/debian/rules	2013-01-11 19:18:10.000000000 +0100
+++ gfs2-utils-3.1.3/debian/rules	2015-01-10 12:16:52.000000000 +0100
@@ -31,8 +31,7 @@
 	dh_install --list-missing
 
 override_dh_installinit:
-	dh_installinit -p gfs2-utils --no-start --no-restart-on-upgrade -- start 65 S . start 2 0 6 .
-	dh_installinit -p gfs2-cluster --no-start --no-restart-on-upgrade -- start 65 S . start 2 0 6 .
+	dh_installinit --no-start --no-restart-on-upgrade
 
 override_dh_auto_clean:
 	dh_auto_clean

Reply to: