Allow ocfs2-tools 1.6.4-2 into wheezy
Dear release team,
I have uploaded a new revision of ocfs2-tools to unstable which fixes bug #682517
(inability to launch the ocfs2console GUI):
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682517
The fix (thanks Sébastien Villemot) is straight-forward: drop a bad Debian/Ubuntu specific
patch, as can be seen from the attached debdiff.
Could you please let this new version migrate into wheezy?
Thanks,
Jeremy
diff -Nru ocfs2-tools-1.6.4/debian/changelog ocfs2-tools-1.6.4/debian/changelog
--- ocfs2-tools-1.6.4/debian/changelog 2012-04-18 09:16:36.000000000 +0200
+++ ocfs2-tools-1.6.4/debian/changelog 2012-08-15 09:32:32.000000000 +0200
@@ -1,3 +1,10 @@
+ocfs2-tools (1.6.4-2) unstable; urgency=low
+
+ * Remove popen2-ignore-depreciation-warn.patch: it has the opposite effect,
+ turning deprecation warnings into errors (Closes: #682517, LP: #923754).
+
+ -- Jeremy Lainé <jeremy.laine@m4x.org> Wed, 15 Aug 2012 09:31:09 +0200
+
ocfs2-tools (1.6.4-1) unstable; urgency=low
* New upstream release. Closes: #669023.
diff -Nru ocfs2-tools-1.6.4/debian/patches/popen2-ignore-depreciation-warn.patch ocfs2-tools-1.6.4/debian/patches/popen2-ignore-depreciation-warn.patch
--- ocfs2-tools-1.6.4/debian/patches/popen2-ignore-depreciation-warn.patch 2011-03-25 16:48:30.000000000 +0100
+++ ocfs2-tools-1.6.4/debian/patches/popen2-ignore-depreciation-warn.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-Description: Ignore the depreciation warning that popen2 will raise when it is imported.
- Pending conversion to subprocess module.
-Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
-Bug: https://launchpad.net/bugs/655548
---- a/ocfs2console/ocfs2console
-+++ b/ocfs2console/ocfs2console
-@@ -13,6 +13,11 @@
- #
- import warnings
- warnings.filterwarnings("error")
-+
-+# Ignore the depreciation warning that popen2 will raise when it is imported.
-+# FIXME: Pending conversion to subprocess module.
-+warnings.simplefilter("ignore", DeprecationWarning)
-+
- try:
- import gtk
- except Exception, e:
diff -Nru ocfs2-tools-1.6.4/debian/patches/series ocfs2-tools-1.6.4/debian/patches/series
--- ocfs2-tools-1.6.4/debian/patches/series 2012-04-18 09:02:42.000000000 +0200
+++ ocfs2-tools-1.6.4/debian/patches/series 2012-08-15 09:41:00.000000000 +0200
@@ -5,7 +5,6 @@
shorten-manpage-lines.patch
ld-no-add-needed.diff
ld-as-needed.diff
-popen2-ignore-depreciation-warn.patch
ocfs2-controld-pcmk-id.patch
format-security.patch
ocfs2-controld-headers.patch
Reply to: