r1140 - vdr/vdr/trunk/debian

Thu Sep 1 20:54:31 UTC 2005

Author: tschmidt
Date: 2005-09-01 20:54:30 +0000 (Thu, 01 Sep 2005)
New Revision: 1140

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/rules
   vdr/vdr/trunk/debian/vdr-dev.install
   vdr/vdr/trunk/debian/vdr.init
Log:
vdr: Synced debian/rules with the version from Tobias as far as 
     possible and changed a few things as suggested by Thomas G?\195?\188nther


Modified: vdr/vdr/trunk/debian/changelog
===================================================================

--- vdr/vdr/trunk/debian/changelog	2005-09-01 20:32:30 UTC (rev 1139)
+++ vdr/vdr/trunk/debian/changelog	2005-09-01 20:54:30 UTC (rev 1140)
@@ -7,7 +7,7 @@
     - Use --background when calling start-stop-daemon in the init-script
     - Added 16_avoidTrashing.dpatch, which prevent vdr from trashing the 
       file system buffers when reading/writing recordings
-    - Added 18_vdr-1.3.31-remuxbraces - Fixes some gcc warning messages 
+    - Added 18_vdr-1.3.31-remuxbraces - Fixes some gcc4 warning messages 
     - Added 19_vdr-1.3.31-remux - Fixes a bug in cVideo/AudioRepacker::Repack()
     - Added 20_vdr-1.3.31-sequence-end-code5 - Fixes a problem with appending 
       a sequence end code when moving cutting marks in radio recordings
@@ -15,6 +15,9 @@
       when moving cutting marks in radio recordings
     - Added dependencies.sh to vdr-dev to automatically fill in the right
       Depends and Conflicts to vdr when building a plugin
+    - Cleaned up debian/rules and synced as far as possible with the version
+      from Tobias inofficial vdr package and changed a few things as suggested
+      by Thomas Günther
   * Tobias Grimm <tg at e-tobi.net>
     - Made debian/patchlevel.sh acccept opt-entries in 00list with leading
       spaces and removed leading space from vdr-patchlevel output

Modified: vdr/vdr/trunk/debian/rules
===================================================================
--- vdr/vdr/trunk/debian/rules	2005-09-01 20:32:30 UTC (rev 1139)
+++ vdr/vdr/trunk/debian/rules	2005-09-01 20:54:30 UTC (rev 1140)
@@ -5,14 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFGDIR    := /var/lib/vdr
-DVBDIR    := /usr/include
-PLUGINDIR := /usr/lib/vdr/plugins
-VIDEODIR  := /var/lib/video.00
-
-# include dpatch stuff
-include /usr/share/dpatch/dpatch.make
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif
@@ -20,60 +12,70 @@
 	INSTALL_PROGRAM += -s
 endif
 
+# 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
+
+ifdef DPATCH
+include /usr/share/dpatch/dpatch.make
+else
+patch:
+patch-stamp:
+unpatch:
+endif
+
+CFGDIR=/var/lib/$(VDR)
+DVBDIR=/usr/include
+PLUGINDIR=/usr/lib/$(VDR)/plugins
+VIDEODIR=/var/lib/video.00
+
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
 	dh_testdir
-	
 	touch configure-stamp
 
-build: patch-stamp configure-stamp build-stamp
-
-build-stamp: 
+build: build-stamp
+build-stamp: configure-stamp
 	dh_testdir
 
-	# Add here commands to compile the package.
-	
-	$(MAKE) VIDEODIR=$(VIDEODIR) VFAT=1 DVBDIR=$(DVBDIR) PLUGINLIBDIR=$(PLUGINDIR) CFGDIR=$(CFGDIR)
+	$(MAKE) VIDEODIR=$(VIDEODIR) VFAT=1 DVBDIR=$(DVBDIR) \
+		PLUGINLIBDIR=$(PLUGINDIR) CFGDIR=$(CFGDIR)
 	ln -f vdr vdr-kbd
-
 	make include-dir
 
 	# plugins
 	mkdir PLUGINS/lib
 	$(MAKE) plugins
 
-	cp newplugin vdr-newplugin
+	cp newplugin $(VDR)-newplugin
 
