r42232 - in /desktop/experimental/gnome-panel: ./ debian/ debian/patches/
mitya57-guest at users.alioth.debian.org
mitya57-guest at users.alioth.debian.org
Sun Aug 24 13:43:00 UTC 2014
Author: mitya57-guest
Date: Sun Aug 24 13:43:00 2014
New Revision: 42232
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42232
Log:
Merge with unstable branch
Removed:
desktop/experimental/gnome-panel/debian/patches/01_menus_rename.patch
desktop/experimental/gnome-panel/debian/patches/10_bookmarks_limit.patch
desktop/experimental/gnome-panel/debian/patches/fix-gweather-crash.patch
desktop/experimental/gnome-panel/debian/patches/git_build_with_gweather_39.patch
desktop/experimental/gnome-panel/debian/patches/git_drop_startupnotify.patch
desktop/experimental/gnome-panel/debian/patches/git_fix_moving_applets.patch
Modified:
desktop/experimental/gnome-panel/ (props changed)
desktop/experimental/gnome-panel/debian/changelog
desktop/experimental/gnome-panel/debian/compat
desktop/experimental/gnome-panel/debian/control
desktop/experimental/gnome-panel/debian/control.in
desktop/experimental/gnome-panel/debian/gnome-panel-data.install
desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch
desktop/experimental/gnome-panel/debian/patches/series
Propchange: desktop/experimental/gnome-panel/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 24 13:43:00 2014
@@ -1 +1 @@
-/desktop/unstable/gnome-panel:38477-39823
+/desktop/unstable/gnome-panel:38477-39823,42212-42231
Modified: desktop/experimental/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/changelog?rev=42232&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/changelog [utf-8] Sun Aug 24 13:43:00 2014
@@ -1,18 +1,39 @@
gnome-panel (3.10.0-1) UNRELEASED; urgency=medium
- [ Dmitry Shachnev ]
- * Remove useless Recommends on gnome-session (closes: #742205).
- * Update Homepage URL.
+ * New upstream release.
* Remove gnome-session-f{all,lash}back packages, they have been
moved to the new source package (gnome-flashback).
* Update (build-)dependencies for 3.10.0 (no longer depend on
- gconf2 and python).
+ gconf2 and python)
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Wed, 20 Aug 2014 19:45:23 +0400
+
+gnome-panel (3.8.1-1) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ * Drop the following patches, applied upstream:
+ - git_build_with_gweather_39.patch
+ - git_fix_moving_applets.patch
+ - git_drop_startupnotify.patch
+ - 01_menus_rename.patch
+ - 10_bookmarks_limit.patch
+ - fix-gweather-crash.patch
+ * Refresh 14_revert_timedate_change.patch.
+ * Add myself to Uploaders.
+ * Remove useless Recommends on gnome-session (closes: #742205).
+ * Update Homepage URL.
+ * Bump libgnome-menu-3-dev required version to 3.7.90.
+ * Bump debhelper compat level to 9.
+ * Run wrap-and-sort.
[ Josselin Mouette ]
* Make gnome-session-flashback depend on gnome-screensaver, it’s not
really an optional feature and GNOME doesn’t bring it in anymore.
- -- Dmitry Shachnev <mitya57 at gmail.com> Wed, 20 Aug 2014 19:45:23 +0400
+ -- Andreas Henriksson <andreas at fatal.se> Sat, 23 Aug 2014 20:59:17 -0700
gnome-panel (3.8.0-3) unstable; urgency=low
Modified: desktop/experimental/gnome-panel/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/compat?rev=42232&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/compat [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/compat [utf-8] Sun Aug 24 13:43:00 2014
@@ -1 +1 @@
-8
+9
Modified: desktop/experimental/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control?rev=42232&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/control [utf-8] Sun Aug 24 13:43:00 2014
@@ -7,10 +7,10 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Dmitry Shachnev <mitya57 at gmail.com>, Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Standards-Version: 3.9.5
Build-Depends: cdbs (>= 0.4.41),
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
evolution-data-server-dev (>= 3.5.3),
gnome-pkg-tools (>= 0.14),
@@ -21,28 +21,26 @@
libdconf-dev (>= 0.13.4),
libecal1.2-dev (>= 3.5.3),
libedataserver1.2-dev (>= 3.5.3),
- libgconf2-dev (>= 2.6.1),
libgdk-pixbuf2.0-dev (>= 2.25.2),
libgirepository1.0-dev (>= 0.10.7-1~),
- libglib2.0-dev (>= 2.31.14),
+ libglib2.0-dev (>= 2.35.0),
libgnome-desktop-3-dev (>= 2.91.0),
- libgnome-menu-3-dev (>= 3.1.4),
+ libgnome-menu-3-dev (>= 3.7.90),
libgtk-3-dev (>= 3.3.8),
libgweather-3-dev (>= 3.10),
libice-dev,
libpango1.0-dev (>= 1.15.4),
libpolkit-gobject-1-dev,
- librsvg2-dev,
+ librsvg2-dev (>= 2.36.2),
libsm-dev,
libtelepathy-glib-dev (>= 0.14.0),
- libwnck-3-dev (>= 2.91.0),
+ libwnck-3-dev (>= 3.4.6),
libx11-dev,
libxau-dev,
libxrandr-dev (>= 2:1.2.0),
libxt-dev,
network-manager-dev (>= 0.6) [linux-any],
pkg-config (>= 0.9.0),
- python,
yelp-tools
Homepage: https://wiki.gnome.org/action/show/Projects/GnomeFlashback
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-panel
@@ -51,9 +49,7 @@
Package: gir1.2-panelapplet-4.0
Section: introspection
Architecture: any
-Depends: ${gir:Depends},
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
Description: GObject introspection for the GNOME Panel Applet library
This package contains introspection data for the libpanel-applet
library. It can be used by languages supporting dynamic bindings with
@@ -62,11 +58,11 @@
Package: gnome-panel
Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends},
- gnome-icon-theme-symbolic (>= 3.0.0),
+Depends: gnome-icon-theme-symbolic (>= 3.0.0),
gnome-menus (>= 3.1.4),
gnome-panel-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Recommends: alacarte,
evolution-data-server,
gnome-applets,
@@ -104,9 +100,9 @@
Section: debug
Priority: extra
Architecture: any
-Depends: ${misc:Depends},
- gnome-panel (= ${binary:Version}),
- libpanel-applet-4-0 (= ${binary:Version})
+Depends: gnome-panel (= ${binary:Version}),
+ libpanel-applet-4-0 (= ${binary:Version}),
+ ${misc:Depends}
Description: GNOME Panel and library for panel applets - debugging symbols
This package contains debugging symbols for gnome-panel and the
libpanel-applet library. It is provided to help debugging problem in
@@ -116,20 +112,18 @@
Package: libpanel-applet-4-0
Section: libs
Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: library for GNOME Panel applets
This library is used by GNOME Panel applets.
Package: libpanel-applet-4-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends},
- gir1.2-panelapplet-4.0 (= ${binary:Version}),
- libgconf2-dev,
- libglib2.0-dev (>= 2.31.14),
+Depends: gir1.2-panelapplet-4.0 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.35.0),
libgtk-3-dev (>= 3.3.8),
- libpanel-applet-4-0 (= ${binary:Version})
+ libpanel-applet-4-0 (= ${binary:Version}),
+ ${misc:Depends}
Recommends: libpanel-applet-4-doc
Description: library for GNOME Panel applets - development files
This package provides the include files and static library for the GNOME
Modified: desktop/experimental/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control.in?rev=42232&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/control.in [utf-8] Sun Aug 24 13:43:00 2014
@@ -2,10 +2,10 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: @GNOME_TEAM@
+Uploaders: Dmitry Shachnev <mitya57 at gmail.com>, @GNOME_TEAM@
Standards-Version: 3.9.5
Build-Depends: cdbs (>= 0.4.41),
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
evolution-data-server-dev (>= 3.5.3),
gnome-pkg-tools (>= 0.14),
@@ -13,7 +13,6 @@
gtk-doc-tools (>= 1.0),
intltool (>= 0.40.0),
libcairo2-dev (>= 1.10.0),
- libdbus-glib-1-dev (>= 0.80),
libdconf-dev (>= 0.13.4),
libecal1.2-dev (>= 3.5.3),
libedataserver1.2-dev (>= 3.5.3),
@@ -45,9 +44,7 @@
Package: gir1.2-panelapplet-4.0
Section: introspection
Architecture: any
-Depends: ${gir:Depends},
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
Description: GObject introspection for the GNOME Panel Applet library
This package contains introspection data for the libpanel-applet
library. It can be used by languages supporting dynamic bindings with
@@ -56,11 +53,11 @@
Package: gnome-panel
Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends},
- gnome-icon-theme-symbolic (>= 3.0.0),
+Depends: gnome-icon-theme-symbolic (>= 3.0.0),
gnome-menus (>= 3.1.4),
gnome-panel-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Recommends: alacarte,
evolution-data-server,
gnome-applets,
@@ -98,9 +95,9 @@
Section: debug
Priority: extra
Architecture: any
-Depends: ${misc:Depends},
- gnome-panel (= ${binary:Version}),
- libpanel-applet-4-0 (= ${binary:Version})
+Depends: gnome-panel (= ${binary:Version}),
+ libpanel-applet-4-0 (= ${binary:Version}),
+ ${misc:Depends}
Description: GNOME Panel and library for panel applets - debugging symbols
This package contains debugging symbols for gnome-panel and the
libpanel-applet library. It is provided to help debugging problem in
@@ -110,19 +107,18 @@
Package: libpanel-applet-4-0
Section: libs
Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: library for GNOME Panel applets
This library is used by GNOME Panel applets.
Package: libpanel-applet-4-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends},
- gir1.2-panelapplet-4.0 (= ${binary:Version}),
+Depends: gir1.2-panelapplet-4.0 (= ${binary:Version}),
libglib2.0-dev (>= 2.35.0),
libgtk-3-dev (>= 3.3.8),
- libpanel-applet-4-0 (= ${binary:Version})
+ libpanel-applet-4-0 (= ${binary:Version}),
+ ${misc:Depends}
Recommends: libpanel-applet-4-doc
Description: library for GNOME Panel applets - development files
This package provides the include files and static library for the GNOME
Modified: desktop/experimental/gnome-panel/debian/gnome-panel-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/gnome-panel-data.install?rev=42232&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/gnome-panel-data.install [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/gnome-panel-data.install [utf-8] Sun Aug 24 13:43:00 2014
@@ -1,6 +1,6 @@
+debian/source_gnome-panel.py usr/share/apport/package-hooks
usr/share/glib-2.0
usr/share/gnome-panel
usr/share/help
usr/share/icons
usr/share/locale
-debian/source_gnome-panel.py usr/share/apport/package-hooks
Modified: desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch?rev=42232&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/14_revert_timedate_change.patch [utf-8] Sun Aug 24 13:43:00 2014
@@ -1,6 +1,6 @@
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
-@@ -65,6 +65,7 @@
+@@ -63,6 +63,7 @@
#include "clock-location-tile.h"
#include "clock-map.h"
#include "clock-utils.h"
@@ -10,7 +10,7 @@
enum {
--- a/applets/clock/set-timezone.c
+++ b/applets/clock/set-timezone.c
-@@ -23,17 +23,23 @@
+@@ -22,17 +22,23 @@
#endif
#include <gio/gio.h>
@@ -38,7 +38,7 @@
gint value;
guint64 stamp;
} Cache;
-@@ -59,6 +65,27 @@
+@@ -58,6 +64,27 @@
return system;
}
@@ -66,7 +66,7 @@
static int
can_set (Cache *cache, const gchar *method_name)
{
-@@ -66,39 +93,23 @@
+@@ -65,39 +92,23 @@
if (now - cache->stamp > (CACHE_VALIDITY_SEC * 1000000))
{
@@ -123,7 +123,7 @@
}
return cache->value;
-@@ -159,7 +170,7 @@
+@@ -158,7 +169,7 @@
g_dbus_connection_call (system_bus, MECHANISM_BUS_NAME,
MECHANISM_OBJECT_PATH, MECHANISM_INTERFACE,
Modified: desktop/experimental/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/series?rev=42232&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/series [utf-8] Sun Aug 24 13:43:00 2014
@@ -1,10 +1,4 @@
-git_build_with_gweather_39.patch
-git_fix_moving_applets.patch
-git_drop_startupnotify.patch
01_gnome-wm.patch
-01_menus_rename.patch
03_tasklist_orientation.patch
-10_bookmarks_limit.patch
11_compat_options.patch
14_revert_timedate_change.patch
-fix-gweather-crash.patch
More information about the pkg-gnome-commits
mailing list