r8646 - in /vdr/vdr-plugin-markad/trunk/debian: changelog control copyright get-orig-source.sh rules source/ source/format vdr-markad.install vdr-markad.postinst vdr-plugin-markad.install

tom-guest at users.alioth.debian.org tom-guest at users.alioth.debian.org
Wed May 26 22:18:39 UTC 2010 

Author: tom-guest
Date: Wed May 26 22:18:38 2010
New Revision: 8646

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8646
Log:
* New upstream release
* Added dependency to vdr-markad for vdr-plugin-markad (the plugin uses the
  command line program now to mark advertisements)
* Added installation of logos
* Build-depend on vdr-dev >= 1.6.0-16
* Standards-Version: 3.8.4
* source/format 3.0
* Converted debian/rules to the new debhelper 7 format
* Removed cdbs from Build-Depends
* Updated debian/copyright

Added:
    vdr/vdr-plugin-markad/trunk/debian/source/
    vdr/vdr-plugin-markad/trunk/debian/source/format
    vdr/vdr-plugin-markad/trunk/debian/vdr-markad.postinst
Modified:
    vdr/vdr-plugin-markad/trunk/debian/changelog
    vdr/vdr-plugin-markad/trunk/debian/control
    vdr/vdr-plugin-markad/trunk/debian/copyright
    vdr/vdr-plugin-markad/trunk/debian/get-orig-source.sh
    vdr/vdr-plugin-markad/trunk/debian/rules
    vdr/vdr-plugin-markad/trunk/debian/vdr-markad.install
    vdr/vdr-plugin-markad/trunk/debian/vdr-plugin-markad.install

Modified: vdr/vdr-plugin-markad/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-markad/trunk/debian/changelog?rev=8646&op=diff
==============================================================================
--- vdr/vdr-plugin-markad/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-markad/trunk/debian/changelog Wed May 26 22:18:38 2010
@@ -1,3 +1,18 @@
+vdr-plugin-markad (0.0.7-1) experimental; urgency=low
+
+  * New upstream release
+  * Added dependency to vdr-markad for vdr-plugin-markad (the plugin uses the
+    command line program now to mark advertisements)
+  * Added installation of logos
+  * Build-depend on vdr-dev >= 1.6.0-16
+  * Standards-Version: 3.8.4
+  * source/format 3.0
+  * Converted debian/rules to the new debhelper 7 format
+  * Removed cdbs from Build-Depends
+  * Updated debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de>  Tue, 25 May 2010 21:49:57 +0200
+
 vdr-plugin-markad (0.0.4.git20100303-1) experimental; urgency=low
 
   * New Upstream Snapshot (commit 0b56be8)

Modified: vdr/vdr-plugin-markad/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-markad/trunk/debian/control?rev=8646&op=diff
==============================================================================
--- vdr/vdr-plugin-markad/trunk/debian/control (original)
+++ vdr/vdr-plugin-markad/trunk/debian/control Wed May 26 22:18:38 2010
@@ -3,14 +3,14 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: cdbs, vdr-dev (>= 1.6.0-5), gettext, debhelper (>=7),
+Build-Depends: vdr-dev (>= 1.6.0-16), gettext, debhelper (>=7),
  pkg-config, libavcodec-dev, libavformat-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://projects.vdr-developer.org/projects/list_files/plg-markad
 
 Package: vdr-plugin-markad
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}, vdr-markad
 Description: Plugin for VDR to mark advertisements in recordings
  This plugin for the Linux Video Disc Recorder VDR will search for
  and mark advertisements in VDR recordings.

Modified: vdr/vdr-plugin-markad/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-markad/trunk/debian/copyright?rev=8646&op=diff
==============================================================================
--- vdr/vdr-plugin-markad/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-markad/trunk/debian/copyright Wed May 26 22:18:38 2010
@@ -10,7 +10,7 @@
     Thomas Günther <tom at toms-cafe.de>
 
 Copyright:
-    (C) 2009 Jochen Dolze
+    (C) 2009 - 2010 Jochen Dolze
 
 Copyright (Debian packaging):
     (C) 2009 - 2010 Tobias Grimm, Thomas Günther

Modified: vdr/vdr-plugin-markad/trunk/debian/get-orig-source.sh
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-markad/trunk/debian/get-orig-source.sh?rev=8646&op=diff
==============================================================================
--- vdr/vdr-plugin-markad/trunk/debian/get-orig-source.sh (original)
+++ vdr/vdr-plugin-markad/trunk/debian/get-orig-source.sh Wed May 26 22:18:38 2010
@@ -1,18 +1,18 @@
 echo Downloading latest from git repository...
+set -e
 
-DEB_SOURCE_PACKAGE=$1
+DEB_SOURCE_PACKAGE=`egrep '^Source: ' debian/control | cut -f 2 -d ' '`
 VERSION_DATE=`/bin/date --utc +%0Y%0m%0d`
