r7771 - in /vdr/vdr-plugin-text2skin/trunk/debian: changelog patches/00list patches/96_gcc43.dpatch patches/97_use-pkg-config.dpatch patches/98_uint64.dpatch

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Sun May  3 19:58:45 2009
New Revision: 7771

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7771
Log:
 * Added 97_use-pkg-config.dpatch
 * Added 98_uint64.dpatch

Added:
    vdr/vdr-plugin-text2skin/trunk/debian/patches/97_use-pkg-config.dpatch
    vdr/vdr-plugin-text2skin/trunk/debian/patches/98_uint64.dpatch
Modified:
    vdr/vdr-plugin-text2skin/trunk/debian/changelog
    vdr/vdr-plugin-text2skin/trunk/debian/patches/00list
    vdr/vdr-plugin-text2skin/trunk/debian/patches/96_gcc43.dpatch   (props changed)

Modified: vdr/vdr-plugin-text2skin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/debian/changelog?rev=7771&op=diff
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-text2skin/trunk/debian/changelog Sun May  3 19:58:45 2009
@@ -1,3 +1,10 @@
+vdr-plugin-text2skin (1.0+cvs20080122.2311-8) experimental; urgency=low
+
+   * Added 97_use-pkg-config.dpatch
+   * Added 98_uint64.dpatch
+
+ -- Tobias Grimm <etobi at debian.org>  Sun, 03 May 2009 21:53:19 +0200
+
 vdr-plugin-text2skin (1.0+cvs20080122.2311-7) experimental; urgency=low
 
   * Added 96_gcc43.dpatch

Modified: vdr/vdr-plugin-text2skin/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/debian/patches/00list?rev=7771&op=diff
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-text2skin/trunk/debian/patches/00list Sun May  3 19:58:45 2009
@@ -2,3 +2,5 @@
 94_text2skin-1.1-cvs_ext-0.10-vdr-1.5.4
 95_text2skin-1.1-cvs-locale
 96_gcc43
+97_use-pkg-config
+98_uint64

Propchange: vdr/vdr-plugin-text2skin/trunk/debian/patches/96_gcc43.dpatch
            ('svn:executable' removed)

Added: vdr/vdr-plugin-text2skin/trunk/debian/patches/97_use-pkg-config.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/debian/patches/97_use-pkg-config.dpatch?rev=7771&op=file
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/patches/97_use-pkg-config.dpatch (added)
+++ vdr/vdr-plugin-text2skin/trunk/debian/patches/97_use-pkg-config.dpatch Sun May  3 19:58:45 2009
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 97_use-pkg-config.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad vdr-plugin-text2skin-1.0+cvs20080122.2311~/Makefile vdr-plugin-text2skin-1.0+cvs20080122.2311/Makefile
+--- vdr-plugin-text2skin-1.0+cvs20080122.2311~/Makefile	2005-01-27 18:32:07.000000000 +0100
++++ vdr-plugin-text2skin-1.0+cvs20080122.2311/Makefile	2009-05-03 21:51:29.000000000 +0200
+@@ -69,7 +69,8 @@
+ 
+ ifdef HAVE_IMAGEMAGICK
+ 	DEFINES += -DHAVE_IMAGEMAGICK
+-	LIBS += -lMagick -lMagick++
++	INCLUDES += `pkg-config --cflags Magick++`
++	LIBS += `pkg-config --libs Magick++`
+ #	LIBS += $(shell Magick++-config --ldflags --libs)
+ endif
+ 

Added: vdr/vdr-plugin-text2skin/trunk/debian/patches/98_uint64.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-text2skin/trunk/debian/patches/98_uint64.dpatch?rev=7771&op=file
==============================================================================
--- vdr/vdr-plugin-text2skin/trunk/debian/patches/98_uint64.dpatch (added)
+++ vdr/vdr-plugin-text2skin/trunk/debian/patches/98_uint64.dpatch Sun May  3 19:58:45 2009
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 98_unit64.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad vdr-plugin-text2skin-1.0+cvs20080122.2311~/common.h vdr-plugin-text2skin-1.0+cvs20080122.2311/common.h
+--- vdr-plugin-text2skin-1.0+cvs20080122.2311~/common.h	2005-01-27 18:31:12.000000000 +0100
++++ vdr-plugin-text2skin-1.0+cvs20080122.2311/common.h	2009-05-03 21:52:21.000000000 +0200
+@@ -16,7 +16,7 @@
+ #	else
+ #		define Dprintf(x...)
+ #	endif
+-#	define Dbench(x) uint64 bench_##x = time_ms()
++#	define Dbench(x) uint64_t bench_##x = time_ms()
+ #	define Ddiff(t,x) fprintf(stderr, "%s took %llu ms\n", t, time_ms() - bench_##x)
+ #else
+ #	define Dprintf(x...)