rev 16259 - in kde-extras/subtitlecomposer/trunk/debian: . patches

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Fri Nov 13 18:36:09 UTC 2009


Author: santa-guest
Date: 2009-11-13 18:36:09 +0000 (Fri, 13 Nov 2009)
New Revision: 16259

Added:
   kde-extras/subtitlecomposer/trunk/debian/README.source
   kde-extras/subtitlecomposer/trunk/debian/patches/01_link_gobject.diff
   kde-extras/subtitlecomposer/trunk/debian/patches/02_link_krosscore.diff
   kde-extras/subtitlecomposer/trunk/debian/patches/03_link_phonon.diff
Modified:
   kde-extras/subtitlecomposer/trunk/debian/changelog
   kde-extras/subtitlecomposer/trunk/debian/control
   kde-extras/subtitlecomposer/trunk/debian/patches/series
   kde-extras/subtitlecomposer/trunk/debian/rules
Log:
Added patches to not FTBFS with binutils-gold.


Added: kde-extras/subtitlecomposer/trunk/debian/README.source
===================================================================
--- kde-extras/subtitlecomposer/trunk/debian/README.source	                        (rev 0)
+++ kde-extras/subtitlecomposer/trunk/debian/README.source	2009-11-13 18:36:09 UTC (rev 16259)
@@ -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/subtitlecomposer/trunk/debian/changelog
===================================================================
--- kde-extras/subtitlecomposer/trunk/debian/changelog	2009-11-13 14:19:19 UTC (rev 16258)
+++ kde-extras/subtitlecomposer/trunk/debian/changelog	2009-11-13 18:36:09 UTC (rev 16259)
@@ -1,3 +1,12 @@
+subtitlecomposer (0.5.3-2) UNRELEASED; urgency=low
+
+  * Added patches to avoid an FTBFS when compiling with binutils-gold:
+    + 01_link_gobject.diff
+    + 02_link_krosscore.diff
+    + 03_link_phonon.diff
+
+ -- José Manuel Santamaría Lema <panfaust at gmail.com>  Fri, 13 Nov 2009 00:46:57 +0100
+
 subtitlecomposer (0.5.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: kde-extras/subtitlecomposer/trunk/debian/control
===================================================================
--- kde-extras/subtitlecomposer/trunk/debian/control	2009-11-13 14:19:19 UTC (rev 16258)
+++ kde-extras/subtitlecomposer/trunk/debian/control	2009-11-13 18:36:09 UTC (rev 16259)
@@ -5,7 +5,7 @@
 Uploaders: José Manuel Santamaría Lema <panfaust at gmail.com>
 Build-Depends: debhelper (>= 7), cmake, cdbs, pkg-kde-tools,
  kdelibs5-dev, libgstreamer-plugins-base0.10-dev, libglib2.0-dev, libxml2-dev,
- libxine-dev, libx11-dev
+ libxine-dev, libx11-dev, quilt
 Standards-Version: 3.8.2
 Homepage: http://sourceforge.net/projects/subcomposer
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/subtitlecomposer/trunk

Added: kde-extras/subtitlecomposer/trunk/debian/patches/01_link_gobject.diff
===================================================================
--- kde-extras/subtitlecomposer/trunk/debian/patches/01_link_gobject.diff	                        (rev 0)
+++ kde-extras/subtitlecomposer/trunk/debian/patches/01_link_gobject.diff	2009-11-13 18:36:09 UTC (rev 16259)
@@ -0,0 +1,15 @@
+# Description: This pacth adds a missing find_package for GObject.
+#  Without this patch the package will FTBFS with binutils-gold.
+# Forwarded: http://sourceforge.net/tracker/?func=detail&aid=2897376&group_id=208427&atid=1005654
+# Author: José Manuel Santamaría Lema <panfaust at gmail.com>
+# 
+--- subtitlecomposer-0.5.3.orig/src/player/gstreamer/CMakeLists.txt
++++ subtitlecomposer-0.5.3/src/player/gstreamer/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ # TODO WHY AREN'T THESE INCLUDED BY MACRO_OPTIONAL_FIND_PACKAGE( GStreamer )?
+ FIND_PACKAGE( GLIB2 REQUIRED )
+ FIND_PACKAGE( LibXml2 REQUIRED )
++FIND_PACKAGE( GObject REQUIRED )
+ 
+ SET( players_gstreamer_INCLUDE_DIR
+ 	${GLIB2_INCLUDE_DIR}

Added: kde-extras/subtitlecomposer/trunk/debian/patches/02_link_krosscore.diff
===================================================================
--- kde-extras/subtitlecomposer/trunk/debian/patches/02_link_krosscore.diff	                        (rev 0)
+++ kde-extras/subtitlecomposer/trunk/debian/patches/02_link_krosscore.diff	2009-11-13 18:36:09 UTC (rev 16259)
@@ -0,0 +1,15 @@
+# Description: This pacth adds a missing link against Kross.
+#  Without this patch the package will FTBFS with binutils-gold.
+# Forwarded: not-needed
+# Author: José Manuel Santamaría Lema <panfaust at gmail.com>
+# 
+--- subtitlecomposer-0.5.3.orig/src/main/CMakeLists.txt
++++ subtitlecomposer-0.5.3/src/main/CMakeLists.txt
+@@ -46,6 +46,7 @@
+ 	${KDE4_KDEUI_LIBS}
+ 	${KDE4_KHTML_LIBS}
+ 	${KDE4_KFILE_LIBS}
++	${KDE4_KROSSCORE_LIBS}
+ 	${KDE4_KROSSUI_LIBS}
+ 	${common_LIBS}
+ 	${config_LIBS}

Added: kde-extras/subtitlecomposer/trunk/debian/patches/03_link_phonon.diff
===================================================================
--- kde-extras/subtitlecomposer/trunk/debian/patches/03_link_phonon.diff	                        (rev 0)
+++ kde-extras/subtitlecomposer/trunk/debian/patches/03_link_phonon.diff	2009-11-13 18:36:09 UTC (rev 16259)
@@ -0,0 +1,15 @@
+# Description: This pacth adds a missing link against Phonon.
+#  Without this patch the package will FTBFS with binutils-gold.
+# Forwarded: not-needed
+# Author: José Manuel Santamaría Lema <panfaust at gmail.com>
+# 
+--- subtitlecomposer-0.5.3.orig/src/player/phonon/CMakeLists.txt
++++ subtitlecomposer-0.5.3/src/player/phonon/CMakeLists.txt
+@@ -4,3 +4,7 @@
+ 	CACHE INTERNAL EXPORTEDVARIABLE
+ )
+ 
++SET( players_phonon_LIBS
++	${KDE4_PHONON_LIBS}
++	CACHE INTERNAL EXPORTEDVARIABLE
++)

Modified: kde-extras/subtitlecomposer/trunk/debian/patches/series
===================================================================
--- kde-extras/subtitlecomposer/trunk/debian/patches/series	2009-11-13 14:19:19 UTC (rev 16258)
+++ kde-extras/subtitlecomposer/trunk/debian/patches/series	2009-11-13 18:36:09 UTC (rev 16259)
@@ -0,0 +1,3 @@
+01_link_gobject.diff
+02_link_krosscore.diff
+03_link_phonon.diff

Modified: kde-extras/subtitlecomposer/trunk/debian/rules
===================================================================
--- kde-extras/subtitlecomposer/trunk/debian/rules	2009-11-13 14:19:19 UTC (rev 16258)
+++ kde-extras/subtitlecomposer/trunk/debian/rules	2009-11-13 18:36:09 UTC (rev 16259)
@@ -4,7 +4,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/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 install/subtitlecomposer::
 	find debian/subtitlecomposer -type d -empty -delete




More information about the pkg-kde-commits mailing list