r445 - vdr/vdr-plugin-femon/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2005-04-10 22:06:12 +0000 (Sun, 10 Apr 2005)
New Revision: 445

Removed:
   vdr/vdr-plugin-femon/trunk/debian/patches/
Modified:
   vdr/vdr-plugin-femon/trunk/debian/changelog
   vdr/vdr-plugin-femon/trunk/debian/control
   vdr/vdr-plugin-femon/trunk/debian/rules
Log:
vdr-plugin-femon:
    - Removed 01_Makefile-fPIC-fix, integrated by upstream
    - Removed dpatch build-dep and disabled dpatch in debian/rules,
      because we do not have any dpatches left


Modified: vdr/vdr-plugin-femon/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/changelog	2005-04-10 21:59:29 UTC (rev 444)
+++ vdr/vdr-plugin-femon/trunk/debian/changelog	2005-04-10 22:06:12 UTC (rev 445)
@@ -7,6 +7,9 @@
     - Depend/Build-Depend on vdr (>=1.3.23-1)
     - Conflict with vdr (>=1.3.24)
     - Updated debian/watch
+    - Removed 01_Makefile-fPIC-fix, integrated by upstream
+    - Removed dpatch build-dep and disabled dpatch in debian/rules,
+      because we do not have any dpatches left
 
  -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun, 10 Apr 2005 23:54:07 +0200
 

Modified: vdr/vdr-plugin-femon/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/control	2005-04-10 21:59:29 UTC (rev 444)
+++ vdr/vdr-plugin-femon/trunk/debian/control	2005-04-10 22:06:12 UTC (rev 445)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg@e-tobi.net>, Thomas Schmidt <tschmidt@debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.23-1), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.23-1)
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-femon

Modified: vdr/vdr-plugin-femon/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-femon/trunk/debian/rules	2005-04-10 21:59:29 UTC (rev 444)
+++ vdr/vdr-plugin-femon/trunk/debian/rules	2005-04-10 22:06:12 UTC (rev 445)
@@ -8,9 +8,6 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=4
 
-# include dpatch stuff
-include /usr/share/dpatch/dpatch.make
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif
@@ -25,6 +22,17 @@
 VDRDIR=/usr/include/$(VDR)
 DVBDIR=/usr/include
 
+# To use dpatch uncomment the following line and set Build-Depends to dpatch
+DPATCH=no
+
+ifdef DPATCH
+include /usr/share/dpatch/dpatch.make
+else
+patch:
+patch-stamp:
+unpatch:
+endif
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir