Merge lp:~logan/ubuntu/raring/ocfs2-tools/debian-merge into lp:ubuntu/raring/ocfs2-tools

[Logan Rosen]

[Barry Warsaw (barry)]

This branch looks good in and of itself, however the problem with this package goes deeper in that ocfs2-tools 1.6.4-1ubuntu1 (i.e. the raring version, last built for quantal) FTBFS on raring now. It fails in the same way after the merge:

for p in o2cb.pc o2dlm.pc ocfs2.pc; do \
   /usr/bin/install -c -m 644 $p /«PKGBUILDDIR»/debian/tmp/usr/lib/pkgconfig/$p; \
        done
make[1]: Leaving directory `/«PKGBUILDDIR»'
   dh_install
dh_install: ocfs2console missing files (debian/tmp/usr/lib/python2.?/site-packages/ocfs2interface/*), aborting
make: *** [binary] Error 2

That needs to be fixed before this merge can be uploaded.

review: Needs Fixing

[Barry Warsaw (barry)]

I believe this is caused by a non-multiarch aware pythondev.m4 AM_CHECK_PYTHON_HEADERS. You can't assume that sys.prefix yields the -I include directory. Should be fixable using the right python-config magic.

[Logan Rosen (logan)]

Actually looks like this has been merged with changes from Barry.

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2012-12-08 23:05:23 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2012-12-08 23:05:23 +0000
@@ -0,0 +1,1 @@
+series

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-05-23 14:01:28 +0000
+++ .pc/applied-patches	2012-12-08 23:05:23 +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

=== removed directory '.pc/popen2-ignore-depreciation-warn.patch'
=== removed directory '.pc/popen2-ignore-depreciation-warn.patch/ocfs2console'
=== removed file '.pc/popen2-ignore-depreciation-warn.patch/ocfs2console/ocfs2console'
--- .pc/popen2-ignore-depreciation-warn.patch/ocfs2console/ocfs2console	2011-03-25 16:53:58 +0000
+++ .pc/popen2-ignore-depreciation-warn.patch/ocfs2console/ocfs2console	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-#!/usr/bin/python -W ignore::DeprecationWarning
-
-from ocfs2interface.about import process_args
-nodeconf = process_args()
-
-#
-# Current pygtk treats no DISPLAY as a WARNING.  This means that
-# pygtk initialization tries to continue even after gtk_init() has failed.
-# All sorts of fun ensues.  To prevent this, we turn the warning into an
-# error for the duration of gtk initialization.
-#
-# Originally reported as Novell bugzilla #448523.
-#
-import warnings
-warnings.filterwarnings("error")
-try:
-    import gtk
-except Exception, e:
-    import sys
-    if str(e).lower().find('display') == -1:
-        print >>sys.stderr, '''ERROR: Unable to initialize the windowing
-system: %s\n''' % e
-    else:
-        print >>sys.stderr, '''ERROR: ocfs2console needs an X11 display.
-Make sure a proper setup for your display environment exists.\n'''
-    sys.exit(1)
-warnings.filters.pop(0)
-
-if nodeconf:
-    from ocfs2interface.nodeconfig import node_config
-    node_config()
-else:
-    from ocfs2interface.console import main
-    main()

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-23 14:01:28 +0000
+++ debian/changelog	2012-12-08 23:05:23 +0000
@@ -1,3 +1,19 @@
+ocfs2-tools (1.6.4-2ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Build using dh_python2.
+    - debian/patches/ubuntu-umode-ftbfs.patch: Fix FTBFS with undefined
+      umode_t type in 3.3 kernels.
+
+ -- Logan Rosen <[e-mail]>  Sat, 08 Dec 2012 18:00:15 -0500
+
+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é <[e-mail]>  Wed, 15 Aug 2012 09:31:09 +0200
+
 ocfs2-tools (1.6.4-1ubuntu1) quantal; urgency=low
 
   * Merge from Debian testing (LP: #1003157).  Remaining changes:

=== removed file 'debian/patches/popen2-ignore-depreciation-warn.patch'
--- debian/patches/popen2-ignore-depreciation-warn.patch	2011-03-25 16:53:58 +0000
+++ debian/patches/popen2-ignore-depreciation-warn.patch	1970-01-01 00:00:00 +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) <[e-mail]>
-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:

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-05-23 14:01:28 +0000
+++ debian/patches/series	2012-12-08 23:05:23 +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

=== modified file 'ocfs2console/ocfs2console'
--- ocfs2console/ocfs2console	2011-03-25 16:53:58 +0000
+++ ocfs2console/ocfs2console	2012-12-08 23:05:23 +0000
@@ -13,11 +13,6 @@
 #
 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: