r26335 - in /desktop/experimental/gnome-media/debian: changelog control control.in patches/99_ltmain_as-needed.patch patches/series rules
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Mon Jan 17 20:37:17 UTC 2011
Author: pochu
Date: Mon Jan 17 20:37:17 2011
New Revision: 26335
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26335
Log:
* debian/control.in:
- Bump the libgtk3.0-dev build dependency.
- Build depend on docbook-xml for the documentation.
* debian/rules:
- Include autoreconf.mk before debhelper.mk to avoid leftovers.
Added:
desktop/experimental/gnome-media/debian/patches/series
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/patches/99_ltmain_as-needed.patch
desktop/experimental/gnome-media/debian/rules
Modified: desktop/experimental/gnome-media/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-media/debian/changelog?rev=26335&op=diff
==============================================================================
--- desktop/experimental/gnome-media/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-media/debian/changelog [utf-8] Mon Jan 17 20:37:17 2011
@@ -14,8 +14,13 @@
* debian/source/format,
debian/rules:
+ Switch to source format 3.0 (quilt).
-
- -- Sjoerd Simons <sjoerd at debian.org> Sat, 18 Dec 2010 22:00:40 +0000
+ * debian/control.in:
+ - Bump the libgtk3.0-dev build dependency.
+ - Build depend on docbook-xml for the documentation.
+ * debian/rules:
+ - Include autoreconf.mk before debhelper.mk to avoid leftovers.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Thu, 13 Jan 2011 00:08:40 +0000
gnome-media (2.30.0-1) unstable; urgency=low
Modified: desktop/experimental/gnome-media/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-media/debian/control?rev=26335&op=diff
==============================================================================
--- desktop/experimental/gnome-media/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-media/debian/control [utf-8] Mon Jan 17 20:37:17 2011
@@ -7,7 +7,7 @@
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>, Sjoerd Simons <sjoerd at 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.9.1
Build-Depends: cdbs (>= 0.4.41),
dh-autoreconf,
@@ -17,7 +17,7 @@
debhelper (>= 5.0.0),
intltool (>= 0.35.0),
libglib2.0-dev (>= 2.18.2),
- libgtk3.0-dev,
+ libgtk3.0-dev (>= 2.99.1),
libgconf2-dev,
libpulse-dev (>= 0.9.16),
libcanberra-gtk3-dev (>= 0.13),
@@ -25,6 +25,7 @@
libgstreamer0.10-dev (>= 0.10.23),
libgstreamer-plugins-base0.10-dev (>= 0.10.23),
docbook-utils,
+ docbook-xml,
gnome-doc-utils,
gstreamer0.10-tools,
gstreamer0.10-plugins-base,
Modified: desktop/experimental/gnome-media/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-media/debian/control.in?rev=26335&op=diff
==============================================================================
--- desktop/experimental/gnome-media/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-media/debian/control.in [utf-8] Mon Jan 17 20:37:17 2011
@@ -12,7 +12,7 @@
debhelper (>= 5.0.0),
intltool (>= 0.35.0),
libglib2.0-dev (>= 2.18.2),
- libgtk3.0-dev,
+ libgtk3.0-dev (>= 2.99.1),
libgconf2-dev,
libpulse-dev (>= 0.9.16),
libcanberra-gtk3-dev (>= 0.13),
@@ -20,6 +20,7 @@
libgstreamer0.10-dev (>= 0.10.23),
libgstreamer-plugins-base0.10-dev (>= 0.10.23),
docbook-utils,
+ docbook-xml,
gnome-doc-utils,
gstreamer0.10-tools,
gstreamer0.10-plugins-base,
Modified: desktop/experimental/gnome-media/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-media/debian/patches/99_ltmain_as-needed.patch?rev=26335&op=diff
==============================================================================
--- desktop/experimental/gnome-media/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/experimental/gnome-media/debian/patches/99_ltmain_as-needed.patch [utf-8] Mon Jan 17 20:37:17 2011
@@ -1,9 +1,7 @@
-Index: nautilus-2.18.1/ltmain.sh
-===================================================================
---- nautilus-2.18.1.orig/build-aux/ltmain.sh 2006-07-13 09:12:13.000000000 +0200
-+++ nautilus-2.18.1/build-aux/ltmain.sh 2007-06-06 23:36:38.899175453 +0200
-@@ -1794,6 +1794,11 @@
- arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+--- a/build-aux/ltmain.sh
++++ b/build-aux/ltmain.sh
+@@ -5041,6 +5041,11 @@
+ arg=$func_stripname_result
;;
+ -Wl,--as-needed)
@@ -12,9 +10,9 @@
+ ;;
+
-Wl,*)
- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- arg=
-@@ -2134,6 +2139,15 @@
+ func_stripname '-Wl,' '' "$arg"
+ args=$func_stripname_result
+@@ -5394,6 +5399,15 @@
lib=
found=no
case $deplib in
Added: desktop/experimental/gnome-media/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-media/debian/patches/series?rev=26335&op=file
==============================================================================
--- desktop/experimental/gnome-media/debian/patches/series (added)
+++ desktop/experimental/gnome-media/debian/patches/series [utf-8] Mon Jan 17 20:37:17 2011
@@ -1,0 +1,2 @@
+06_track_capture_toggle.patch
+99_ltmain_as-needed.patch
Modified: desktop/experimental/gnome-media/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-media/debian/rules?rev=26335&op=diff
==============================================================================
--- desktop/experimental/gnome-media/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-media/debian/rules [utf-8] Mon Jan 17 20:37:17 2011
@@ -1,8 +1,8 @@
#!/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/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
@@ -13,5 +13,5 @@
LDFLAGS += -Wl,-z,defs -Wl,--as-needed -Wl,-O1
binary-install/gnome-media::
- rm -rf debian/gnome-media/usr/share/gnome-media
- rm -rf debian/gnome-media/usr/share/sounds
+ rm -r debian/gnome-media/usr/share/gnome-media
+ rm -r debian/gnome-media/usr/share/sounds
More information about the pkg-gnome-commits
mailing list