r20141 - in /desktop/unstable/gnome-media/debian: changelog control control.in gnome-media-common.install gnome-media.dirs gnome-media.install gnome-volume-control libgnome-media-dev.install patches/10_applet_tryexec.patch rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed May 27 22:34:20 UTC 2009
Author: joss
Date: Wed May 27 22:34:20 2009
New Revision: 20141
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20141
Log:
+ Features a MP2 audio profile. Closes: #502059.
* Update build-dependencies, include libpulse.
* Explicitly enable the gst mixer.
* Install the autostart file in /usr/share/gnome/autostart.
* Install OMF and sound files.
* 10_applet_tryexec.patch: new patch. Only run
gnome-volume-control-applet when pulseaudio is installed.
* Split install targets for gnome-volume-control and gst-mixer.
Install selectively what comes from each of them.
* Install both gnome-volume-control.pulse and
gnome-volume-control.gstreamer. The real gnome-volume-control is now
a wrapper script.
* Depend on x11-utils for the wrapper script to work.
* Suggest pulseaudio.
Added:
desktop/unstable/gnome-media/debian/gnome-media.dirs
desktop/unstable/gnome-media/debian/gnome-volume-control
desktop/unstable/gnome-media/debian/patches/10_applet_tryexec.patch
Modified:
desktop/unstable/gnome-media/debian/changelog
desktop/unstable/gnome-media/debian/control
desktop/unstable/gnome-media/debian/control.in
desktop/unstable/gnome-media/debian/gnome-media-common.install
desktop/unstable/gnome-media/debian/gnome-media.install
desktop/unstable/gnome-media/debian/libgnome-media-dev.install
desktop/unstable/gnome-media/debian/rules
Modified: desktop/unstable/gnome-media/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/changelog?rev=20141&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/changelog (original)
+++ desktop/unstable/gnome-media/debian/changelog Wed May 27 22:34:20 2009
@@ -1,10 +1,11 @@
-gnome-media (2.26.0-1) UNRELEASED; urgency=low
+gnome-media (2.26.0-1) unstable; urgency=low
[ Josselin Mouette ]
* Set the team as primary maintainer. Closes: #523538.
[ Luca Bruno ]
* New upstream release. Closes: #526798.
+ + Features a MP2 audio profile. Closes: #502059.
* debian/control.in:
- Build-Depends:
+ Add libcanberra-gtk-dev 0.4.
@@ -13,7 +14,22 @@
* debian/patches/01_vumeter_nodisplay.patch:
- Remove, vu-meter isn't being built by default since 2.23.
- -- Luca Bruno <lethalman88 at gmail.com> Sat, 16 May 2009 22:33:33 +0200
+ [ Josselin Mouette ]
+ * Update build-dependencies, include libpulse.
+ * Explicitly enable the gst mixer.
+ * Install the autostart file in /usr/share/gnome/autostart.
+ * Install OMF and sound files.
+ * 10_applet_tryexec.patch: new patch. Only run
+ gnome-volume-control-applet when pulseaudio is installed.
+ * Split install targets for gnome-volume-control and gst-mixer.
+ Install selectively what comes from each of them.
+ * Install both gnome-volume-control.pulse and
+ gnome-volume-control.gstreamer. The real gnome-volume-control is now
+ a wrapper script.
+ * Depend on x11-utils for the wrapper script to work.
+ * Suggest pulseaudio.
+
+ -- Josselin Mouette <joss at debian.org> Thu, 28 May 2009 00:05:41 +0200
gnome-media (2.24.0.1-3) unstable; urgency=low
Modified: desktop/unstable/gnome-media/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/control?rev=20141&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/control (original)
+++ desktop/unstable/gnome-media/debian/control Wed May 27 22:34:20 2009
@@ -9,19 +9,20 @@
dpkg-dev (>= 1.13.19),
debhelper (>= 5.0.0),
intltool (>= 0.35.0),
- libglib2.0-dev (>= 2.15.2),
- libgnome2-dev (>= 2.13.7),
- libgnomeui-dev (>= 2.13.2),
- libbonobo2-dev (>= 2.0.0),
+ libglib2.0-dev (>= 2.18.2),
+ libgtk2.0-dev (>= 2.15.1),
+ libglade2-dev,
+ libgconf2-dev,
+ libpulse-dev (>= 0.9.15),
+ libcanberra-gtk-dev (>= 0.4),
+ libxml2-dev (>= 2.5.0),
+ libunique-dev,
libgstreamer0.10-dev (>= 0.10.3),
- libgconf2-dev,
- libglade2-dev,
+ libgnomeui-dev,
libgstreamer-plugins-base0.10-dev (>= 0.10.3),
- libgtk2.0-dev (>= 2.10),
- libesd0-dev (>= 0.2.23),
+ libbonobo2-dev,
docbook-utils,
gnome-doc-utils,
- libxml2-dev (>= 2.5.0),
libnautilus-burn-dev (>= 2.12.2-2),
libgail-dev,
scrollkeeper,
@@ -36,8 +37,10 @@
gstreamer0.10-alsa | gstreamer0.10-audiosink,
gnome-media-common (>= ${gnome:Version}),
gnome-media-common (<< ${gnome:NextVersion}),
- gstreamer0.10-plugins-base,
- gstreamer0.10-plugins-good
+ gstreamer0.10-plugins-base (>= 0.10.3),
+ gstreamer0.10-plugins-good,
+ x11-utils
+Suggests: pulseaudio
Description: GNOME media utilities
This package contains a few media utilities for the GNOME desktop:
* the GNOME GStreamer-based audio mixer;
@@ -76,7 +79,7 @@
libgconf2-dev,
libgtk2.0-dev (>= 2.10),
libglade2-dev,
- libgnome2-dev (>= 2.13.7)
+ libgnome2-dev
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
Modified: desktop/unstable/gnome-media/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/control.in?rev=20141&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/control.in (original)
+++ desktop/unstable/gnome-media/debian/control.in Wed May 27 22:34:20 2009
@@ -10,20 +10,19 @@
debhelper (>= 5.0.0),
intltool (>= 0.35.0),
libglib2.0-dev (>= 2.18.2),
- libgnome2-dev (>= 2.13.7),
- libgnomeui-dev (>= 2.13.2),
- libbonobo2-dev (>= 2.0.0),
+ libgtk2.0-dev (>= 2.15.1),
+ libglade2-dev,
+ libgconf2-dev,
+ libpulse-dev (>= 0.9.15),
+ libcanberra-gtk-dev (>= 0.4),
+ libxml2-dev (>= 2.5.0),
+ libunique-dev,
libgstreamer0.10-dev (>= 0.10.3),
- libgconf2-dev,
- libglade2-dev,
+ libgnomeui-dev,
libgstreamer-plugins-base0.10-dev (>= 0.10.3),
- libgtk2.0-dev (>= 2.10),
- libesd0-dev (>= 0.2.23),
- libcanberra-gtk-dev (>= 0.4),
- libunique-dev,
+ libbonobo2-dev,
docbook-utils,
gnome-doc-utils,
- libxml2-dev (>= 2.5.0),
libnautilus-burn-dev (>= 2.12.2-2),
libgail-dev,
scrollkeeper,
@@ -38,8 +37,10 @@
gstreamer0.10-alsa | gstreamer0.10-audiosink,
gnome-media-common (>= ${gnome:Version}),
gnome-media-common (<< ${gnome:NextVersion}),
- gstreamer0.10-plugins-base,
- gstreamer0.10-plugins-good
+ gstreamer0.10-plugins-base (>= 0.10.3),
+ gstreamer0.10-plugins-good,
+ x11-utils
+Suggests: pulseaudio
Description: GNOME media utilities
This package contains a few media utilities for the GNOME desktop:
* the GNOME GStreamer-based audio mixer;
@@ -78,7 +79,7 @@
libgconf2-dev,
libgtk2.0-dev (>= 2.10),
libglade2-dev,
- libgnome2-dev (>= 2.13.7)
+ libgnome2-dev
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
Modified: desktop/unstable/gnome-media/debian/gnome-media-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/gnome-media-common.install?rev=20141&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/gnome-media-common.install (original)
+++ desktop/unstable/gnome-media/debian/gnome-media-common.install Wed May 27 22:34:20 2009
@@ -1,8 +1,17 @@
debian/*.xpm /usr/share/pixmaps/
debian/tmp/etc/gconf
+debian/tmp/usr/share/omf
+debian/tmp/usr/share/gnome/help
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/gstreamer-properties
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/sounds
debian/tmp/usr/share/gnome-media
-debian/tmp/usr/share/locale
-debian/tmp/usr/share/gstreamer-properties
-debian/tmp/usr/share/icons
-debian/tmp/usr/share/gnome/help
debian/tmp/usr/share/gnome-sound-recorder
+debian/tmp-gst/etc/gconf /etc
+debian/tmp-gst/usr/share/omf /usr/share
+debian/tmp-gst/usr/share/gnome/help /usr/share/gnome
+debian/tmp-gst/usr/share/icons /usr/share
+debian/tmp-gst/usr/share/gnome-media /usr/share
+debian/tmp-pulse/usr/share/icons /usr/share
+debian/tmp-pulse/usr/share/gnome-media /usr/share
Added: desktop/unstable/gnome-media/debian/gnome-media.dirs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/gnome-media.dirs?rev=20141&op=file
==============================================================================
--- desktop/unstable/gnome-media/debian/gnome-media.dirs (added)
+++ desktop/unstable/gnome-media/debian/gnome-media.dirs Wed May 27 22:34:20 2009
@@ -1,0 +1,1 @@
+/usr/bin
Modified: desktop/unstable/gnome-media/debian/gnome-media.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/gnome-media.install?rev=20141&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/gnome-media.install (original)
+++ desktop/unstable/gnome-media/debian/gnome-media.install Wed May 27 22:34:20 2009
@@ -1,2 +1,6 @@
debian/tmp/usr/bin
debian/tmp/usr/share/applications
+debian/tmp-pulse/etc/xdg/autostart /usr/share/gnome
+debian/tmp-pulse/usr/bin/gnome-volume-control-applet /usr/bin
+debian/tmp-pulse/usr/share/applications /usr/share
+debian/gnome-volume-control /usr/bin
Added: desktop/unstable/gnome-media/debian/gnome-volume-control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/gnome-volume-control?rev=20141&op=file
==============================================================================
--- desktop/unstable/gnome-media/debian/gnome-volume-control (added)
+++ desktop/unstable/gnome-media/debian/gnome-volume-control Wed May 27 22:34:20 2009
@@ -1,0 +1,6 @@
+#! /bin/sh
+
+if xprop -root | grep -q ^PULSE_SERVER ; then
+ exec gnome-volume-control.pulse "$@"
+fi
+exec gnome-volume-control.gstreamer "$@"
Modified: desktop/unstable/gnome-media/debian/libgnome-media-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/libgnome-media-dev.install?rev=20141&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/libgnome-media-dev.install (original)
+++ desktop/unstable/gnome-media/debian/libgnome-media-dev.install Wed May 27 22:34:20 2009
@@ -1,3 +1,4 @@
debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/*.{so,a}
+debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/*.a
debian/tmp/usr/include
Added: desktop/unstable/gnome-media/debian/patches/10_applet_tryexec.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/patches/10_applet_tryexec.patch?rev=20141&op=file
==============================================================================
--- desktop/unstable/gnome-media/debian/patches/10_applet_tryexec.patch (added)
+++ desktop/unstable/gnome-media/debian/patches/10_applet_tryexec.patch Wed May 27 22:34:20 2009
@@ -1,0 +1,11 @@
+--- gnome-volume-control/data/gnome-volume-control-applet.desktop.in.orig 2009-05-27 22:32:00.338480450 +0200
++++ gnome-volume-control/data/gnome-volume-control-applet.desktop.in 2009-05-27 22:32:17.450480083 +0200
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ Categories=
+-NoDisplay=true
++TryExec=/usr/bin/pulseaudio
+ OnlyShowIn=GNOME;XFCE;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-media
Modified: desktop/unstable/gnome-media/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-media/debian/rules?rev=20141&op=diff
==============================================================================
--- desktop/unstable/gnome-media/debian/rules (original)
+++ desktop/unstable/gnome-media/debian/rules Wed May 27 22:34:20 2009
@@ -8,7 +8,24 @@
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 += --disable-cddbslave --disable-gnomecd
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-cddbslave --disable-gnomecd --enable-gstmix
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-*
More information about the pkg-gnome-commits
mailing list