Merge lp:~xnox/gnome-menus/ubuntu-py3 into lp:~ubuntu-desktop/gnome-menus/ubuntu

[Dimitri John Ledkov]

We don't actually use gnome-menus-blacklist directly, but I ported it to python3 anyway to drop the python2 dependency from this seeded package.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-14 21:41:04 +0000
+++ debian/changelog	2012-11-27 00:47:36 +0000
@@ -1,3 +1,9 @@
+gnome-menus (3.6.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * Port gnome-menus-blacklist to python3.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Tue, 20 Nov 2012 01:27:03 +0000
+
 gnome-menus (3.6.1-0ubuntu1) raring; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2012-05-21 17:15:55 +0000
+++ debian/control	2012-11-27 00:47:36 +0000
@@ -2,23 +2,22 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: gnome-menus
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Michael Biebl <[e-mail]>, Sjoerd Simons <[e-mail]>
+Uploaders: Debian GNOME Maintainers <[e-mail]>
 Build-Depends: debhelper (>= 8.1.0~),
                cdbs (>= 0.4.73),
                libglib2.0-dev (>= 2.30.0),
                gnome-pkg-tools,
-               python (>= 2.6.6-3~),
+               python3 (>= 3.1),
                intltool (>= 0.40.0),
                libgirepository1.0-dev (>= 0.10.7-1~),
                gobject-introspection (>= 0.9.12-4~)
 Standards-Version: 3.9.3
-X-Python-Version: >= 2.3
+X-Python3-Version: >= 3.1
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-menus/ubuntu
 
 Package: gnome-menus
@@ -26,7 +25,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         ${python:Depends}
+         ${python3:Depends}
 Breaks: gnome-panel (<< 2.91),
         gnome-control-center (<< 2.91),
         alacarte (<< 0.13.2-2)

=== modified file 'debian/control.in'
--- debian/control.in	2012-05-21 17:15:55 +0000
+++ debian/control.in	2012-11-27 00:47:36 +0000
@@ -8,12 +8,12 @@
                cdbs (>= 0.4.73),
                libglib2.0-dev (>= 2.30.0),
                gnome-pkg-tools,
-               python (>= 2.6.6-3~),
+               python3 (>= 3.1),
                intltool (>= 0.40.0),
                libgirepository1.0-dev (>= 0.10.7-1~),
                gobject-introspection (>= 0.9.12-4~)
 Standards-Version: 3.9.3
-X-Python-Version: >= 2.3
+X-Python3-Version: >= 3.1
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-menus/ubuntu
 
 Package: gnome-menus
@@ -21,7 +21,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         ${python:Depends}
+         ${python3:Depends}
 Breaks: gnome-panel (<< 2.91),
         gnome-control-center (<< 2.91),
         alacarte (<< 0.13.2-2)

=== modified file 'debian/gnome-menus-blacklist'
--- debian/gnome-menus-blacklist	2011-05-16 11:00:23 +0000
+++ debian/gnome-menus-blacklist	2012-11-27 00:47:36 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 
 sourcedir = "/usr/share/applications"
 destdir = "/usr/share/gnome/applications"
@@ -9,11 +9,12 @@
 # Parse blacklist file
 blacklist = []
 try:
-    for l in file (blacklist_file):
-        l = l.strip()
-        if l.startswith("#"):
-            continue
-        blacklist.append(l)
+    with open(blacklist_file, 'r', encoding='utf_8') as fp:
+        for l in fp.readlines():
+            l = l.strip()
+            if l.startswith("#"):
+                continue
+            blacklist.append(l)
 except IOError:
     sys.stderr.write("Warning: %s cannot be opened\n"%blacklist_file)
 
@@ -57,13 +58,13 @@
     # Copy file, adding a NoDisplay flag
     if not os.path.isdir (absdir):
         os.makedirs (absdir)
-    out = file (destfile, "w")
-    for l in file (sourcefile):
-        if l.startswith ("NoDisplay="):
-            continue
-        out.write(l)
-    out.write ("NoDisplay=true\n")
-    out.close()
+    with open(destfile, 'wt', encoding='utf_8') as fp_out:
+        with open(sourcefile, 'rt', encoding='utf_8') as fp_in:
+            for l in fp_in.readlines():
+                if l.startswith ("NoDisplay="):
+                    continue
+                fp_out.write(l)
+        fp_out.write("NoDisplay=true\n")
 
     # Set mtime so that the file is not touched unless it has changed
     os.utime (destfile, (source_time, source_time))

=== modified file 'debian/menus.blacklist'
--- debian/menus.blacklist	2012-05-21 17:15:55 +0000
+++ debian/menus.blacklist	2012-11-27 00:47:36 +0000
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # openjdk-6
 openjdk-6-policytool.desktop
 

=== modified file 'debian/rules'
--- debian/rules	2012-02-08 10:35:07 +0000
+++ debian/rules	2012-11-27 00:47:36 +0000
@@ -17,7 +17,7 @@
 build/gnome-menus:: $(OUTFILES)
 
 binary-install/gnome-menus::
-	dh_python2 -pgnome-menus
+	dh_python3 -pgnome-menus
 
 clean::
 	-rm -f $(OUTFILES)