r29737 - in /desktop/experimental/gnome-applets/debian: changelog control control.in gnome-applets-data.install patches/01_battstat_upower.patch patches/02_link_X11.patch patches/03_mixer_gtk3.patch patches/series rules watch
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Mon Sep 26 04:40:18 UTC 2011
Author: jbicha-guest
Date: Mon Sep 26 04:40:15 2011
New Revision: 29737
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29737
Log:
* New stable release.
* Re-add Python stuff, this time with dh_python2
* debian/control.in:
- Standards-Version 3.9.2
- Add Vcs links
- Depend on gir1.2-gtk-3.0, gir1.2-gdkpixbuf-2.0, gir1.2-gconf-2.0,
and gir1.2-panelapplet-4.0
* debian/rules:
- Moved autoreconf rule above debhelper
- Dropped --disable-gtk-doc rule
* debian/watch: Watch for .bz2
* 01_battstat_upower.patch: Unfuzzed
* 02_link_X11.patch: Dropped, merged upstream
* 03_mixer_gtk3.patch: Dropped, merged upstream
Removed:
desktop/experimental/gnome-applets/debian/patches/02_link_X11.patch
desktop/experimental/gnome-applets/debian/patches/03_mixer_gtk3.patch
Modified:
desktop/experimental/gnome-applets/debian/changelog
desktop/experimental/gnome-applets/debian/control
desktop/experimental/gnome-applets/debian/control.in
desktop/experimental/gnome-applets/debian/gnome-applets-data.install
desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch
desktop/experimental/gnome-applets/debian/patches/series
desktop/experimental/gnome-applets/debian/rules
desktop/experimental/gnome-applets/debian/watch
Modified: desktop/experimental/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/changelog?rev=29737&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/changelog [utf-8] Mon Sep 26 04:40:15 2011
@@ -1,9 +1,26 @@
-gnome-applets (2.91.4~20110321-2) UNRELEASED; urgency=low
-
+gnome-applets (3.2.0-1) UNRELEASED; urgency=low
+
+ [ Sebastien Bacher ]
* debian/control.in: clean obsolete libxklavier-dev build-depends,
don't list the keyboard applet in the description
- -- Sebastien Bacher <seb128 at debian.org> Fri, 27 May 2011 20:17:44 +0200
+ [ Jeremy Bicha ]
+ * New stable release.
+ * Re-add Python stuff, this time with dh_python2
+ * debian/control.in:
+ - Standards-Version 3.9.2
+ - Add Vcs links
+ - Depend on gir1.2-gtk-3.0, gir1.2-gdkpixbuf-2.0, gir1.2-gconf-2.0,
+ and gir1.2-panelapplet-4.0
+ * debian/rules:
+ - Moved autoreconf rule above debhelper
+ - Dropped --disable-gtk-doc rule
+ * debian/watch: Watch for .bz2
+ * 01_battstat_upower.patch: Unfuzzed
+ * 02_link_X11.patch: Dropped, merged upstream
+ * 03_mixer_gtk3.patch: Dropped, merged upstream
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Mon, 26 Sep 2011 00:39:25 -0400
gnome-applets (2.91.4~20110321-1) experimental; urgency=low
Modified: desktop/experimental/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control?rev=29737&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/control [utf-8] Mon Sep 26 04:40:15 2011
@@ -7,9 +7,8 @@
Section: gnome
Priority: optional
Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
-Standards-Version: 3.9.0
-Build-Depends: cdbs (>= 0.4.41),
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>, Sebastien Bacher <seb128 at debian.org>
+Build-Depends: cdbs (>= 0.4.90~),
dh-autoreconf,
debhelper (>= 5.0.13),
libgtk-3-dev (>= 3.0),
@@ -31,6 +30,8 @@
libxt-dev,
libx11-dev,
gnome-settings-daemon-dev,
+ python-dev (>= 2.6.6-3~),
+ python-gobject-dev (>= 2.28),
xsltproc,
docbook-xsl,
docbook-to-man,
@@ -45,6 +46,9 @@
gnome-pkg-tools (>= 0.10),
sharutils,
libupower-glib-dev (>= 0.9.4)
+Standards-Version: 3.9.2
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/gnome-applets
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/gnome-applets/
Package: gnome-applets-data
Architecture: all
@@ -58,13 +62,18 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
+ ${python:Depends},
gnome-applets-data (>= ${gnome:Version}),
gnome-applets-data (<< ${gnome:NextVersion}),
gnome-panel (>= 2.91.91),
gnome-icon-theme (>= 2.15.91),
gstreamer0.10-alsa [linux-any],
gstreamer0.10-plugins-good [kfreebsd-any],
- gvfs
+ gvfs,
+ gir1.2-gtk-3.0,
+ gir1.2-gdkpixbuf-2.0,
+ gir1.2-gconf-2.0,
+ gir1.2-panelapplet-4.0
Conflicts: trashapplet
Replaces: trashapplet,
gnome-applets-data (<< 2.30.0-4)
Modified: desktop/experimental/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control.in?rev=29737&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/control.in [utf-8] Mon Sep 26 04:40:15 2011
@@ -3,8 +3,7 @@
Priority: optional
Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
Uploaders: @GNOME_TEAM@
-Standards-Version: 3.9.0
-Build-Depends: cdbs (>= 0.4.41),
+Build-Depends: cdbs (>= 0.4.90~),
dh-autoreconf,
debhelper (>= 5.0.13),
libgtk-3-dev (>= 3.0),
@@ -26,6 +25,8 @@
libxt-dev,
libx11-dev,
gnome-settings-daemon-dev,
+ python-dev (>= 2.6.6-3~),
+ python-gobject-dev (>= 2.28),
xsltproc,
docbook-xsl,
docbook-to-man,
@@ -40,6 +41,9 @@
gnome-pkg-tools (>= 0.10),
sharutils,
libupower-glib-dev (>= 0.9.4)
+Standards-Version: 3.9.2
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/gnome-applets
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/gnome-applets
Package: gnome-applets-data
Architecture: all
@@ -53,13 +57,18 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
+ ${python:Depends},
gnome-applets-data (>= ${gnome:Version}),
gnome-applets-data (<< ${gnome:NextVersion}),
gnome-panel (>= 2.91.91),
gnome-icon-theme (>= 2.15.91),
gstreamer0.10-alsa [linux-any],
gstreamer0.10-plugins-good [kfreebsd-any],
- gvfs
+ gvfs,
+ gir1.2-gtk-3.0,
+ gir1.2-gdkpixbuf-2.0,
+ gir1.2-gconf-2.0,
+ gir1.2-panelapplet-4.0
Conflicts: trashapplet
Replaces: trashapplet,
gnome-applets-data (<< 2.30.0-4)
Modified: desktop/experimental/gnome-applets/debian/gnome-applets-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/gnome-applets-data.install?rev=29737&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/gnome-applets-data.install [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/gnome-applets-data.install [utf-8] Mon Sep 26 04:40:15 2011
@@ -1,2 +1,3 @@
debian/tmp/etc/
debian/tmp/usr/share/
+debian/tmp/usr/lib/python*
Modified: desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch?rev=29737&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch [utf-8] Mon Sep 26 04:40:15 2011
@@ -580,7 +580,7 @@
+UPOWER_REQUIRED=0.9.4
DBUS_REQUIRED=1.1.2
DBUS_GLIB_REQUIRED=0.74
- PYGTK_REQUIRED=2.6
+ PYGOBJECT_REQUIRED=2.26
@@ -222,6 +223,26 @@ fi
AC_SUBST(HAL_CFLAGS)
AC_SUBST(HAL_LIBS)
Modified: desktop/experimental/gnome-applets/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/series?rev=29737&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/patches/series [utf-8] Mon Sep 26 04:40:15 2011
@@ -1,4 +1,2 @@
01_battstat_upower.patch
-02_link_X11.patch
-03_mixer_gtk3.patch
15_path-max.patch
Modified: desktop/experimental/gnome-applets/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/rules?rev=29737&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/rules [utf-8] Mon Sep 26 04:40:15 2011
@@ -1,16 +1,15 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-gtk-doc \
- --disable-scrollkeeper \
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \
--enable-ipv6 \
--enable-suid=no \
--enable-mixer-applet \
@@ -32,9 +31,11 @@
binary-install/gnome-applets::
rm -rf debian/gnome-applets/usr/lib/gnome-applets/gnome-applets/
chmod a+x debian/gnome-applets/usr/bin/* debian/gnome-applets/usr/lib/gnome-applets/*
+ dh_python2 -pgnome-applets
binary-install/gnome-applets-data::
find debian/gnome-applets-data/usr/share -type f -exec chmod -R a-x {} \;
+ dh_python2 -pgnome-applets-data
clean::
rm -f $(MANPAGES)
Modified: desktop/experimental/gnome-applets/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/watch?rev=29737&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/watch [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/watch [utf-8] Mon Sep 26 04:40:15 2011
@@ -1,2 +1,2 @@
version=3
-ftp://ftp.gnome.org/pub/GNOME/sources/gnome-applets/([\d\.]+)[02468]/gnome-applets-(.*)\.tar\.gz
+ftp://ftp.gnome.org/pub/GNOME/sources/gnome-applets/([\d\.]+)[02468]/gnome-applets-(.*)\.tar\.bz2
More information about the pkg-gnome-commits
mailing list