+VERSION_FULL="0.0.7+git${VERSION_DATE}"
 
-git clone git://projects.vdr-developer.org/vdr-plugin-markad.git
+git clone git://projects.vdr-developer.org/${DEB_SOURCE_PACKAGE}.git
 
-VERSION_FULL="0.0.4.git$VERSION_DATE"
-
-cd vdr-plugin-markad
-GIT_SHA=`git show --pretty=format:"%h" --quiet`
+cd ${DEB_SOURCE_PACKAGE}
+GIT_SHA=`git show --pretty=format:"%h" --quiet || true`
 cd ..
 
-tar --exclude=.git -czf "../${DEB_SOURCE_PACKAGE}_${VERSION_FULL}.orig.tar.gz" vdr-plugin-markad
+tar --exclude=.git -czf "../${DEB_SOURCE_PACKAGE}_${VERSION_FULL}.orig.tar.gz" ${DEB_SOURCE_PACKAGE}
 
 dch -v "$VERSION_FULL-1" "New Upstream Snapshot (commit $GIT_SHA)"
 
-rm -rf vdr-plugin-markad
+rm -rf ${DEB_SOURCE_PACKAGE}

Modified: vdr/vdr-plugin-markad/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-markad/trunk/debian/rules?rev=8646&op=diff
==============================================================================
--- vdr/vdr-plugin-markad/trunk/debian/rules (original)
+++ vdr/vdr-plugin-markad/trunk/debian/rules Wed May 26 22:18:38 2010
@@ -1,22 +1,26 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-# include /usr/share/cdbs/1/rules/dpatch.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-DEB_INSTALL_CHANGELOGS_ALL = HISTORY
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
 
-MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. \
-               LOCALEDIR=debian/tmp/usr/share/locale
+%:
+	dh $@
 
-common-build-arch::
-	$(MAKE) all $(MAKE_OPTIONS)
+override_dh_auto_build:
+	dh_auto_build -- all $(MAKE_OPTIONS)
 
-cleanbuilddir::
-	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
-	rm -f libvdr-*.so.*
+override_dh_auto_clean:
+	dh_auto_clean -- -o .dependencies $(MAKE_OPTIONS)
+	rm -rf libvdr-*.so.* */locale
 
-common-binary-predeb-arch::
+override_dh_installchangelogs:
+	dh_installchangelogs HISTORY
+
+override_dh_gencontrol:
 	sh /usr/share/vdr-dev/dependencies.sh
+	dh_gencontrol
 
-get-orig-source::
-	/bin/sh debian/get-orig-source.sh $(DEB_SOURCE_PACKAGE)
+get-orig-source:
+	sh debian/get-orig-source.sh

Added: vdr/vdr-plugin-markad/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-markad/trunk/debian/source/format?rev=8646&op=file
==============================================================================
--- vdr/vdr-plugin-markad/trunk/debian/source/format (added)
+++ vdr/vdr-plugin-markad/trunk/debian/source/format Wed May 26 22:18:38 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

Modified: vdr/vdr-plugin-markad/trunk/debian/vdr-markad.install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-markad/trunk/debian/vdr-markad.install?rev=8646&op=diff
==============================================================================
--- vdr/vdr-plugin-markad/trunk/debian/vdr-markad.install (original)
+++ vdr/vdr-plugin-markad/trunk/debian/vdr-markad.install Wed May 26 22:18:38 2010
@@ -1,1 +1,2 @@
-markad    usr/bin/
+command/markad                  usr/bin/
+command/logos/*                 var/lib/markad/

Added: vdr/vdr-plugin-markad/trunk/debian/vdr-markad.postinst
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-markad/trunk/debian/vdr-markad.postinst?rev=8646&op=file
==============================================================================
--- vdr/vdr-plugin-markad/trunk/debian/vdr-markad.postinst (added)
+++ vdr/vdr-plugin-markad/trunk/debian/vdr-markad.postinst Wed May 26 22:18:38 2010
@@ -1,0 +1,11 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ]; then
+
+    # Change owner of directory for logo files
+    chown -R vdr:vdr /var/lib/markad
+
+fi
+
+#DEBHELPER#

Modified: vdr/vdr-plugin-markad/trunk/debian/vdr-plugin-markad.install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-markad/trunk/debian/vdr-plugin-markad.install?rev=8646&op=diff
==============================================================================
--- vdr/vdr-plugin-markad/trunk/debian/vdr-plugin-markad.install (original)
+++ vdr/vdr-plugin-markad/trunk/debian/vdr-plugin-markad.install Wed May 26 22:18:38 2010
@@ -1,2 +1,2 @@
-libvdr-markad.so.*             usr/lib/vdr/plugins/
-debian/tmp/usr/share/locale
+plugin/libvdr-markad.so.*       usr/lib/vdr/plugins/
+plugin/locale                   usr/share/

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