r36509 - in /desktop/experimental/gnome-menus/debian: changelog control control.in gnome-menus-blacklist rules
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Wed Jan 2 22:03:46 UTC 2013
Author: jbicha-guest
Date: Wed Jan 2 22:03:46 2013
New Revision: 36509
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36509
Log:
Port gnome-menus-blacklist to python3.
Modified:
desktop/experimental/gnome-menus/debian/changelog
desktop/experimental/gnome-menus/debian/control
desktop/experimental/gnome-menus/debian/control.in
desktop/experimental/gnome-menus/debian/gnome-menus-blacklist
desktop/experimental/gnome-menus/debian/rules
Modified: desktop/experimental/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/changelog?rev=36509&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/changelog [utf-8] Wed Jan 2 22:03:46 2013
@@ -1,5 +1,6 @@
gnome-menus (3.6.1-1) UNRELEASED; urgency=low
+ [ Josselin Mouette ]
* Team upload
* New upstream release.
* gnome-menus-blacklist: patch from Fabian Greffrath to handle
@@ -10,6 +11,9 @@
* 02_kill_debian_menu.patch: new patch. Completely remove Debian menu
entries by discarding them at the parsing stage. This should work
around bug #696530 in menu-xdg.
+
+ [ Dmitrijs Ledkovs ]
+ * Port gnome-menus-blacklist to python3.
-- Josselin Mouette <joss at debian.org> Wed, 07 Nov 2012 15:03:52 +0100
Modified: desktop/experimental/gnome-menus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/control?rev=36509&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/control [utf-8] Wed Jan 2 22:03:46 2013
@@ -11,12 +11,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-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-menus
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-menus
@@ -25,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)
@@ -52,6 +52,23 @@
files and assorted menu related utility programs.
.
This package contains the shared library.
+
+Package: libgnome-menu-3-0-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: libgnome-menu-3-0 (= ${binary:Version}),
+ ${misc:Depends}
+Description: GNOME implementation of the freedesktop menu specification
+ The package contains an implementation of the draft
+ "Desktop Menu Specification" from freedesktop.org:
+ .
+ http://www.freedesktop.org/Standards/menu-spec
+ .
+ Also contained here are the GNOME menu layout configuration files, .directory
+ files and assorted menu related utility programs.
+ .
+ This package contains debugging symbols.
Package: libgnome-menu-3-dev
Architecture: any
Modified: desktop/experimental/gnome-menus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/control.in?rev=36509&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/control.in [utf-8] Wed Jan 2 22:03:46 2013
@@ -7,12 +7,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-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-menus
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/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: desktop/experimental/gnome-menus/debian/gnome-menus-blacklist
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/gnome-menus-blacklist?rev=36509&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/gnome-menus-blacklist [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/gnome-menus-blacklist [utf-8] Wed Jan 2 22:03:46 2013
@@ -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,15 +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)
- if not l.endswith ("\n"):
- out.write("\n")
- 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: desktop/experimental/gnome-menus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/rules?rev=36509&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/rules [utf-8] Wed Jan 2 22:03:46 2013
@@ -19,7 +19,7 @@
binary-install/gnome-menus::
mv debian/gnome-menus/etc/xdg/menus/applications.menu \
debian/gnome-menus/etc/xdg/menus/gnome-applications.menu
- dh_python2 -pgnome-menus
+ dh_python3 -pgnome-menus
clean::
-rm -f $(OUTFILES)
More information about the pkg-gnome-commits
mailing list