-	gcc -o debian/vdr-shutdown.wrapper debian/vdr-shutdown-wrapper.c
+	gcc -o debian/$(VDR)-shutdown.wrapper debian/$(VDR)-shutdown-wrapper.c
 
 	touch build-stamp
 
 patchlevel:
-	chmod 0755 debian/patchlevel.sh
-	debian/patchlevel.sh make
-	chmod 0755 debian/extract-patchinfo
-	debian/extract-patchinfo >debian/patchinfo
+	sh debian/patchlevel.sh make
+	sh debian/extract-patchinfo >debian/patchinfo
 
 clean: clean-patched unpatch
-
 clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
 	-$(MAKE) plugins-clean 
 	-$(MAKE) clean
-
+	[ "$(VDR)" = "vdr" ] || rm -f $(VDR) $(VDR).1 $(VDR).5
 	rm -f vdr-kbd
 	rm -rf PLUGINS/lib
-	rm -f vdr-newplugin
+	rm -f $(VDR)-newplugin
+	rm -f debian/$(VDR)-shutdown.wrapper
 	sh debian/patchlevel.sh clean
-
-	rm -f debian/vdr-shutdown.wrapper
-
 	rm -f debian/patchinfo
-
 	dh_clean
 
 install: build patchlevel
@@ -81,15 +83,11 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+	dh_install
+	chmod 0755 $(CURDIR)/debian/$(VDR)/usr/lib/$(VDR)/$(VDR)-* \
+          $(CURDIR)/debian/$(VDR)-dev/usr/lib/$(VDR)-dev/patchlevel.sh \
+	  $(CURDIR)/debian/$(VDR)-dev/usr/lib/$(VDR)-dev/dependencies.sh
 
-	# patchlevel file:
-	install -D -m644 patchlevel debian/vdr-dev/usr/include/vdr/patchlevel || true
-
-	# make dependencies.sh executable
-	chmod 0755 debian/dependencies.sh	
-
-	# All other files will be installed using dh_install.
-
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir -i
@@ -100,7 +98,6 @@
 	dh_installman -i 
 	dh_installmenu -i
 	dh_installchangelogs -i
-	dh_install -i
 	dh_link -i
 	dh_strip -i
 	dh_compress -i 
@@ -122,18 +119,17 @@
 	dh_installman -a
 	dh_installmenu -a
 	dh_installinit -a -pvdr
-	dh_install -a
-	chmod ugo+x $(CURDIR)/debian/vdr/usr/lib/vdr/vdr-*
 	dh_link -a
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a
-	debian/patchlevel.sh subst
+	sh debian/patchlevel.sh subst
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch  unpatch configure clean-patched
+.PHONY: build clean binary-indep binary-arch binary install configure \
+        clean-patched patch unpatch

Modified: vdr/vdr/trunk/debian/vdr-dev.install
===================================================================
--- vdr/vdr/trunk/debian/vdr-dev.install	2005-09-01 20:32:30 UTC (rev 1139)
+++ vdr/vdr/trunk/debian/vdr-dev.install	2005-09-01 20:54:30 UTC (rev 1140)
@@ -10,4 +10,7 @@
 debian/lintian/vdr-dev          usr/share/lintian/overrides/
 
 debian/patchlevel.sh            usr/lib/vdr-dev/
+
+patchlevel                      usr/include/vdr/
+
 debian/dependencies.sh          usr/lib/vdr-dev/

Modified: vdr/vdr/trunk/debian/vdr.init
===================================================================
--- vdr/vdr/trunk/debian/vdr.init	2005-09-01 20:32:30 UTC (rev 1139)
+++ vdr/vdr/trunk/debian/vdr.init	2005-09-01 20:54:30 UTC (rev 1140)
@@ -31,7 +31,7 @@
         start-stop-daemon --start --quiet --background \
                 --exec /usr/sbin/runvdr -- -v $VIDEO_DIR -c $CFG_DIR -r $REC_CMD \
                 -s $VDRSHUTDOWN -E $EPG_FILE -u $USER -g $GROUP --port $SVDRP_PORT \
-                $OPTIONS $PLUGINS &
+                $OPTIONS $PLUGINS
     else
            echo -n " - seems to be running already"
     fi


