Package: ocfs2console Followup-For: Bug #682517 Dear Maintainer,
Please find attached a patch which fixes this issue. The patch also includes fixes for packaging issues. Best, -- .''`. Sébastien Villemot : :' : Debian Maintainer `. `' http://www.dynare.org/sebastien `- GPG Key: 4096R/381A7594
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 07:16:36.000000000 +0000 +++ ocfs2-tools-1.6.4/debian/changelog 2012-08-12 15:11:33.000000000 +0000 @@ -1,3 +1,16 @@ +ocfs2-tools (1.6.4-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove popen2-ignore-depreciation-warn.patch: DeprecationWarnings are now + ignored by default in Python 2.7, and this patch messes things up + (Closes: #682517, LP: #923754) + * Ensure that the package cleans properly and builds twice in a row: + + Add left-over files to debian/clean + + Ignore mkfs.ocfs2.8 and o2image.8 in debian/source/options + (the build changes their indentation) + + -- Sébastien Villemot <sebastien.ville...@ens.fr> Sun, 12 Aug 2012 14:59:45 +0200 + ocfs2-tools (1.6.4-1) unstable; urgency=low * New upstream release. Closes: #669023. diff -Nru ocfs2-tools-1.6.4/debian/clean ocfs2-tools-1.6.4/debian/clean --- ocfs2-tools-1.6.4/debian/clean 2011-10-17 21:31:51.000000000 +0000 +++ ocfs2-tools-1.6.4/debian/clean 2012-08-12 14:34:11.000000000 +0000 @@ -1,4 +1,7 @@ debian/ocfs2-tools.o2cb.* +debian/ocfs2-tools.ocfs2.init ocfs2console/ocfs2interface/*.so ocfs2console/ocfs2interface/confdefs.py vendor/common/ocfs2-tools.spec-generic +vendor/common/o2cb.init +o2monitor/o2hbmonitor 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 15:48:30.000000000 +0000 +++ ocfs2-tools-1.6.4/debian/patches/popen2-ignore-depreciation-warn.patch 1970-01-01 00:00:00.000000000 +0000 @@ -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) <davewal...@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 07:02:42.000000000 +0000 +++ ocfs2-tools-1.6.4/debian/patches/series 2012-08-12 14:51:31.000000000 +0000 @@ -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 diff -Nru ocfs2-tools-1.6.4/debian/source/options ocfs2-tools-1.6.4/debian/source/options --- ocfs2-tools-1.6.4/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ ocfs2-tools-1.6.4/debian/source/options 2012-08-12 14:11:17.000000000 +0000 @@ -0,0 +1 @@ +extend-diff-ignore=mkfs.ocfs2/mkfs.ocfs2.8|o2image/o2image.8
