r45331 - in /desktop/unstable/gnome-applets: ./ debian/

mitya57 at users.alioth.debian.org mitya57 at users.alioth.debian.org
Sun Jun 21 15:17:13 UTC 2015


Author: mitya57
Date: Sun Jun 21 15:17:13 2015
New Revision: 45331

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45331
Log:
Merge experimental branch into unstable

Added:
    desktop/unstable/gnome-applets/debian/gnome-applets.install.linux
      - copied unchanged from r45330, desktop/experimental/gnome-applets/debian/gnome-applets.install.linux
    desktop/unstable/gnome-applets/debian/gnome-applets.manpages.linux
      - copied unchanged from r45330, desktop/experimental/gnome-applets/debian/gnome-applets.manpages.linux
Removed:
    desktop/unstable/gnome-applets/debian/gnome-applets.gconf-defaults
    desktop/unstable/gnome-applets/debian/gnome-applets.preinst
Modified:
    desktop/unstable/gnome-applets/   (props changed)
    desktop/unstable/gnome-applets/debian/changelog
    desktop/unstable/gnome-applets/debian/compat
    desktop/unstable/gnome-applets/debian/control
    desktop/unstable/gnome-applets/debian/control.in
    desktop/unstable/gnome-applets/debian/copyright
    desktop/unstable/gnome-applets/debian/gnome-applets-data.install
    desktop/unstable/gnome-applets/debian/gnome-applets.install
    desktop/unstable/gnome-applets/debian/rules

Propchange: desktop/unstable/gnome-applets/
------------------------------------------------------------------------------
    svn:mergeinfo = /desktop/experimental/gnome-applets:42236-45330

