r35003 - in /desktop/unstable/gnome-menus/debian: changelog control control.in gnome-menus.maintscript patches/05_debian_menu.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Fri May 18 20:08:26 UTC 2012
Author: biebl
Date: Fri May 18 20:08:25 2012
New Revision: 35003
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35003
Log:
debian/patches/05_debian_menu.patch: Refreshed.
Modified:
desktop/unstable/gnome-menus/debian/changelog
desktop/unstable/gnome-menus/debian/control
desktop/unstable/gnome-menus/debian/control.in
desktop/unstable/gnome-menus/debian/gnome-menus.maintscript
desktop/unstable/gnome-menus/debian/patches/05_debian_menu.patch
Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=35003&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/changelog [utf-8] Fri May 18 20:08:25 2012
@@ -10,6 +10,7 @@
* debian/gnome-menus.maintscript: Use new versioning scheme as recommended
by dpkg-maintscript-helper which better handles local modifications and
(bin)NMUs.
+ * debian/patches/05_debian_menu.patch: Refreshed.
-- Michael Biebl <biebl at debian.org> Thu, 05 Apr 2012 18:52:41 +0200
Modified: desktop/unstable/gnome-menus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/control?rev=35003&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/control [utf-8] Fri May 18 20:08:25 2012
@@ -10,13 +10,12 @@
Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 8.1.0~),
cdbs (>= 0.4.73),
- libglib2.0-dev (>= 2.29.15),
+ libglib2.0-dev (>= 2.30.0),
gnome-pkg-tools,
python (>= 2.6.6-3~),
intltool (>= 0.40.0),
libgirepository1.0-dev (>= 0.9.5),
- gobject-introspection (>= 0.9.12-4~),
- gir1.2-glib-2.0
+ gobject-introspection (>= 0.9.12-4~)
Standards-Version: 3.9.2
X-Python-Version: >= 2.3
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-menus
@@ -61,7 +60,7 @@
Depends: ${misc:Depends},
libgnome-menu-3-0 (= ${binary:Version}),
gir1.2-gmenu-3.0 (= ${binary:Version}),
- libglib2.0-dev (>= 2.15.2)
+ libglib2.0-dev (>= 2.30.0)
Replaces: gir-repository-dev (<< 0.6.5-6)
Description: GNOME implementation of the freedesktop menu specification
The package contains an implementation of the draft
Modified: desktop/unstable/gnome-menus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/control.in?rev=35003&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/control.in [utf-8] Fri May 18 20:08:25 2012
@@ -5,13 +5,12 @@
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 8.1.0~),
cdbs (>= 0.4.73),
- libglib2.0-dev (>= 2.29.15),
+ libglib2.0-dev (>= 2.30.0),
gnome-pkg-tools,
python (>= 2.6.6-3~),
intltool (>= 0.40.0),
- libgirepository1.0-dev (>= 0.9.5),
- gobject-introspection (>= 0.9.12-4~),
- gir1.2-glib-2.0
+ libgirepository1.0-dev (>= 0.10.7-1~),
+ gobject-introspection (>= 0.9.12-4~)
Standards-Version: 3.9.2
X-Python-Version: >= 2.3
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-menus
@@ -56,7 +55,7 @@
Depends: ${misc:Depends},
libgnome-menu-3-0 (= ${binary:Version}),
gir1.2-gmenu-3.0 (= ${binary:Version}),
- libglib2.0-dev (>= 2.15.2)
+ libglib2.0-dev (>= 2.30.0)
Replaces: gir-repository-dev (<< 0.6.5-6)
Description: GNOME implementation of the freedesktop menu specification
The package contains an implementation of the draft
Modified: desktop/unstable/gnome-menus/debian/gnome-menus.maintscript
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/gnome-menus.maintscript?rev=35003&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/gnome-menus.maintscript [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/gnome-menus.maintscript [utf-8] Fri May 18 20:08:25 2012
@@ -1,2 +1,2 @@
-rm_conffile /etc/xdg/menus/gnome-preferences.menu 2.22.2-4 gnome-menus
-rm_conffile /etc/xdg/menus/gnome-settings.menu 3.0.1-2 gnome-menus
+rm_conffile /etc/xdg/menus/gnome-preferences.menu 2.24.2-1~ gnome-menus
+rm_conffile /etc/xdg/menus/gnome-settings.menu 3.0.1-3~ gnome-menus
Modified: desktop/unstable/gnome-menus/debian/patches/05_debian_menu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/05_debian_menu.patch?rev=35003&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/05_debian_menu.patch [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/patches/05_debian_menu.patch [utf-8] Fri May 18 20:08:25 2012
@@ -1,9 +1,10 @@
-diff -urN gnome-menus-2.15.91.orig/layout/applications.menu gnome-menus-2.15.91/layout/applications.menu
---- gnome-menus-2.15.91.orig/layout/applications.menu 2006-08-13 18:46:45.000000000 +0200
-+++ gnome-menus-2.15.91/layout/applications.menu 2006-08-13 18:49:52.000000000 +0200
-@@ -150,4 +150,11 @@
- </Include>
- </Menu> <!-- End Other -->
+Index: gnome-menus-3.4.2/layout/applications.menu
+===================================================================
+--- gnome-menus-3.4.2.orig/layout/applications.menu 2012-05-18 22:07:48.359105100 +0200
++++ gnome-menus-3.4.2/layout/applications.menu 2012-05-18 22:07:49.191105070 +0200
+@@ -156,4 +156,11 @@
+ <Merge type="files" />
+ </Layout>
+ <!-- The Debian menu -->
+ <Menu>
More information about the pkg-gnome-commits
mailing list