[SCM] vlc/master: Add backported notify GTK+ dependency patch.

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Mon Jan 24 14:18:02 UTC 2011


The following commit has been merged in the master branch:
commit cd538db521a3dd08b4439bc8909a39a4a1d9f065
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Jan 24 14:56:56 2011 +0100

    Add backported notify GTK+ dependency patch.

diff --git a/debian/control b/debian/control
index 819651d..8af7f5b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,9 @@ Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
            Christophe Mutricy <xtophe at videolan.org>,
            Mohammed Adnène Trojette <adn+deb at diwi.org>,
            Benjamin Drung <bdrung at debian.org>
-Build-Depends: debhelper (>= 7.2.3~),
+Build-Depends: autopoint,
+               debhelper (>= 7.2.3~),
+               dh-autoreconf,
                dh-buildinfo,
                gettext,
                liba52-0.7.4-dev,
diff --git a/debian/patches/notify-gtk-dependency.patch b/debian/patches/notify-gtk-dependency.patch
new file mode 100644
index 0000000..1d566f1
--- /dev/null
+++ b/debian/patches/notify-gtk-dependency.patch
@@ -0,0 +1,17 @@
+From: Dominique Leuenberger <dominique at leuenberger.net>
+Subject: Libnotify depends on gtk, but leaves the choice between gtk2 and gtk3
+ to the calling...
+Origin: backport, http://git.videolan.org/?p=vlc.git;a=commitdiff;h=f62e6d6e7ca732471f84fc766988553974b8a1b8
+Applied-Upstream: 1.2.0
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1721,7 +1721,7 @@
+ dnl
+ dnl Libnotify notification plugin
+ dnl
+-PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify], [libnotify notification], [auto])
++PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify gtk+-2.0], [libnotify notification], [auto])
+ 
+ dnl
+ dnl Taglibplugin
diff --git a/debian/patches/series b/debian/patches/series
index 52cf4eb..5f06c5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 052_as-needed.patch
 200_osdmenu_paths.patch
 fix-lirc-build-failure.patch
+notify-gtk-dependency.patch
diff --git a/debian/rules b/debian/rules
index ea47994..d95e7ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,7 +137,7 @@ confflags += --enable-svgalib
 endif
 
 %:
-	dh $@ --parallel
+	dh $@ --parallel --with autoreconf
 
 override_dh_auto_clean:
 	[ ! -f debian/vlc-nox.install.bak ] || mv -f debian/vlc-nox.install.bak \

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list