r45327 - in /desktop/unstable/gnome-panel: ./ debian/ debian/patches/ debian/scripts/
mitya57 at users.alioth.debian.org
mitya57 at users.alioth.debian.org
Sun Jun 21 14:08:17 UTC 2015
Author: mitya57
Date: Sun Jun 21 14:08:16 2015
New Revision: 45327
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45327
Log:
Merge experimental branch into unstable
Added:
desktop/unstable/gnome-panel/debian/clean
- copied unchanged from r45326, desktop/experimental/gnome-panel/debian/clean
desktop/unstable/gnome-panel/debian/gir1.2-panelapplet-5.0.install
- copied unchanged from r45326, desktop/experimental/gnome-panel/debian/gir1.2-panelapplet-5.0.install
desktop/unstable/gnome-panel/debian/libpanel-applet-dev.install
- copied unchanged from r45326, desktop/experimental/gnome-panel/debian/libpanel-applet-dev.install
desktop/unstable/gnome-panel/debian/libpanel-applet-doc.install
- copied unchanged from r45326, desktop/experimental/gnome-panel/debian/libpanel-applet-doc.install
desktop/unstable/gnome-panel/debian/libpanel-applet0.install
- copied unchanged from r45326, desktop/experimental/gnome-panel/debian/libpanel-applet0.install
desktop/unstable/gnome-panel/debian/libpanel-applet0.symbols
- copied unchanged from r45326, desktop/experimental/gnome-panel/debian/libpanel-applet0.symbols
desktop/unstable/gnome-panel/debian/patches/ (props changed)
- copied from r45326, desktop/experimental/gnome-panel/debian/patches/
Removed:
desktop/unstable/gnome-panel/debian/gir1.2-panelapplet-4.0.install
desktop/unstable/gnome-panel/debian/gnome-panel-data.maintscript
desktop/unstable/gnome-panel/debian/gnome-session-flashback.install
desktop/unstable/gnome-panel/debian/gnome-session-flashback.postinst
desktop/unstable/gnome-panel/debian/gnome-session-flashback.prerm
desktop/unstable/gnome-panel/debian/gnome-wm.desktop
desktop/unstable/gnome-panel/debian/libpanel-applet-4-0.install
desktop/unstable/gnome-panel/debian/libpanel-applet-4-0.symbols
desktop/unstable/gnome-panel/debian/libpanel-applet-4-dev.install
desktop/unstable/gnome-panel/debian/libpanel-applet-4-doc.install
desktop/unstable/gnome-panel/debian/scripts/
Modified:
desktop/unstable/gnome-panel/ (props changed)
desktop/unstable/gnome-panel/debian/changelog
desktop/unstable/gnome-panel/debian/control
desktop/unstable/gnome-panel/debian/control.in
desktop/unstable/gnome-panel/debian/rules
Propchange: desktop/unstable/gnome-panel/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 21 14:08:16 2015
@@ -1 +1,2 @@
+/desktop/experimental/gnome-panel:42212-45326
/desktop/unstable/gnome-panel:38477-39823
Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=45327&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog [utf-8] Sun Jun 21 14:08:16 2015
@@ -1,3 +1,72 @@
+gnome-panel (3.16.1-3) UNRELEASED; urgency=medium
+
+ * Drop debian/gnome-panel-data.maintscript, it was only needed for
+ upgrades from pre-wheezy.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 20 Jun 2015 11:10:08 +0300
+
+gnome-panel (3.16.1-2) experimental; urgency=medium
+
+ * debian/rules: Fix package name in dh_makeshlibs flags.
+ * Revert the convertion to multi-arch. We cannot yet do that because
+ paths to applets libraries are read from *.panel_applet files in
+ /usr/share/gnome-panel, and thus should be architecure-independent.
+ If in a future release .panel_applet files are moved into /usr/lib,
+ then we will be able to reconsider this change.
+ * Restore and refresh fix_typelibdir.patch.
+ * Move evolution-common from Depends to Recommends, following upstream
+ change in 3.16.1.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 11 Jun 2015 13:13:27 +0300
+
+gnome-panel (3.16.1-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Bump libgtk-3-dev and libgweather-3-dev build-dependencies, according
+ to configure.ac.
+ * Drop obsolete libice-dev and libxt-dev build-dependencies.
+ * Do not pass --with-in-process-applets=all option to configure, it is
+ now default.
+ * Add two new symbols to debian/libpanel-applet0.symbols.
+ * Convert to multi-arch.
+ * Drop fix_typelibdir.patch, no longer needed (as we now pass multi-arch
+ libdir to configure).
+ * Add debian/clean to fix build twice in a row.
+ * Remove dependencies on gnome-icon-theme. It has been superseded by
+ adwaita-icon-theme, which is pulled in by libgtk-3-common anyway.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 28 May 2015 16:14:48 +0300
+
+gnome-panel (3.14.0-2) experimental; urgency=medium
+
+ * Recommend gnome-session-flashback 3.14.0, as that is the first
+ version providing GNOME-Flashback desktop name.
+ * Rebuild against libical1a.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Fri, 09 Jan 2015 19:25:18 +0300
+
+gnome-panel (3.14.0-1) experimental; urgency=medium
+
+ * 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.14.0 (no longer depend on
+ gconf2, python and network-manager).
+ * Break old libpanel-applet package and remove obsolete Breaks.
+ * Remove all previous patches, no longer needed or applied upstream.
+ * Rename packages for library name change:
+ - libpanel-applet-4-0 → libpanel-applet0
+ - libpanel-applet-4-dev → libpanel-applet-dev
+ - libpanel-applet-4-doc → libpanel-applet-doc
+ - gir1.2-panelapplet-4.0 → gir1.2-panelapplet-5.0
+ * Update libpanel-applet0.symbols.
+ * Pass --enable-gtk-doc to configure, to fix FTBFS twice in a row.
+ * Add a patch to fix typelibdir location.
+ * Use NEWS file as upstream changelog.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 30 Oct 2014 21:34:19 +0300
+
gnome-panel (3.8.1-7) unstable; urgency=medium
* Fix crash when clicking on clock applet (closes: #769882).
Modified: desktop/unstable/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control?rev=45327&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control [utf-8] Sun Jun 21 14:08:16 2015
@@ -6,9 +6,9 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Dmitry Shachnev <mitya57 at debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>
-Standards-Version: 3.9.5
-Build-Depends: cdbs (>= 0.4.41),
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Dmitry Shachnev <mitya57 at debian.org>
+Standards-Version: 3.9.6
+Build-Depends: cdbs (>= 0.4.93~),
debhelper (>= 9),
dh-autoreconf,
evolution-data-server-dev (>= 3.5.3),
@@ -20,34 +20,29 @@
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.7.90),
- libgtk-3-dev (>= 3.3.8),
+ libgtk-3-dev (>= 3.15.2),
libgweather-3-dev (>= 3.10.1),
- 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 (>= 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/Projects/GnomePanel
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-panel
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-panel
-Package: gir1.2-panelapplet-4.0
+Package: gir1.2-panelapplet-5.0
Section: introspection
Architecture: any
Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
@@ -59,29 +54,22 @@
Package: gnome-panel
Architecture: any
-Depends: evolution-common (>= 3.4.3),
- gnome-icon-theme-symbolic (>= 3.0.0),
- gnome-menus (>= 3.1.4),
+Depends: gnome-menus (>= 3.1.4),
gnome-panel-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Recommends: alacarte,
+ evolution-common (>= 3.4.3),
evolution-data-server,
gnome-applets,
gnome-control-center,
- gnome-icon-theme (>= 2.24),
- gnome-session-flashback,
+ gnome-session-flashback (>= 3.14.0),
gvfs
Suggests: gnome-terminal | x-terminal-emulator,
gnome-user-guide,
nautilus,
yelp
-Breaks: gnome-applets (<< 2.91),
- gnome-control-center (<< 1:2.91),
- gnome-settings-daemon (<< 2.91),
- libpanel-applet2-0,
- netspeed (<< 0.16-2)
-Replaces: gnome-panel-data (<< 2.91)
+Breaks: libpanel-applet-4-0 (<< 3.14.0)
Description: launcher and docking facility for GNOME
The GNOME Panel is an essential part of the GNOME Desktop, providing
toolbar-like “panels” which can be attached to the sides of your desktop.
@@ -103,7 +91,7 @@
Priority: extra
Architecture: any
Depends: gnome-panel (= ${binary:Version}),
- libpanel-applet-4-0 (= ${binary:Version}),
+ libpanel-applet0 (= ${binary:Version}),
${misc:Depends}
Description: GNOME Panel and library for panel applets - debugging symbols
This package contains debugging symbols for gnome-panel and the
@@ -111,72 +99,27 @@
the panel itself or in the library. The debugging symbols are installed
in /usr/lib/debug and will automatically be used by gdb.
-Package: gnome-session-fallback
-Architecture: all
-Priority: extra
-Section: oldlibs
-Depends: gnome-session-flashback, ${misc:Depends}, ${shlibs:Depends}
-Description: GNOME Session Manager - GNOME Flashback (transitional package)
- The GNOME Session Manager is in charge of starting the core components
- of the GNOME desktop, and applications that should be launched at
- login time. It also features a way to save and restore currently
- running applications.
- .
- This is a transitional package to ease upgrades to gnome-session-flashback.
- It can be safely removed.
-
-Package: gnome-session-flashback
-Architecture: all
-Depends: gnome-panel (>= 3.0),
- gnome-flashback,
- gnome-screensaver,
- gnome-session-bin,
- gnome-session-common,
- gnome-settings-daemon (>= 3.0),
- metacity (>= 2.30),
- nautilus (>= 3.8),
- notification-daemon (>= 0.7),
- policykit-1-gnome,
- ${misc:Depends}
-Recommends: gnome-power-manager
-Suggests: desktop-base, gnome-keyring, gnome-user-guide
-Breaks: gnome-session-fallback (<< 3.6.2)
-Replaces: gnome-session (<< 3.0),
- gnome-session-bin (<< 3.0),
- gnome-session-fallback (<< 3.6.2)
-Provides: x-session-manager
-Description: GNOME Session Manager - GNOME Flashback session
- The GNOME Session Manager is in charge of starting the core components
- of the GNOME desktop, and applications that should be launched at
- login time. It also features a way to save and restore currently
- running applications.
- .
- This package contains the required components for the GNOME Flashback
- session, based on GNOME Panel 3. It can be started from a display
- manager such as GDM, and doesn’t have specific hardware requirements.
-
-Package: libpanel-applet-4-0
+Package: libpanel-applet0
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: library for GNOME Panel applets
This library is used by GNOME Panel applets.
-Package: libpanel-applet-4-dev
+Package: libpanel-applet-dev
Section: libdevel
Architecture: any
-Depends: gir1.2-panelapplet-4.0 (= ${binary:Version}),
- libgconf2-dev,
- libglib2.0-dev (>= 2.31.14),
+Depends: gir1.2-panelapplet-5.0 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.35.0),
libgtk-3-dev (>= 3.3.8),
- libpanel-applet-4-0 (= ${binary:Version}),
+ libpanel-applet0 (= ${binary:Version}),
${misc:Depends}
-Recommends: libpanel-applet-4-doc
+Recommends: libpanel-applet-doc
Description: library for GNOME Panel applets - development files
This package provides the include files and static library for the GNOME
Panel applet library functions.
-Package: libpanel-applet-4-doc
+Package: libpanel-applet-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
Modified: desktop/unstable/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/control.in?rev=45327&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/control.in [utf-8] Sun Jun 21 14:08:16 2015
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Standards-Version: 3.9.5
-Build-Depends: cdbs (>= 0.4.41),
+Standards-Version: 3.9.6
+Build-Depends: cdbs (>= 0.4.93~),
debhelper (>= 9),
dh-autoreconf,
evolution-data-server-dev (>= 3.5.3),
@@ -16,34 +16,29 @@
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.7.90),
- libgtk-3-dev (>= 3.3.8),
+ libgtk-3-dev (>= 3.15.2),
libgweather-3-dev (>= 3.10.1),
- 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 (>= 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/Projects/GnomePanel
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-panel
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-panel
-Package: gir1.2-panelapplet-4.0
+Package: gir1.2-panelapplet-5.0
Section: introspection
Architecture: any
Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
@@ -55,29 +50,22 @@
Package: gnome-panel
Architecture: any
-Depends: evolution-common (>= 3.4.3),
- gnome-icon-theme-symbolic (>= 3.0.0),
- gnome-menus (>= 3.1.4),
+Depends: gnome-menus (>= 3.1.4),
gnome-panel-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Recommends: alacarte,
+ evolution-common (>= 3.4.3),
evolution-data-server,
gnome-applets,
gnome-control-center,
- gnome-icon-theme (>= 2.24),
- gnome-session-flashback,
+ gnome-session-flashback (>= 3.14.0),
gvfs
Suggests: gnome-terminal | x-terminal-emulator,
gnome-user-guide,
nautilus,
yelp
-Breaks: gnome-applets (<< 2.91),
- gnome-control-center (<< 1:2.91),
- gnome-settings-daemon (<< 2.91),
- libpanel-applet2-0,
- netspeed (<< 0.16-2)
-Replaces: gnome-panel-data (<< 2.91)
+Breaks: libpanel-applet-4-0 (<< 3.14.0)
Description: launcher and docking facility for GNOME
The GNOME Panel is an essential part of the GNOME Desktop, providing
toolbar-like “panels” which can be attached to the sides of your desktop.
@@ -99,7 +87,7 @@
Priority: extra
Architecture: any
Depends: gnome-panel (= ${binary:Version}),
- libpanel-applet-4-0 (= ${binary:Version}),
+ libpanel-applet0 (= ${binary:Version}),
${misc:Depends}
Description: GNOME Panel and library for panel applets - debugging symbols
This package contains debugging symbols for gnome-panel and the
@@ -107,72 +95,27 @@
the panel itself or in the library. The debugging symbols are installed
in /usr/lib/debug and will automatically be used by gdb.
-Package: gnome-session-fallback
-Architecture: all
-Priority: extra
-Section: oldlibs
-Depends: gnome-session-flashback, ${misc:Depends}, ${shlibs:Depends}
-Description: GNOME Session Manager - GNOME Flashback (transitional package)
- The GNOME Session Manager is in charge of starting the core components
- of the GNOME desktop, and applications that should be launched at
- login time. It also features a way to save and restore currently
- running applications.
- .
- This is a transitional package to ease upgrades to gnome-session-flashback.
- It can be safely removed.
-
-Package: gnome-session-flashback
-Architecture: all
-Depends: gnome-panel (>= 3.0),
- gnome-flashback,
- gnome-screensaver,
- gnome-session-bin,
- gnome-session-common,
- gnome-settings-daemon (>= 3.0),
- metacity (>= 2.30),
- nautilus (>= 3.8),
- notification-daemon (>= 0.7),
- policykit-1-gnome,
- ${misc:Depends}
-Recommends: gnome-power-manager
-Suggests: desktop-base, gnome-keyring, gnome-user-guide
-Breaks: gnome-session-fallback (<< 3.6.2)
-Replaces: gnome-session (<< 3.0),
- gnome-session-bin (<< 3.0),
- gnome-session-fallback (<< 3.6.2)
-Provides: x-session-manager
-Description: GNOME Session Manager - GNOME Flashback session
- The GNOME Session Manager is in charge of starting the core components
- of the GNOME desktop, and applications that should be launched at
- login time. It also features a way to save and restore currently
- running applications.
- .
- This package contains the required components for the GNOME Flashback
- session, based on GNOME Panel 3. It can be started from a display
- manager such as GDM, and doesn’t have specific hardware requirements.
-
-Package: libpanel-applet-4-0
+Package: libpanel-applet0
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: library for GNOME Panel applets
This library is used by GNOME Panel applets.
-Package: libpanel-applet-4-dev
+Package: libpanel-applet-dev
Section: libdevel
Architecture: any
-Depends: gir1.2-panelapplet-4.0 (= ${binary:Version}),
- libgconf2-dev,
- libglib2.0-dev (>= 2.31.14),
+Depends: gir1.2-panelapplet-5.0 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.35.0),
libgtk-3-dev (>= 3.3.8),
- libpanel-applet-4-0 (= ${binary:Version}),
+ libpanel-applet0 (= ${binary:Version}),
${misc:Depends}
-Recommends: libpanel-applet-4-doc
+Recommends: libpanel-applet-doc
Description: library for GNOME Panel applets - development files
This package provides the include files and static library for the GNOME
Panel applet library functions.
-Package: libpanel-applet-4-doc
+Package: libpanel-applet-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
Propchange: desktop/unstable/gnome-panel/debian/patches/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 21 14:08:16 2015
@@ -0,0 +1 @@
+/desktop/unstable/gnome-panel/debian/patches:38477-39823,42212-43800
Modified: desktop/unstable/gnome-panel/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/rules?rev=45327&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/rules [utf-8] Sun Jun 21 14:08:16 2015
@@ -11,11 +11,12 @@
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
DEB_CONFIGURE_EXTRA_FLAGS += \
- --with-in-process-applets=all \
+ --enable-gtk-doc \
--enable-telepathy-glib
ifneq ($(DEB_BUILD_GNU_SYSTEM),gnu)
DEB_CONFIGURE_EXTRA_FLAGS += --enable-eds
endif
-DEB_DH_MAKESHLIBS_ARGS_libpanel-applet-4-0 += -V -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libpanel-applet0 += -V -- -c4
DEB_DH_MAKESHLIBS_ARGS_gnome-panel += --no-act
+DEB_INSTALL_CHANGELOGS_ALL = ./NEWS
More information about the pkg-gnome-commits
mailing list