r9158 - in /vdr/vdr-plugin-extrecmenu/trunk/debian: ./ patches/ source/

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Wed Sep 21 18:13:44 UTC 2011 

Author: tiber-guest
Date: Wed Sep 21 18:13:44 2011
New Revision: 9158

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=9158
Log:
* New Upstream Snapshot (commit 02265ea)
* New upstream location, updated copyright and debian/watch
* Standards-Version: 3.9.2
* Dropped 90_extrecmenu-1.2-test1-am2b.dpatch
* Dropped 91_vdr-1.7.12-extrec.dpatch
* Source format 3.0 (quilt)
* Switched to debhelper 7 and dropped cdbs

Added:
    vdr/vdr-plugin-extrecmenu/trunk/debian/get-vcs-snapshot.sh
    vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.patch
      - copied, changed from r9157, vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch
    vdr/vdr-plugin-extrecmenu/trunk/debian/patches/series
      - copied, changed from r9157, vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list
    vdr/vdr-plugin-extrecmenu/trunk/debian/source/
    vdr/vdr-plugin-extrecmenu/trunk/debian/source/format
Removed:
    vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list
    vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch
    vdr/vdr-plugin-extrecmenu/trunk/debian/patches/90_extrecmenu-1.2-test1-am2b.dpatch
    vdr/vdr-plugin-extrecmenu/trunk/debian/patches/91_vdr-1.7.12-extrec.dpatch
Modified:
    vdr/vdr-plugin-extrecmenu/trunk/debian/changelog
    vdr/vdr-plugin-extrecmenu/trunk/debian/compat
    vdr/vdr-plugin-extrecmenu/trunk/debian/control
    vdr/vdr-plugin-extrecmenu/trunk/debian/copyright
    vdr/vdr-plugin-extrecmenu/trunk/debian/install
    vdr/vdr-plugin-extrecmenu/trunk/debian/rules
    vdr/vdr-plugin-extrecmenu/trunk/debian/watch

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-extrecmenu/trunk/debian/changelog?rev=9158&op=diff
==============================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/changelog Wed Sep 21 18:13:44 2011
@@ -1,3 +1,15 @@
+vdr-plugin-extrecmenu (1.2.1+git20110921-1) experimental; urgency=low
+
+  * New Upstream Snapshot (commit 02265ea)
+  * New upstream location, updated copyright and debian/watch
+  * Standards-Version: 3.9.2
+  * Dropped 90_extrecmenu-1.2-test1-am2b.dpatch
+  * Dropped 91_vdr-1.7.12-extrec.dpatch
+  * Source format 3.0 (quilt)
+  * Switched to debhelper 7 and dropped cdbs
+
+ -- Tobias Grimm <etobi at debian.org>  Wed, 21 Sep 2011 20:13:24 +0200
+
 vdr-plugin-extrecmenu (1.2~test1-3) experimental; urgency=low
 
   * Added 91_vdr-1.7.12-extrec.dpatch

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-extrecmenu/trunk/debian/compat?rev=9158&op=diff
==============================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/compat (original)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/compat Wed Sep 21 18:13:44 2011
@@ -1,1 +1,1 @@
-5
+7

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-extrecmenu/trunk/debian/control?rev=9158&op=diff
==============================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/control (original)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/control Wed Sep 21 18:13:44 2011
@@ -4,7 +4,7 @@
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <etobi at debian.org>, Thomas Schmidt <tschmidt at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), gettext
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-extrecmenu/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-extrecmenu/trunk/
 

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-extrecmenu/trunk/debian/copyright?rev=9158&op=diff
==============================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/copyright Wed Sep 21 18:13:44 2011
@@ -1,7 +1,8 @@
 Upstream Homepage:
-    http://martins-kabuff.de/extrecmenu_en.html
+    http://projects.vdr-developer.org/projects/plg-extrecmenu
 
 Upstream Author:
+    Andreas Mair <andreas at vdr-developer.org>
     Martin Prochnow <nordlicht at martins-kabuff.de>
 
 Debian Maintainers:
@@ -11,11 +12,12 @@
     Stefan Wagner <stefanwag at gmx.at>
 
 Copyright:
+    (C) 2010 - 2011 Andreas Maier
     (C) 2006 - 2008 Martin Prochnow
     (C) 2006        Mike Constabel (dvdarchive.sh)
 
 Copyright (Debian packaging):
-    (C) 2006 - 2010 Tobias Grimm, Thomas Günther, Thomas Schmidt
+    (C) 2006 - 2011 Tobias Grimm, Thomas Günther, Thomas Schmidt
     (C) 2006        Stefan Wagner
 
 License:

Added: vdr/vdr-plugin-extrecmenu/trunk/debian/get-vcs-snapshot.sh
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-extrecmenu/trunk/debian/get-vcs-snapshot.sh?rev=9158&op=file
==============================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/get-vcs-snapshot.sh (added)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/get-vcs-snapshot.sh Wed Sep 21 18:13:44 2011
@@ -1,0 +1,18 @@
+echo Downloading latest from git repository...
+set -e
+
+DEB_SOURCE_PACKAGE=`egrep '^Source: ' debian/control | cut -f 2 -d ' '`
+VERSION_DATE=`/bin/date --utc +%0Y%0m%0d`
+VERSION_FULL="1.2.1+git${VERSION_DATE}"
+
+git clone --depth 1 git://projects.vdr-developer.org/${DEB_SOURCE_PACKAGE}.git
+
+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" ${DEB_SOURCE_PACKAGE}
+
+dch -v "$VERSION_FULL-1" "New Upstream Snapshot (commit $GIT_SHA)"
+
+rm -rf ${DEB_SOURCE_PACKAGE}

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-extrecmenu/trunk/debian/install?rev=9158&op=diff
==============================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/install (original)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/install Wed Sep 21 18:13:44 2011
@@ -1,3 +1,3 @@
 libvdr-extrecmenu.so.*    usr/lib/vdr/plugins/
 scripts/dvdarchive.sh     usr/share/vdr-plugin-extrecmenu/
