[Pkg-voip-commits] r7792 - in /mumble/trunk/debian: README.source changelog control patches/ patches/0001-Add-direct-dependent-libraries-under-X11.patch patches/series rules
slicer-guest at alioth.debian.org
slicer-guest at alioth.debian.org
Thu Nov 12 19:04:33 UTC 2009
Author: slicer-guest
Date: Thu Nov 12 19:04:29 2009
New Revision: 7792
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7792
Log:
Add patch to include all directly used libraries. Closes: #555758
Added:
mumble/trunk/debian/README.source
mumble/trunk/debian/patches/
mumble/trunk/debian/patches/0001-Add-direct-dependent-libraries-under-X11.patch
mumble/trunk/debian/patches/series
Modified:
mumble/trunk/debian/changelog
mumble/trunk/debian/control
mumble/trunk/debian/rules
Added: mumble/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/README.source?rev=7792&op=file
==============================================================================
--- mumble/trunk/debian/README.source (added)
+++ mumble/trunk/debian/README.source Thu Nov 12 19:04:29 2009
@@ -1,0 +1,5 @@
+This package uses quilt to manage all modifications to the upstream source.
+Changes are stored in the source package as diffs in debian/patches and
+applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=7792&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Thu Nov 12 19:04:29 2009
@@ -2,6 +2,7 @@
* Add celt dependency to binary package; celt is dynamically loaded,
so isn't picked up by dh_shlibdeps.
+ * Add patch to include all directly used libraries. Closes: #555758
-- Thorvald Natvig <slicer at users.sourceforge.net> Wed, 11 Nov 2009 23:41:59 +0100
Modified: mumble/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/control?rev=7792&op=diff
==============================================================================
--- mumble/trunk/debian/control (original)
+++ mumble/trunk/debian/control Thu Nov 12 19:04:29 2009
@@ -4,7 +4,7 @@
Homepage: http://mumble.sourceforge.net/
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Patrick Matthäi <pmatthaei at debian.org>, Thorvald Natvig <slicer at users.sourceforge.net>
-Build-Depends: debhelper (>= 5.0.51~), po-debconf,
+Build-Depends: debhelper (>= 7.0.8), quilt (>= 0.46-7~), po-debconf,
libboost-dev (>= 1.36.0), libboost-python-dev (>= 1.36.0),
libqt4-dev (>= 4.5.0), libqt4-opengl-dev (>= 4.5.0),
libasound2-dev, libpulse-dev,
Added: mumble/trunk/debian/patches/0001-Add-direct-dependent-libraries-under-X11.patch
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/0001-Add-direct-dependent-libraries-under-X11.patch?rev=7792&op=file
==============================================================================
--- mumble/trunk/debian/patches/0001-Add-direct-dependent-libraries-under-X11.patch (added)
+++ mumble/trunk/debian/patches/0001-Add-direct-dependent-libraries-under-X11.patch Thu Nov 12 19:04:29 2009
@@ -1,0 +1,58 @@
+From 3df0dceaec032efacdfb43dc3a95aa179f98fdc3 Mon Sep 17 00:00:00 2001
+From: Thorvald Natvig <slicer at users.sourceforge.net>
+Date: Thu, 12 Nov 2009 18:49:14 +0100
+Subject: [PATCH] Add direct dependent libraries under X11
+
+---
+ compiler.pri | 1 +
+ src/mumble/mumble.pro | 2 ++
+ src/mumble11x/mumble11x.pro | 2 ++
+ 3 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/compiler.pri b/compiler.pri
+index c6d901e..68458da 100644
+--- a/compiler.pri
++++ b/compiler.pri
+@@ -75,6 +75,7 @@ win32 {
+ CONFIG(debug, debug|release) {
+ QMAKE_CFLAGS *= -fstack-protector -fPIE -pie
+ QMAKE_CXXFLAGS *= -fstack-protector -fPIE -pie
++ QMAKE_LFLAGS = -Wl,--no-add-needed
+ }
+
+ QMAKE_CFLAGS *= -Wfatal-errors -Wshadow -Wconversion -Wsign-compare -fvisibility=hidden
+diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro
+index ccbbae4..36c5abb 100644
+--- a/src/mumble/mumble.pro
++++ b/src/mumble/mumble.pro
+@@ -127,9 +127,11 @@ unix {
+
+ HEADERS *= GlobalShortcut_unix.h
+ SOURCES *= GlobalShortcut_unix.cpp TextToSpeech_unix.cpp Overlay_unix.cpp
++ LIBS *= -lrt
+ }
+
+ !macx {
++ PKGCONFIG *= x11
+ LIBS *= -lXi
+ }
+
+diff --git a/src/mumble11x/mumble11x.pro b/src/mumble11x/mumble11x.pro
+index 0e89d0a..1c208ad 100644
+--- a/src/mumble11x/mumble11x.pro
++++ b/src/mumble11x/mumble11x.pro
+@@ -123,9 +123,11 @@ unix {
+
+ HEADERS *= GlobalShortcut_unix.h
+ SOURCES *= GlobalShortcut_unix.cpp TextToSpeech_unix.cpp Overlay_unix.cpp
++ LIBS *= -lrt
+ }
+
+ !macx {
++ PKGCONFIG *= x11
+ LIBS *= -lXi
+ }
+
+--
+1.6.5.2
+
Added: mumble/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/series?rev=7792&op=file
==============================================================================
--- mumble/trunk/debian/patches/series (added)
+++ mumble/trunk/debian/patches/series Thu Nov 12 19:04:29 2009
@@ -1,0 +1,1 @@
+0001-Add-direct-dependent-libraries-under-X11.patch
Modified: mumble/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/rules?rev=7792&op=diff
==============================================================================
--- mumble/trunk/debian/rules (original)
+++ mumble/trunk/debian/rules Thu Nov 12 19:04:29 2009
@@ -11,9 +11,10 @@
export DH_OPTIONS
configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
+configure-stamp:
echo $(DEB_BUILD_ARCH)
dh_testdir
+ dh_quilt_patch
qmake-qt4 -recursive main.pro \
CONFIG*=release \
CONFIG*=symbols \
@@ -54,6 +55,7 @@
[ ! -d release-32 ] || rm -rf release-32
rm -f $(CURDIR)/debian/mumble-server.logrotate $(CURDIR)/mumble-server.init
debconf-updatepo
+ dh_quilt_unpatch
dh_clean
install: install-indep install-arch
More information about the Pkg-voip-commits
mailing list