r731 - vdr/vdr-plugin-osdteletext/trunk/debian

[Tobias Grimm]

Author: tiber-guest
Date: 2005-06-26 21:13:36 +0000 (Sun, 26 Jun 2005)
New Revision: 731

Added:
   vdr/vdr-plugin-osdteletext/trunk/debian/compat
Modified:
   vdr/vdr-plugin-osdteletext/trunk/debian/changelog
   vdr/vdr-plugin-osdteletext/trunk/debian/dirs
   vdr/vdr-plugin-osdteletext/trunk/debian/install
   vdr/vdr-plugin-osdteletext/trunk/debian/postinst
   vdr/vdr-plugin-osdteletext/trunk/debian/rules
Log:
osdteletext: some small changes

Modified: vdr/vdr-plugin-osdteletext/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/changelog	2005-06-26 14:11:21 UTC (rev 730)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/changelog	2005-06-26 21:13:36 UTC (rev 731)
@@ -1,7 +1,8 @@
 vdr-plugin-osdteletext (0.5-5) unstable; urgency=low
 
-  * (NOT RELEASED YET)
-  
+  * Tobias Grimm <tg@e-tobi.net>
+    - Using debian/compat now
+    - Using "unified" debian/rules now
   * Thomas Schmidt <tschmidt@debian.org>
     - Depend/Build-Depend on vdr (>=1.3.27-1)
     - Conflict with vdr (>=1.3.28)

Added: vdr/vdr-plugin-osdteletext/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/compat	2005-06-26 14:11:21 UTC (rev 730)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/compat	2005-06-26 21:13:36 UTC (rev 731)
@@ -0,0 +1 @@
+4

Modified: vdr/vdr-plugin-osdteletext/trunk/debian/dirs
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/dirs	2005-06-26 14:11:21 UTC (rev 730)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/dirs	2005-06-26 21:13:36 UTC (rev 731)
@@ -1 +1 @@
-var/cache/vdr
+var/cache/vdr/vtx

Modified: vdr/vdr-plugin-osdteletext/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/install	2005-06-26 14:11:21 UTC (rev 730)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/install	2005-06-26 21:13:36 UTC (rev 731)
@@ -1,2 +1,2 @@
-libvdr-osdteletext.so.*		usr/lib/vdr/plugins/
-debian/plugin.osdteletext.conf	etc/vdr/plugins/
+libvdr-osdteletext.so.*         usr/lib/vdr/plugins/
+debian/plugin.osdteletext.conf  etc/vdr/plugins/

Modified: vdr/vdr-plugin-osdteletext/trunk/debian/postinst
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/postinst	2005-06-26 14:11:21 UTC (rev 730)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/postinst	2005-06-26 21:13:36 UTC (rev 731)
@@ -44,5 +44,3 @@
 #DEBHELPER#
 
 exit 0
-
-

Modified: vdr/vdr-plugin-osdteletext/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-osdteletext/trunk/debian/rules	2005-06-26 14:11:21 UTC (rev 730)
+++ vdr/vdr-plugin-osdteletext/trunk/debian/rules	2005-06-26 21:13:36 UTC (rev 731)
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif
@@ -15,10 +12,11 @@
 	INSTALL_PROGRAM += -s
 endif
 
-VDR=vdr
-PACKAGE=$(VDR)-plugin-osdteletext
-VDRDIR=/usr/include/$(VDR)
-DVBDIR=/usr/include
+# Set VDR=vdr or VDR=vdrdevel - vdrdevel always uses dpatch
+VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
+ifeq ($(VDR), vdrdevel)
+    DPATCH=yes
+endif
 
 # To use dpatch uncomment the following line and set Build-Depends to dpatch
 DPATCH=yes
@@ -39,7 +37,7 @@
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) all DVBDIR=$(DVBDIR) VDRDIR=$(VDRDIR) LIBDIR=.
+	$(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=.
 	touch build-stamp
 
 clean: clean-patched unpatch
@@ -66,25 +64,29 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
+#	dh_installdebconf
 	dh_installdocs
 	dh_installexamples
+#	dh_installmenu
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installman
+#	dh_installinfo
+#	dh_undocumented
 	dh_installchangelogs HISTORY
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
+#	dh_makeshlibs
 	dh_installdeb
+#	dh_perl
 	dh_shlibdeps
-	
-	# VDR can be customized with quite a lot of different patches, which can make
-	# the plugins binary incompatible.
-	# Although Debian will not provide different binary packages for VDR, we
-	# will include a patchlevel info, which is created at compile time and can
-	# be checked before a plugin is loaded.
-   
-	[ -r $(VDRDIR)/patchlevel ] || echo 'patchlevel=' >> debian/$(PACKAGE).substvars
-	[ ! -r $(VDRDIR)/patchlevel ] || cat $(VDRDIR)/patchlevel >> debian/$(PACKAGE).substvars
-
+	/usr/lib/$(VDR)-dev/patchlevel.sh subst
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb