r1212 - vdr/vdr/trunk/debian

Thomas Günther tom-guest at costa.debian.org
Fri Sep 9 16:50:17 UTC 2005 

Author: tom-guest
Date: 2005-09-09 16:50:16 +0000 (Fri, 09 Sep 2005)
New Revision: 1212

Removed:
   vdr/vdr/trunk/debian/vdr-dev.dirs
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/copyright
   vdr/vdr/trunk/debian/plugin-loader.sh
   vdr/vdr/trunk/debian/rules
   vdr/vdr/trunk/debian/vdr.dirs
Log:
Fixed rules and plugin-loaders.sh, shrinked vdr.dirs, removed vdr-dev.dirs

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-09-08 18:37:16 UTC (rev 1211)
+++ vdr/vdr/trunk/debian/changelog	2005-09-09 16:50:16 UTC (rev 1212)
@@ -16,6 +16,10 @@
       sending a patch) (closes: #326866)
   * Thomas Günther <tom at toms-cafe.de>
     - Fixed vdr call with LD_ASSUME_KERNEL=2.4.1 in plugins-loader.sh
+    - Adapted debian/plugin-loader.sh to example plugins
+    - Fixed patchlevel substitution for architecture-independent packages
+    - Removed unnecessary debian/vdr-dev.dirs and unnecessary entries from
+      debian/vdr.dirs
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue,  6 Sep 2005 14:19:43 +0200
 

Modified: vdr/vdr/trunk/debian/copyright
===================================================================
--- vdr/vdr/trunk/debian/copyright	2005-09-08 18:37:16 UTC (rev 1211)
+++ vdr/vdr/trunk/debian/copyright	2005-09-09 16:50:16 UTC (rev 1212)
@@ -10,7 +10,7 @@
               http://www.nada.kth.se/~ragge/vdr/ttxtsubs/
 
   jumpplay  -  Torsten Kunkel <vdr at tkunkel.de> (initial version)
-               Thomas Günther <tom at toms-cafe.de> (actual version)
+               Thomas Günther <tom at toms-cafe.de> (current version)
 
 Theme Authors:
   Blue LCARS - (debian/themes/sttng-blue.theme) from Sascha Volkenandt

Modified: vdr/vdr/trunk/debian/plugin-loader.sh
===================================================================
--- vdr/vdr/trunk/debian/plugin-loader.sh	2005-09-08 18:37:16 UTC (rev 1211)
+++ vdr/vdr/trunk/debian/plugin-loader.sh	2005-09-09 16:50:16 UTC (rev 1212)
@@ -10,6 +10,7 @@
     local plugin
     local i
     local arguments
+    local plugins
     local packages
     local patchelvels
     local leftout
@@ -31,12 +32,20 @@
     echo -ne "\nSearching for plugins (VDR $version):"
 
     # find installed plugins
-    installed_plugins=( `find $PLUGIN_DIR -maxdepth 1 -name "$PLUGIN_PREFIX*.so.$version" -printf "%f " | sed "s/$PLUGIN_PREFIX\([^\.]\+\)\.so\.$version/\1/g"` )
+    plugins=(`find ${PLUGIN_DIR} -maxdepth 1 \
+                   -name "${PLUGIN_PREFIX}*.so.${version}" | \
+              xargs -r dpkg -S 2>&1 | \
+              sed "s/^dpkg:/'':/" | \
+              sed "s/:.*${PLUGIN_PREFIX}\([^\.]\+\)\.so\.${version}.*$/:\1/"`)
+    installed_plugins=(`echo ${plugins[@]} | sed 's/[^ ]*://g'`)
+    packages=(   vdr   `echo ${plugins[@]} | sed 's/:[^ ]*//g'`)
 
     if [ "$PLUGIN_CHECK_PATCHLEVEL" == "yes" ]; then
         # extract patchlevel info
-        packages=( "vdr" "${installed_plugins[@]/#/vdr-plugin-}" )
-        eval "patchlevels=( "`LANG=en;dpkg -s ${packages[@]} 2>&1 | awk -F ':' '/^Package: / {p=$2} /^Package.*is not installed/ {print "\"\""} (/[pP]atchlevel:/ || /^$/) && p!="" {print "\""$2"\"";p=""}'`" )"
+        eval "patchlevels=($(LANG=en;dpkg -s ${packages[@]} 2>&1 | awk -F ':' '\
+            /^Package: /                         {p=$2} \
+            /^Package.*is not installed/         {print "\"\""} \
+            (/[pP]atchlevel:/ || /^$/) && p!=""  {print "\""$2"\"";p=""}'))"
 
         # move plugins with incompatible patchlevel to $leftout
         for (( i=1 ; i<${#patchlevels[@]} ; i++ )); do

Modified: vdr/vdr/trunk/debian/rules
===================================================================
--- vdr/vdr/trunk/debian/rules	2005-09-08 18:37:16 UTC (rev 1211)
+++ vdr/vdr/trunk/debian/rules	2005-09-09 16:50:16 UTC (rev 1212)
@@ -30,7 +30,6 @@
 endif
 
 CFGDIR=/var/lib/$(VDR)
-DVBDIR=/usr/include
 PLUGINDIR=/usr/lib/$(VDR)/plugins
 VIDEODIR=/var/lib/video.00
 
@@ -43,10 +42,11 @@
 build-stamp: configure-stamp
 	dh_testdir
 
-	$(MAKE) VIDEODIR=$(VIDEODIR) VFAT=1 DVBDIR=$(DVBDIR) \
-		PLUGINLIBDIR=$(PLUGINDIR) CFGDIR=$(CFGDIR)
-	ln -f vdr vdr-kbd
-	make include-dir
+	$(MAKE) VFAT=1 DVBDIR=/usr \
+	        VIDEODIR=$(VIDEODIR) PLUGINLIBDIR=$(PLUGINDIR) CFGDIR=$(CFGDIR)
+	[ "$(VDR)" = "vdr" ] || \
+	    (cp vdr $(VDR); cp vdr.1 $(VDR).1; cp vdr.5 $(VDR).5)
+	ln -f $(VDR) $(VDR)-kbd
 
 	# plugins
 	mkdir PLUGINS/lib
@@ -67,10 +67,10 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) plugins-clean 
-	-$(MAKE) clean
+	-$(MAKE) -o .dependencies plugins-clean
+	-$(MAKE) -o .dependencies clean
 	[ "$(VDR)" = "vdr" ] || rm -f $(VDR) $(VDR).1 $(VDR).5
-	rm -f vdr-kbd
+	rm -f $(VDR)-kbd
 	rm -rf PLUGINS/lib
 	rm -f $(VDR)-newplugin
 	rm -f debian/$(VDR)-shutdown.wrapper
@@ -84,25 +84,37 @@
 	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 \
+	chmod +x $(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
 
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir -i
-	dh_testroot -i 
-	dh_installdebconf -i
-	dh_installdocs -i 
+	dh_testroot -i
+#	dh_installdebconf -i
+	dh_installdocs -i
 	dh_installexamples -i
-	dh_installman -i 
-	dh_installmenu -i
-	dh_installchangelogs -i
+#	dh_installmenu -i
+#	dh_installlogrotate -i
+#	dh_installemacsen -i
+#	dh_installpam -i
+#	dh_installmime -i
+#	dh_installinit -i
+#	dh_installcron -i
+#	dh_installman -i
+#	dh_installinfo -i
+#	dh_undocumented -i
+	dh_installchangelogs -i HISTORY
 	dh_link -i
 	dh_strip -i
-	dh_compress -i 
+	dh_compress -i
 	dh_fixperms -i
+#	dh_makeshlibs -i
 	dh_installdeb -i
+#	dh_perl -i
+	dh_shlibdeps -i
+	sh debian/patchlevel.sh subst
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i
@@ -111,19 +123,28 @@
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
-	dh_installdebconf -a -pvdr
-	dh_installdocs -a -Nvdr-plugin-examples
+	dh_installdebconf -a
+	dh_installdocs -a -N$(VDR)-dbg -N$(VDR)-plugin-examples
 	dh_installexamples -a
-	dh_installchangelogs -a -Nvdr-plugin-examples -Nvdr-plugin-sky -pvdr HISTORY
-	dh_installchangelogs -a -Nvdr-plugin-examples -Nvdr -pvdr-plugin-sky PLUGINS/src/sky/HISTORY
+	dh_installmenu -a
+#	dh_installlogrotate -a
+#	dh_installemacsen -a
+#	dh_installpam -a
+#	dh_installmime -a
+	dh_installinit -a
+#	dh_installcron -a
 	dh_installman -a
-	dh_installmenu -a
-	dh_installinit -a -pvdr
+#	dh_installinfo -a
+#	dh_undocumented -a
+	dh_installchangelogs -p$(VDR) HISTORY
+	dh_installchangelogs -p$(VDR)-plugin-sky PLUGINS/src/sky/HISTORY
 	dh_link -a
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
+#	dh_makeshlibs -a
 	dh_installdeb -a
+#	dh_perl -a
 	dh_shlibdeps -a
 	sh debian/patchlevel.sh subst
 	dh_gencontrol -a

Deleted: vdr/vdr/trunk/debian/vdr-dev.dirs
===================================================================
--- vdr/vdr/trunk/debian/vdr-dev.dirs	2005-09-08 18:37:16 UTC (rev 1211)
+++ vdr/vdr/trunk/debian/vdr-dev.dirs	2005-09-09 16:50:16 UTC (rev 1212)
@@ -1 +0,0 @@
-usr/include/vdr

Modified: vdr/vdr/trunk/debian/vdr.dirs
===================================================================
--- vdr/vdr/trunk/debian/vdr.dirs	2005-09-08 18:37:16 UTC (rev 1211)
+++ vdr/vdr/trunk/debian/vdr.dirs	2005-09-09 16:50:16 UTC (rev 1212)
@@ -1,12 +1,3 @@
-etc/vdr/plugins
-etc/vdr/command-hooks
-usr/bin
-usr/include/vdr
 usr/lib/vdr/plugins
-usr/sbin
-usr/share/lintian/overrides
-usr/share/vdr/command-hooks
-usr/share/vdr/recording-hooks
-usr/share/vdr/shutdown-hooks
 var/cache/vdr
 var/lib/vdr/plugins

More information about the pkg-vdr-dvb-changes mailing list