rev 16262 - in kde-extras/kmplayer/trunk/debian: . patches

[José Manuel Santamaría Lema]

Author: santa-guest
Date: 2009-11-13 20:03:19 +0000 (Fri, 13 Nov 2009)
New Revision: 16262

Added:
   kde-extras/kmplayer/trunk/debian/README.source
   kde-extras/kmplayer/trunk/debian/patches/
   kde-extras/kmplayer/trunk/debian/patches/01_rev1046843_link_with_X11.diff
   kde-extras/kmplayer/trunk/debian/patches/series
Modified:
   kde-extras/kmplayer/trunk/debian/changelog
   kde-extras/kmplayer/trunk/debian/control
   kde-extras/kmplayer/trunk/debian/rules
Log:
Added 01_rev1046843_link_with_X11.diff patch.


Added: kde-extras/kmplayer/trunk/debian/README.source
===================================================================
--- kde-extras/kmplayer/trunk/debian/README.source	                        (rev 0)
+++ kde-extras/kmplayer/trunk/debian/README.source	2009-11-13 20:03:19 UTC (rev 16262)
@@ -0,0 +1,4 @@
+This package uses CDBS as build system.  See /usr/share/doc/cdbs/cdbs-doc.{html|pdf.gz}.
+
+This package uses quilt for patch management.  See /usr/share/doc/quilt/README.gz.
+

Modified: kde-extras/kmplayer/trunk/debian/changelog
===================================================================
--- kde-extras/kmplayer/trunk/debian/changelog	2009-11-13 18:56:25 UTC (rev 16261)
+++ kde-extras/kmplayer/trunk/debian/changelog	2009-11-13 20:03:19 UTC (rev 16262)
@@ -1,8 +1,10 @@
 kmplayer (1:0.11.1b-2) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  +++ Changes by José Manuel Santamaría Lema:
+  * Added 01_rev1046843_link_with_X11.diff, it makes the package able to build
+    with binutils-gold (Closes: #555021).
 
- -- Fathi Boudra <fabo at debian.org>  Sun, 21 Jun 2009 16:36:45 +0200
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 13 Nov 2009 20:40:43 +0100
 
 kmplayer (1:0.11.1b-1) unstable; urgency=low
 

Modified: kde-extras/kmplayer/trunk/debian/control
===================================================================
--- kde-extras/kmplayer/trunk/debian/control	2009-11-13 18:56:25 UTC (rev 16261)
+++ kde-extras/kmplayer/trunk/debian/control	2009-11-13 20:03:19 UTC (rev 16262)
@@ -5,7 +5,7 @@
 Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), cmake, pkg-kde-tools, kdelibs5-dev,
  libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libgtk2.0-dev,
- libx11-dev, libxt-dev
+ libx11-dev, libxt-dev, quilt
 Standards-Version: 3.8.2
 Homepage: http://kmplayer.kde.org
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kmplayer/?op=log

Added: kde-extras/kmplayer/trunk/debian/patches/01_rev1046843_link_with_X11.diff
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/01_rev1046843_link_with_X11.diff	                        (rev 0)
+++ kde-extras/kmplayer/trunk/debian/patches/01_rev1046843_link_with_X11.diff	2009-11-13 20:03:19 UTC (rev 16262)
@@ -0,0 +1,17 @@
+# Description: This pacth adds a missing link against X11.
+#  Without this patch the package will FTBFS with binutils-gold.
+# Forwarded: not-needed
+# Origin: http://websvn.kde.org/?view=revision&revision=1046843
+# 
+--- kmess/src/CMakeLists.txt	2009/11/09 20:30:04	1046842
++++ kmess/src/CMakeLists.txt	2009/11/09 20:31:07	1046843
+@@ -140,7 +140,8 @@
+         "${GLibDBusCflags} ${GTKCflags} ${GThreadCflags}"
+     )
+ 
+-    target_link_libraries(knpplayer ${GLibDBusLinkFlags} ${GTKLinkFlags} ${GThreadLinkFlags})
++    target_link_libraries(knpplayer ${GLibDBusLinkFlags} ${GTKLinkFlags} ${GThreadLinkFlags}
++        ${X11_X11_LIB} )
+ 
+     install(TARGETS knpplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 

Added: kde-extras/kmplayer/trunk/debian/patches/series
===================================================================
--- kde-extras/kmplayer/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/kmplayer/trunk/debian/patches/series	2009-11-13 20:03:19 UTC (rev 16262)
@@ -0,0 +1 @@
+01_rev1046843_link_with_X11.diff

Modified: kde-extras/kmplayer/trunk/debian/rules
===================================================================
--- kde-extras/kmplayer/trunk/debian/rules	2009-11-13 18:56:25 UTC (rev 16261)
+++ kde-extras/kmplayer/trunk/debian/rules	2009-11-13 20:03:19 UTC (rev 16262)
@@ -3,6 +3,7 @@
 include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 install/kmplayer::
 	rm -rf $(DEB_DESTDIR)/usr/share/icons/oxygen/