-debian/tmp/usr/share/locale
+locale                    usr/share/

Copied: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.patch (from r9157, vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.patch?rev=9158&op=diff
==============================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.dpatch (original)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/01_dvdarchive-path.patch Wed Sep 21 18:13:44 2011
@@ -9,24 +9,25 @@
 ## DP: Set path to dvdarchive.sh script.
 
 @DPATCH@
-diff -urNad vdr-plugin-extrecmenu-1.1~/mymenurecordings.c vdr-plugin-extrecmenu-1.1/mymenurecordings.c
---- vdr-plugin-extrecmenu-1.1~/mymenurecordings.c	2007-10-24 19:29:46.000000000 +0200
-+++ vdr-plugin-extrecmenu-1.1/mymenurecordings.c	2007-10-25 18:42:41.000000000 +0200
-@@ -380,7 +380,7 @@
+Index: vdr-plugin-extrecmenu-1.2.1/mymenurecordings.c
+===================================================================
+--- vdr-plugin-extrecmenu-1.2.1.orig/mymenurecordings.c	2011-04-13 19:58:13.000000000 +0200
++++ vdr-plugin-extrecmenu-1.2.1/mymenurecordings.c	2011-09-21 20:04:04.000000000 +0200
+@@ -516,7 +516,7 @@
    if(wasdvd&&!cControl::Control())
    {
      char *cmd=NULL;
--    asprintf(&cmd,"dvdarchive.sh umount \"%s\"",*strescape(myReplayControl::LastReplayed(),"'\\\"$"));
-+    asprintf(&cmd,"/usr/share/vdr-plugin-extrecmenu/dvdarchive.sh umount \"%s\"",*strescape(myReplayControl::LastReplayed(),"'\\\"$"));
-     isyslog("[extrecmenu] calling %s to unmount dvd",cmd);
-     int result=SystemExec(cmd);
-     if(result)
-@@ -746,7 +746,7 @@
-             {
-               strcpy(path,recording->FileName());
-               name=strrchr(path,'/')+1;
--              asprintf(&msg,"dvdarchive.sh mount \"%s\" '%s'",*strescape(path,"'"),*strescape(name,"'\\\"$"));
-+              asprintf(&msg,"/usr/share/vdr-plugin-extrecmenu/dvdarchive.sh mount \"%s\" '%s'",*strescape(path,"'"),*strescape(name,"'\\\"$"));
-  
-               isyslog("[extrecmenu] calling %s to mount dvd",msg);
-               int result=SystemExec(msg);
+-    if(-1!=asprintf(&cmd,"dvdarchive.sh umount \"%s\"",*strescape(myReplayControl::LastReplayed(),"'\\\"$")))
++    if(-1!=asprintf(&cmd,"/usr/share/vdr-plugin-extrecmenu/dvdarchive.sh umount \"%s\"",*strescape(myReplayControl::LastReplayed(),"'\\\"$")))
+     {
+       isyslog("[extrecmenu] calling %s to unmount dvd",cmd);
+       int result=SystemExec(cmd);
+@@ -971,7 +971,7 @@
+                 {
+                   strcpy(path,recording->FileName());
+                   name=strrchr(path,'/')+1;
+-                  if(-1!=asprintf(&msg,"dvdarchive.sh mount \"%s\" '%s'",*strescape(path,"'"),*strescape(name,"'\\\"$")))
++                  if(-1!=asprintf(&msg,"/usr/share/vdr-plugin-extrecmenu/dvdarchive.sh mount \"%s\" '%s'",*strescape(path,"'"),*strescape(name,"'\\\"$")))
+                   {
+                     isyslog("[extrecmenu] calling %s to mount dvd",msg);
+                     int result=SystemExec(msg);

Copied: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/series (from r9157, vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-extrecmenu/trunk/debian/patches/series?rev=9158&op=diff
==============================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/series Wed Sep 21 18:13:44 2011
@@ -1,3 +1,1 @@
-01_dvdarchive-path
-90_extrecmenu-1.2-test1-am2b
-91_vdr-1.7.12-extrec
+01_dvdarchive-path.patch

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-extrecmenu/trunk/debian/rules?rev=9158&op=diff
==============================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/rules (original)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/rules Wed Sep 21 18:13:44 2011
@@ -1,19 +1,23 @@
 #!/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::
+override_dh_auto_clean:
 	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
-	rm -f libvdr-*.so.*
+	rm -rf locale libvdr-*.so.*
 
-common-binary-predeb-arch::
+override_dh_gencontrol:
 	sh /usr/share/vdr-dev/dependencies.sh
+	dh_gencontrol
+
+get-vcs-snapshot:
+	sh debian/get-vcs-snapshot.sh

Added: vdr/vdr-plugin-extrecmenu/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-extrecmenu/trunk/debian/source/format?rev=9158&op=file
==============================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/source/format (added)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/source/format Wed Sep 21 18:13:44 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)

Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-extrecmenu/trunk/debian/watch?rev=9158&op=diff
==============================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/watch (original)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/watch Wed Sep 21 18:13:44 2011
@@ -1,2 +1,2 @@
 version=2
-http://martins-kabuff.de/extrecmenu.html  .*/vdr-extrecmenu-(.*)\.tgz
+http://projects.vdr-developer.org/projects/plg-extrecmenu/files .*/vdr-extrecmenu-(.*)\.tgz

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