Modified: desktop/unstable/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/changelog?rev=45331&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/changelog	[utf-8] Sun Jun 21 15:17:13 2015
@@ -1,8 +1,44 @@
-gnome-applets (3.8.1-2) UNRELEASED; urgency=medium
-
+gnome-applets (3.16.1-2) experimental; urgency=medium
+
+  * Bump debhelper compatibility level to 9.
+  * Remove obsolete debian/gnome-applets.preinst.
+  * Only install cpufreq-selector on Linux.
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 20 Jun 2015 11:52:41 +0300
+
+gnome-applets (3.16.1-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Drop configurable_pythondir.patch, applied upstream.
+  * Update build-dependencies for the new version.
+  * Remove dependency on gnome-icon-theme. It has been superseded by
+    adwaita-icon-theme, which is pulled in by libgtk-3-common anyway.
+  * Update applets list in the package description.
+  * Netspeed is now included in gnome-applets (closes: #772619).
+    - Make gnome-applets-data break/replace older versions of netspeed,
+      because of a file conflict.
+    - Build transitional netspeed package from this source (closes:
+      #787145).
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 28 May 2015 16:20:48 +0300
+
+gnome-applets (3.14.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Update (build-)dependencies for new version.
+    - Require new GLib and libpanel-applet.
+    - Switch from Python 2 to Python 3.
+    - Drop GConf, network-manager and gstreamer dependencies.
+  * Remove --enable-mixer-applet configure flag.
+  * Remove obsolete gnome-applets.gconf-defaults file.
+  * Update applet list in package description.
+  * Move Python modules to a private location.
+  * Use dh_python3.
+  * Use NEWS file as upstream changelog.
+  * Bump Standards-Version to 3.9.6, no changes needed.
   * Update Homepage URL.
 
- -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 17 Oct 2014 10:07:11 +0400
+ -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 19 Mar 2015 12:36:15 +0300
 
 gnome-applets (3.8.1-1) unstable; urgency=medium
 

Modified: desktop/unstable/gnome-applets/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/compat?rev=45331&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/compat	[utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/compat	[utf-8] Sun Jun 21 15:17:13 2015
@@ -1 +1 @@
-8
+9

Modified: desktop/unstable/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control?rev=45331&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/control	[utf-8] Sun Jun 21 15:17:13 2015
@@ -6,21 +6,19 @@
 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>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Dmitry Shachnev <mitya57 at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: cdbs (>= 0.4.90~),
                dh-autoreconf,
-               debhelper (>= 8),
-               libgtk-3-dev (>= 3.2),
-               libglib2.0-dev (>= 2.26.0),
-               libgconf2-dev (>= 2.8.0),
-               scrollkeeper (>= 0.1.4) | rarian-compat,
-               libpanel-applet-4-dev (>= 2.91.90),
-               libgtop2-dev (>= 2.11.92),
+               debhelper (>= 9),
+               libgtk-3-dev (>= 3.15.2),
+               libglib2.0-dev (>= 2.44.0),
+               libpanel-applet-dev (>= 3.16.1),
+               libgtop2-dev (>= 2.14.2),
                libwnck-3-dev (>= 2.91.0),
                libnotify-dev (>= 0.7),
                libdbus-1-dev (>= 1.1.2),
                libdbus-glib-1-dev (>= 0.74),
-               gnome-icon-theme (>= 2.15.91),
+               adwaita-icon-theme (>= 3.14.0),
                libxml2-dev (>= 2.5.0),
                libgweather-3-dev (>= 3.7.3),
                libgucharmap-2-90-dev (>= 1:2.33.0),
@@ -28,24 +26,22 @@
                intltool (>= 0.35.0),
                libxt-dev,
                libx11-dev,
+               libxklavier-dev (>= 4.0),
                gnome-settings-daemon-dev,
-               python-dev (>= 2.6.6-3~),
-               python-gi-dev,
+               python3,
+               dh-python,
                xsltproc,
                docbook-xsl,
                docbook-to-man,
                docbook-utils,
                yelp-tools,
-               network-manager-dev (>= 0.7) [linux-any],
-               libgstreamer0.10-dev (>= 0.10.2),
-               libgstreamer-plugins-base0.10-dev (>= 0.10.2),
                x11proto-kb-dev,
                libcpufreq-dev,
                gnome-pkg-tools (>= 0.10),
                gnome-common,
                sharutils,
                libupower-glib-dev (>= 0.99)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://wiki.gnome.org/Projects/GnomeApplets
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-applets
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-applets
@@ -53,6 +49,8 @@
 Package: gnome-applets-data
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: netspeed (<< 3.16)
+Replaces: netspeed (<< 3.16)
 Description: Various applets for the GNOME panel - data files
  This package contains data files (pixmaps, icons, documentations) needed by
  the gnome-applets package.
@@ -61,46 +59,59 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         ${python:Depends},
+         ${python3:Depends},
          gnome-applets-data (>= ${gnome:Version}),
          gnome-applets-data (<< ${gnome:NextVersion}),
-         gnome-panel (>= 2.91.91),
-         python-gi,
-         gnome-icon-theme (>= 2.15.91),
-         gstreamer0.10-plugins-good [kfreebsd-any],
+         gnome-panel (>= 3.10),
+         python3-gi,
          gvfs,
          gir1.2-gtk-3.0,
          gir1.2-gdkpixbuf-2.0,
-         gir1.2-gconf-2.0,
-         gir1.2-panelapplet-4.0,
+         gir1.2-panelapplet-5.0,
          upower
 Replaces: gnome-applets-data (<< 2.30.0-4)
 Recommends: gnome-system-monitor,
             gnome-media,
-            gstreamer0.10-pulseaudio | gstreamer0.10-alsa [linux-any],
             policykit-1-gnome
 Suggests: tomboy
 Description: Various applets for the GNOME panel - binary files
- accessx-status: indicates keyboard accessibility settings, including
- the current state of the keyboard, if those features are in use.
+ Keyboard Accessibility Status: indicates keyboard accessibility settings,
+ including the current state of the keyboard, if those features are in use.
  .
- Battstat: monitors the power subsystem on a laptop.
+ Battery Charge Monitor: monitors the power subsystem on a laptop.
  .
  Character palette: provides a convenient way to access non-standard
  characters, such as accented characters, mathematical symbols, special
  symbols, and punctuation marks.
  .
- GNOME CPUFreq Applet: CPU frequency scaling monitor
+ CPUFreq: CPU frequency scaling monitor.
  .
- Drivemount: lets you mount and unmount drives and file systems.
+ Disk Mounter: lets you mount and unmount drives and file systems.
  .
- Geyes: pair of eyes which follow the mouse pointer around the screen.
+ Eyes: pair of eyes which follow the mouse pointer around the screen.
  .
- Mixer: volume control.
+ Weather Report: shows the current weather conditions, and forecasts.
  .
- System monitor: CPU, memory, network, swap file and resource.
+ Invest: lets you track your invested money.
+ .
+ Command Line: adds a command line to the panel (features command
+ completion, command history, changeable macros and an optional
+ built-in clock).
+ .
+ Modem Monitor: lets you activate and monitor a dial-up network
+ connection.
+ .
+ System Monitor: a system load indicator.
+ .
+ Network Monitor (Netspeed): shows how much traffic occurs on a network
+ device (ethernet card, wireless LAN card, or dial-up).
+ .
+ Sticky Notes: lets you create, view, and manage sticky notes on the
+ desktop.
  .
  Trash: lets you drag items to the trash folder.
+ .
+ Window Picker applet: window switcher showing only icons, not titles.
 
 Package: gnome-applets-dbg
 Section: debug
@@ -111,3 +122,16 @@
          gnome-applets (= ${binary:Version})
 Description: Various applets for the GNOME panel - binary files with debugging symbols
  This package contains unstripped binaries used for debugging.
+
+Package: netspeed
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: gnome-applets (>= 3.16), ${misc:Depends}
+Description: dummy transitional package
+ Netspeed is an applet for the GNOME panel that shows how much traffic
+ occurs on a network device (ethernet card, wireless LAN card, or
+ dial-up).
+ .
+ Netspeed is now included in gnome-applets. This package is no longer
+ needed and can be safely removed after upgrade.

Modified: desktop/unstable/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control.in?rev=45331&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/control.in	[utf-8] Sun Jun 21 15:17:13 2015
@@ -5,18 +5,16 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs (>= 0.4.90~),
                dh-autoreconf,
-               debhelper (>= 8),
-               libgtk-3-dev (>= 3.2),
-               libglib2.0-dev (>= 2.26.0),
-               libgconf2-dev (>= 2.8.0),
-               scrollkeeper (>= 0.1.4) | rarian-compat,
-               libpanel-applet-4-dev (>= 2.91.90),
-               libgtop2-dev (>= 2.11.92),
+               debhelper (>= 9),
+               libgtk-3-dev (>= 3.15.2),
+               libglib2.0-dev (>= 2.44.0),
+               libpanel-applet-dev (>= 3.16.1),
+               libgtop2-dev (>= 2.14.2),
                libwnck-3-dev (>= 2.91.0),
                libnotify-dev (>= 0.7),
                libdbus-1-dev (>= 1.1.2),
                libdbus-glib-1-dev (>= 0.74),
-               gnome-icon-theme (>= 2.15.91),
+               adwaita-icon-theme (>= 3.14.0),
                libxml2-dev (>= 2.5.0),
                libgweather-3-dev (>= 3.7.3),
                libgucharmap-2-90-dev (>= 1:2.33.0),
@@ -24,24 +22,22 @@
                intltool (>= 0.35.0),
                libxt-dev,
                libx11-dev,
+               libxklavier-dev (>= 4.0),
                gnome-settings-daemon-dev,
-               python-dev (>= 2.6.6-3~),
-               python-gi-dev,
+               python3,
+               dh-python,
                xsltproc,
                docbook-xsl,
                docbook-to-man,
                docbook-utils,
                yelp-tools,
-               network-manager-dev (>= 0.7) [linux-any],
-               libgstreamer0.10-dev (>= 0.10.2),
-               libgstreamer-plugins-base0.10-dev (>= 0.10.2),
                x11proto-kb-dev,
                libcpufreq-dev,
                gnome-pkg-tools (>= 0.10),
                gnome-common,
                sharutils,
                libupower-glib-dev (>= 0.99)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://wiki.gnome.org/Projects/GnomeApplets
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-applets
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-applets
@@ -49,6 +45,8 @@
 Package: gnome-applets-data
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: netspeed (<< 3.16)
+Replaces: netspeed (<< 3.16)
 Description: Various applets for the GNOME panel - data files
  This package contains data files (pixmaps, icons, documentations) needed by
  the gnome-applets package.
@@ -57,46 +55,59 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         ${python:Depends},
+         ${python3:Depends},
          gnome-applets-data (>= ${gnome:Version}),
          gnome-applets-data (<< ${gnome:NextVersion}),
-         gnome-panel (>= 2.91.91),
-         python-gi,
-         gnome-icon-theme (>= 2.15.91),
-         gstreamer0.10-plugins-good [kfreebsd-any],
+         gnome-panel (>= 3.10),
+         python3-gi,
          gvfs,
          gir1.2-gtk-3.0,
          gir1.2-gdkpixbuf-2.0,
-         gir1.2-gconf-2.0,
-         gir1.2-panelapplet-4.0,
+         gir1.2-panelapplet-5.0,
          upower
 Replaces: gnome-applets-data (<< 2.30.0-4)
 Recommends: gnome-system-monitor,
             gnome-media,
-            gstreamer0.10-pulseaudio | gstreamer0.10-alsa [linux-any],
             policykit-1-gnome
 Suggests: tomboy
 Description: Various applets for the GNOME panel - binary files
- accessx-status: indicates keyboard accessibility settings, including
- the current state of the keyboard, if those features are in use.
+ Keyboard Accessibility Status: indicates keyboard accessibility settings,
+ including the current state of the keyboard, if those features are in use.
  .
- Battstat: monitors the power subsystem on a laptop.
+ Battery Charge Monitor: monitors the power subsystem on a laptop.
  .
  Character palette: provides a convenient way to access non-standard
  characters, such as accented characters, mathematical symbols, special
  symbols, and punctuation marks.
  .
- GNOME CPUFreq Applet: CPU frequency scaling monitor
+ CPUFreq: CPU frequency scaling monitor.
  .
- Drivemount: lets you mount and unmount drives and file systems.
+ Disk Mounter: lets you mount and unmount drives and file systems.
  .
- Geyes: pair of eyes which follow the mouse pointer around the screen.
+ Eyes: pair of eyes which follow the mouse pointer around the screen.
  .
- Mixer: volume control.
+ Weather Report: shows the current weather conditions, and forecasts.
  .
- System monitor: CPU, memory, network, swap file and resource.
+ Invest: lets you track your invested money.
+ .
+ Command Line: adds a command line to the panel (features command
+ completion, command history, changeable macros and an optional
+ built-in clock).
+ .
+ Modem Monitor: lets you activate and monitor a dial-up network
+ connection.
+ .
+ System Monitor: a system load indicator.
+ .
+ Network Monitor (Netspeed): shows how much traffic occurs on a network
+ device (ethernet card, wireless LAN card, or dial-up).
+ .
+ Sticky Notes: lets you create, view, and manage sticky notes on the
+ desktop.
  .
  Trash: lets you drag items to the trash folder.
+ .
+ Window Picker applet: window switcher showing only icons, not titles.
 
 Package: gnome-applets-dbg
 Section: debug
@@ -107,3 +118,16 @@
          gnome-applets (= ${binary:Version})
 Description: Various applets for the GNOME panel - binary files with debugging symbols
  This package contains unstripped binaries used for debugging.
+
+Package: netspeed
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: gnome-applets (>= 3.16), ${misc:Depends}
+Description: dummy transitional package
+ Netspeed is an applet for the GNOME panel that shows how much traffic
+ occurs on a network device (ethernet card, wireless LAN card, or
+ dial-up).
+ .
+ Netspeed is now included in gnome-applets. This package is no longer
+ needed and can be safely removed after upgrade.

Modified: desktop/unstable/gnome-applets/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/copyright?rev=45331&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/copyright	[utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/copyright	[utf-8] Sun Jun 21 15:17:13 2015
@@ -27,4 +27,3 @@
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-2'.
-

Modified: desktop/unstable/gnome-applets/debian/gnome-applets-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/gnome-applets-data.install?rev=45331&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/gnome-applets-data.install	[utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/gnome-applets-data.install	[utf-8] Sun Jun 21 15:17:13 2015
@@ -1,3 +1,2 @@
 etc/
 usr/share/
-usr/lib/python*

Modified: desktop/unstable/gnome-applets/debian/gnome-applets.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/gnome-applets.install?rev=45331&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/gnome-applets.install	[utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/gnome-applets.install	[utf-8] Sun Jun 21 15:17:13 2015
@@ -1,2 +1 @@
-usr/bin/
 usr/lib/gnome-applets/

Modified: desktop/unstable/gnome-applets/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/rules?rev=45331&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/rules	[utf-8] Sun Jun 21 15:17:13 2015
@@ -9,13 +9,15 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
+DATADIR = /usr/share/gnome-applets
+
 DEB_CONFIGURE_EXTRA_FLAGS += \
+	--with-pythondir=$(DATADIR) \
 	--enable-ipv6 \
-	--enable-suid=no \
-	--enable-mixer-applet
+	--enable-suid=no
 
 MANPAGES += debian/cpufreq-selector.1
-DEB_INSTALL_MANPAGES_gnome-applets = $(MANPAGES)
+DEB_INSTALL_CHANGELOGS_ALL = ./NEWS
 
 DEB_DH_STRIP_ARGS += --dbg-package=gnome-applets-dbg
 
@@ -26,10 +28,10 @@
 	docbook-to-man $< > $@
 
 binary-install/gnome-applets::
-	dh_python2 -pgnome-applets
+	dh_python3 -pgnome-applets
 
 binary-install/gnome-applets-data::
-	dh_python2 -pgnome-applets-data
+	dh_python3 -pgnome-applets-data $(DATADIR)
 
 clean::
 	rm -f $(MANPAGES)




More information about the pkg-gnome-commits mailing list