r26017 - in /desktop/experimental/gnome-media/debian: changelog control control.in gnome-media.menu patches/05_mixer_noprefs.patch patches/06_track_capture_toggle.patch rules watch
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sat Dec 18 21:06:50 UTC 2010
Author: sjoerd
Date: Sat Dec 18 21:06:50 2010
New Revision: 26017
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26017
Log:
First round of package updates
Added:
desktop/experimental/gnome-media/debian/patches/06_track_capture_toggle.patch
Modified:
desktop/experimental/gnome-media/debian/changelog
desktop/experimental/gnome-media/debian/control
desktop/experimental/gnome-media/debian/control.in
desktop/experimental/gnome-media/debian/gnome-media.menu
desktop/experimental/gnome-media/debian/patches/05_mixer_noprefs.patch
desktop/experimental/gnome-media/debian/rules
desktop/experimental/gnome-media/debian/watch
Modified: desktop/experimental/gnome-media/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-media/debian/changelog?rev=26017&op=diff
==============================================================================
--- desktop/experimental/gnome-media/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-media/debian/changelog [utf-8] Sat Dec 18 21:06:50 2010
@@ -1,3 +1,10 @@
+gnome-media (2.91.2-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Packaged updated based on 2.91.2-0ubuntu2 by Rodrigo Moya and others
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sat, 18 Dec 2010 21:06:04 +0000
+
gnome-media (2.30.0-1) unstable; urgency=low
* New upstream stable release:
Modified: desktop/experimental/gnome-media/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-media/debian/control?rev=26017&op=diff
==============================================================================
--- desktop/experimental/gnome-media/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-media/debian/control [utf-8] Sat Dec 18 21:06:50 2010
@@ -7,19 +7,21 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
-Standards-Version: 3.8.3
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Standards-Version: 3.9.1
Build-Depends: cdbs (>= 0.4.41),
+ dh-autoreconf,
gnome-pkg-tools (>= 0.11.3),
+ gnome-common,
dpkg-dev (>= 1.13.19),
debhelper (>= 5.0.0),
intltool (>= 0.35.0),
libglib2.0-dev (>= 2.18.2),
- libgtk2.0-dev (>= 2.15.1),
+ libgtk2.0-dev (>= 2.18),
libgladeui-1-dev,
libgconf2-dev,
- libpulse-dev (>= 0.9.15),
- libcanberra-gtk-dev (>= 0.4),
+ libpulse-dev (>= 0.9.16),
+ libcanberra-gtk-dev (>= 0.13),
libxml2-dev (>= 2.5.0),
libunique-dev,
libgstreamer0.10-dev (>= 0.10.23),
@@ -27,64 +29,27 @@
docbook-utils,
gnome-doc-utils,
scrollkeeper,
+ liblaunchpad-integration-dev (>= 0.1.17),
gstreamer0.10-tools,
gstreamer0.10-plugins-base,
- gstreamer0.10-plugins-good
+ gstreamer0.10-plugins-good,
+ libgnome-media-profiles-dev
Homepage: http://live.gnome.org/GnomeMedia
-Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gnome-media/
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gnome-media/
+Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/experimental/gnome-media/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/gnome-media/
Package: gnome-media
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
gstreamer0.10-alsa | gstreamer0.10-audiosink,
- gnome-media-common (>= ${gnome:Version}),
- gnome-media-common (<< ${gnome:NextVersion}),
gstreamer0.10-plugins-base (>= 0.10.3),
gstreamer0.10-plugins-good,
x11-utils
-Recommends: alsa-utils
Suggests: pulseaudio
+Replaces: gnome-media-common (<< 2.91.0), libgnome-media0 (<< 2.91.0), libgnome-media-dev (<< 2.91.0)
Description: GNOME media utilities
This package contains a few media utilities for the GNOME desktop:
- * the GNOME GStreamer-based audio mixer;
+ * the GNOME audio mixer;
* the GNOME Sound Recorder;
* the GStreamer properties capplet.
-
-Package: gnome-media-common
-Architecture: all
-Recommends: gnome-media
-Depends: ${misc:Depends}
-Replaces: gnome-media (<< 2.12.0-4)
-Description: GNOME media utilities - common files
- This package contains the common files and internationalization for the
- GNOME media utilities.
-
-Package: libgnome-media0
-Architecture: any
-Section: libs
-Depends: gnome-media-common (>= ${gnome:Version}),
- gnome-media-common (<< ${gnome:NextVersion}),
- ${shlibs:Depends},
- ${misc:Depends}
-Replaces: gnome-media (<< 2.12.0-4)
-Description: runtime libraries for the GNOME media utilities
- This package contains media-related libraries used by the GNOME
- suite:
- * libgnome-media-profiles, which manages a store of media profiles
- for software using GStreamer to encode audio data.
-
-Package: libgnome-media-dev
-Architecture: any
-Section: libdevel
-Depends: libgnome-media0 (= ${binary:Version}),
- ${misc:Depends},
- libgconf2-dev,
- libgtk2.0-dev (>= 2.10)
-Replaces: gnome-media (<< 2.12.0-4)
-Description: development libraries for the GNOME media utilities
- This package contains static libraries and development headers for the
- GNOME media libraries:
- * libgnome-media-profiles, which manages a store of media profiles
- for software using GStreamer to encode audio data.
Modified: desktop/experimental/gnome-media/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-media/debian/control.in?rev=26017&op=diff
==============================================================================
--- desktop/experimental/gnome-media/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-media/debian/control.in [utf-8] Sat Dec 18 21:06:50 2010
@@ -3,18 +3,19 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
Build-Depends: cdbs (>= 0.4.41),
+ dh-autoreconf,
gnome-pkg-tools (>= 0.11.3),
+ gnome-common,
dpkg-dev (>= 1.13.19),
debhelper (>= 5.0.0),
intltool (>= 0.35.0),
libglib2.0-dev (>= 2.18.2),
- libgtk2.0-dev (>= 2.15.1),
- libgladeui-1-dev,
+ libgtk3.0-dev,
libgconf2-dev,
- libpulse-dev (>= 0.9.15),
- libcanberra-gtk-dev (>= 0.4),
+ libpulse-dev (>= 0.9.16),
+ libcanberra-gtk3-dev (>= 0.13),
libxml2-dev (>= 2.5.0),
libunique-dev,
libgstreamer0.10-dev (>= 0.10.23),
@@ -24,62 +25,24 @@
scrollkeeper,
gstreamer0.10-tools,
gstreamer0.10-plugins-base,
- gstreamer0.10-plugins-good
+ gstreamer0.10-plugins-good,
+ libgnome-media-profiles-dev
Homepage: http://live.gnome.org/GnomeMedia
-Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gnome-media/
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gnome-media/
+Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/experimental/gnome-media/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/gnome-media/
Package: gnome-media
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
gstreamer0.10-alsa | gstreamer0.10-audiosink,
- gnome-media-common (>= ${gnome:Version}),
- gnome-media-common (<< ${gnome:NextVersion}),
gstreamer0.10-plugins-base (>= 0.10.3),
gstreamer0.10-plugins-good,
x11-utils
-Recommends: alsa-utils
Suggests: pulseaudio
+Replaces: gnome-media-common (<< 2.91.0), libgnome-media0 (<< 2.91.0), libgnome-media-dev (<< 2.91.0)
Description: GNOME media utilities
This package contains a few media utilities for the GNOME desktop:
- * the GNOME GStreamer-based audio mixer;
+ * the GNOME audio mixer;
* the GNOME Sound Recorder;
* the GStreamer properties capplet.
-
-Package: gnome-media-common
-Architecture: all
-Recommends: gnome-media
-Depends: ${misc:Depends}
-Replaces: gnome-media (<< 2.12.0-4)
-Description: GNOME media utilities - common files
- This package contains the common files and internationalization for the
- GNOME media utilities.
-
-Package: libgnome-media0
-Architecture: any
-Section: libs
-Depends: gnome-media-common (>= ${gnome:Version}),
- gnome-media-common (<< ${gnome:NextVersion}),
- ${shlibs:Depends},
- ${misc:Depends}
-Replaces: gnome-media (<< 2.12.0-4)
-Description: runtime libraries for the GNOME media utilities
- This package contains media-related libraries used by the GNOME
- suite:
- * libgnome-media-profiles, which manages a store of media profiles
- for software using GStreamer to encode audio data.
-
-Package: libgnome-media-dev
-Architecture: any
-Section: libdevel
-Depends: libgnome-media0 (= ${binary:Version}),
- ${misc:Depends},
- libgconf2-dev,
- libgtk2.0-dev (>= 2.10)
-Replaces: gnome-media (<< 2.12.0-4)
-Description: development libraries for the GNOME media utilities
- This package contains static libraries and development headers for the
- GNOME media libraries:
- * libgnome-media-profiles, which manages a store of media profiles
- for software using GStreamer to encode audio data.
Modified: desktop/experimental/gnome-media/debian/gnome-media.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-media/debian/gnome-media.menu?rev=26017&op=diff
==============================================================================
--- desktop/experimental/gnome-media/debian/gnome-media.menu [utf-8] (original)
+++ desktop/experimental/gnome-media/debian/gnome-media.menu [utf-8] Sat Dec 18 21:06:50 2010
@@ -1,4 +1,3 @@
?package(gnome-media):needs="X11" section="Applications/Sound" \
- title="gmix (Gnome 2.0 Mixer)" icon="/usr/share/pixmaps/gnome-mixer.xpm" command="/usr/bin/gnome-volume-control"
?package(gnome-media):needs="X11" section="Applications/Sound" \
title="grecord (GNOME 2.0 Recorder)" icon="/usr/share/pixmaps/gnome-grecord.xpm" command="/usr/bin/gnome-sound-recorder"
Modified: desktop/experimental/gnome-media/debian/patches/05_mixer_noprefs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-media/debian/patches/05_mixer_noprefs.patch?rev=26017&op=diff
==============================================================================
--- desktop/experimental/gnome-media/debian/patches/05_mixer_noprefs.patch [utf-8] (original)
+++ desktop/experimental/gnome-media/debian/patches/05_mixer_noprefs.patch [utf-8] Sat Dec 18 21:06:50 2010
@@ -1,9 +1,9 @@
--- gst-mixer/gnome-volume-control.desktop.in.in.orig 2008-07-15 14:08:12.966670055 +0200
+++ gst-mixer/gnome-volume-control.desktop.in.in 2008-07-15 14:08:23.872307155 +0200
@@ -8,7 +8,7 @@
- X-Info=Gnome Mixer
Terminal=false
Type=Application
+ NoDisplay=true
-Categories=GNOME;GTK;AudioVideo;Settings;HardwareSettings;
+Categories=GNOME;GTK;AudioVideo;HardwareSettings;
X-GNOME-DocPath=gst-mixer/gnome-volume-control.xml
Added: desktop/experimental/gnome-media/debian/patches/06_track_capture_toggle.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-media/debian/patches/06_track_capture_toggle.patch?rev=26017&op=file
==============================================================================
--- desktop/experimental/gnome-media/debian/patches/06_track_capture_toggle.patch (added)
+++ desktop/experimental/gnome-media/debian/patches/06_track_capture_toggle.patch [utf-8] Sat Dec 18 21:06:50 2010
@@ -1,0 +1,18 @@
+#
+# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-media/+bug/299642
+# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=578174
+# Description: Symptom is on startup all record toggles for capture tracks are set to disabled
+#
+diff --git a/gst-mixer/src/button.c b/gst-mixer/src/button.c
+index 4cc65dc..eb84111 100644
+--- a/gst-mixer/src/button.c
++++ b/gst-mixer/src/button.c
+@@ -97,6 +97,8 @@ void
+ gnome_volume_control_button_set_active (GnomeVolumeControlButton *button,
+ gboolean active)
+ {
++ active = active != FALSE;
++
+ if (button->active != active)
+ gtk_button_clicked (GTK_BUTTON (button));
+ }
Modified: desktop/experimental/gnome-media/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-media/debian/rules?rev=26017&op=diff
==============================================================================
--- desktop/experimental/gnome-media/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-media/debian/rules [utf-8] Sat Dec 18 21:06:50 2010
@@ -3,29 +3,13 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/autoreconf.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
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gstmix
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
LDFLAGS += -Wl,-z,defs -Wl,--as-needed -Wl,-O1
-DEB_MAKE_INSTALL_TARGET :=
-
-common-install-impl::
- $(DEB_MAKE_INVOKE) -C gnome-volume-control install DESTDIR=$(CURDIR)/debian/tmp-pulse
- $(DEB_MAKE_INVOKE) -C grecord install DESTDIR=$(DEB_DESTDIR)
- $(DEB_MAKE_INVOKE) -C gst-mixer install DESTDIR=$(CURDIR)/debian/tmp-gst
- $(DEB_MAKE_INVOKE) -C gstreamer-properties install DESTDIR=$(DEB_DESTDIR)
- $(DEB_MAKE_INVOKE) -C po install DESTDIR=$(DEB_DESTDIR)
- $(DEB_MAKE_INVOKE) -C profiles install DESTDIR=$(DEB_DESTDIR)
- $(DEB_MAKE_INVOKE) -C sound-theme install DESTDIR=$(DEB_DESTDIR)
-
-install/gnome-media::
- install $(CURDIR)/debian/tmp-gst/usr/bin/gnome-volume-control $(CURDIR)/debian/gnome-media/usr/bin/gnome-volume-control.gstreamer
- install $(CURDIR)/debian/tmp-pulse/usr/bin/gnome-volume-control $(CURDIR)/debian/gnome-media/usr/bin/gnome-volume-control.pulse
-
-clean::
- rm -rf $(CURDIR)/debian/tmp-*
Modified: desktop/experimental/gnome-media/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-media/debian/watch?rev=26017&op=diff
==============================================================================
--- desktop/experimental/gnome-media/debian/watch [utf-8] (original)
+++ desktop/experimental/gnome-media/debian/watch [utf-8] Sat Dec 18 21:06:50 2010
@@ -1,2 +1,2 @@
version=3
-http://ftp.gnome.org/pub/GNOME/sources/gnome-media/([\d\.]+)[02468]/gnome-media-(.*)\.tar\.gz
+http://ftp.gnome.org/pub/GNOME/sources/gnome-media/([\d\.]+)/gnome-media-(.*)\.tar\.gz
More information about the pkg-gnome-commits
mailing list