[SCM] vdr-plugin-vnsiserver packaging repository branch, master, updated. debian/0.0.1_svn20100428+frodo-1-5-g7e78fd9

Thu Mar 21 21:33:00 UTC 2013

The following commit has been merged in the master branch:
commit 7e78fd9a27dbcec43316679167008b1fb3ad15cc
Author: etobi <git at e-tobi.net>
Date:   Thu Mar 21 20:40:51 2013 +0100

    * New Upstream Snapshot (commit e609654)
    * New upstream location https://github.com/opdenkamp/xbmc-pvr-addons
    * Standards-Version: 3.9.4
    * Build-depend in vdr-dev (>= 1.7.41)
    * Use debhelper 9

diff --git a/debian/changelog b/debian/changelog
index 7b2f3fc..3f1922a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+vdr-plugin-vnsiserver (0.9.1+git20130321-1) unstable; urgency=low
+
+  * New Upstream Snapshot (commit e609654)
+  * New upstream location https://github.com/opdenkamp/xbmc-pvr-addons
+  * Standards-Version: 3.9.4
+  * Build-depend in vdr-dev (>= 1.7.41)
+  * Use debhelper 9
+
+ -- Tobias Grimm <etobi at debian.org>  Thu, 21 Mar 2013 20:35:09 +0100
+
 vdr-plugin-vnsiserver (0.0.1~svn20100428+frodo-1) unstable; urgency=low
 
   * Switching to the version provided in the XBMC 12/Frodo sources
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index a4b9d22..c304fc0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,19 @@
 Source: vdr-plugin-vnsiserver
 Section: video
 Priority: extra
-Maintainer: Tobias Grimm <etobi at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.6.0-15), gettext
-Standards-Version: 3.9.3
-Homepage: http://xbmc.org/
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
+Uploaders: Tobias Grimm <etobi at debian.org>
+Build-Depends: debhelper (>= 9), vdr-dev (>= 1.7.41), gettext, pkg-config
+Standards-Version: 3.9.4
+Homepage: https://github.com/opdenkamp/xbmc-pvr-addons
 Vcs-Git: git://git.debian.org/git/pkg-vdr-dvb/vdr-plugin-vnsiserver.git
 Vcs-Browser: http://git.debian.org/?p=pkg-vdr-dvb/vdr-plugin-vnsiserver.git
 
 Package: vdr-plugin-vnsiserver
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}
-Description: VDR network streaming interface plugin
- VNSI (VDR network streaming interface) is a plugin for the
- Linux Video Disc Recorder VDR, which allows one to stream live TV
- to the XBMC media client.
+Description: VDR plug-in to serve PVR data streams to XBMC
+ This plugin for the Linux Video Disc Recorder (VDR) implements the
+ VDR-Network-Streaming-Interface (VNSI) which enables XBMC with
+ the appropriate Personal Videodisc Recorder (PVR) addon to access
+ VDR as a PVR backend.
diff --git a/debian/copyright b/debian/copyright
index d987f93..fe246c9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
 Upstream Homepage:
-    http://xbmc.org/
+    https://github.com/opdenkamp/xbmc-pvr-addons
 
-Upstream Author(s):
+Upstream Author:
     Alwin Esch (Team XBMC)
 
-Debian Maintainer(s):
+Debian Maintainer:
     Tobias Grimm <etobi at debian.org>
 
 Copyright:
@@ -12,7 +12,7 @@ Copyright:
     Copyright (C) 2010 Alwin Esch (Team XBMC)
 
 Copyright (Debian packaging):
-    (C) 2010 Tobias Grimm
+    (C) 2010 - 2013 Tobias Grimm
 
 License:
     This program is free software; you can redistribute it and/or modify
diff --git a/debian/get-snapshot.sh b/debian/get-snapshot.sh
deleted file mode 100644
index b8fb2cc..0000000
--- a/debian/get-snapshot.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-DATE=`date --utc +%0Y%0m%0d.%0k%0M`
-VERSION_ID=`echo $DEB_UPSTREAM_VERSION | sed 's/~svn.*//'`~svn$DATE
-SVN="https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2/xbmc/pvrclients/vdr-vnsi/vdr-plugin-vnsiserver"
-
-svn export -q "$SVN" "$DEB_SOURCE_PACKAGE-$VERSION_ID"
-tar czf "../$DEB_SOURCE_PACKAGE"_"$VERSION_ID.orig.tar.gz" "$DEB_SOURCE_PACKAGE-$VERSION_ID"
-rm -rf "$DEB_SOURCE_PACKAGE-$VERSION_ID"
-dch -v "$VERSION_ID-1" "New Upstream Snapshot"
diff --git a/debian/get-vcs-snapshot.sh b/debian/get-vcs-snapshot.sh
new file mode 100644
index 0000000..d2fd5d8
--- /dev/null
+++ b/debian/get-vcs-snapshot.sh
@@ -0,0 +1,20 @@
+echo Downloading latest from git repository...
+set -e
+
+DEB_SOURCE_PACKAGE=`egrep '^Source: ' debian/control | cut -f 2 -d ' '`
+VERSION_UPSTREAM=`dpkg-parsechangelog | grep ^Version: | sed -e 's/^Version:\s*//' -e s/-[^-]*// | sed -e 's/\+git.*//'`
+VERSION_DATE=`/bin/date --utc +%0Y%0m%0d`
+VERSION_FULL="${VERSION_UPSTREAM}+git${VERSION_DATE}"
+
+git clone --depth 1 git://github.com/opdenkamp/xbmc-pvr-addons.git
+
+GIT_SHA=`git --work-tree xbmc-pvr-addons show --pretty=format:"%h" --quiet | head -1 || true`
+
+make -C "xbmc-pvr-addons/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver" dist
+
+mv xbmc-pvr-addons/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/*.tgz "../${DEB_SOURCE_PACKAGE}_${VERSION_FULL}.orig.tar.gz"
+
+rm -rf xbmc-pvr-addons
+
+#git-import-orig --pristine-tar "../${DEB_SOURCE_PACKAGE}_${VERSION_FULL}.orig.tar.gz"
+dch -v "$VERSION_FULL-1" "New Upstream Snapshot (commit $GIT_SHA)"
diff --git a/debian/install b/debian/install
index 5cce760..8ed4365 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1 @@
-libvdr-vnsiserver.so.*            usr/lib/vdr/plugins/
 vnsiserver/allowed_hosts.conf     etc/vdr/plugins/vnsi-server/
-
-#debian/tmp/usr/share/locale
diff --git a/debian/rules b/debian/rules
index 1b44cb7..1c1b37b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,24 +3,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale STRIP=/bin/true
-
 %:
 	dh $@
 
-override_dh_auto_build:
-	dh_auto_build -- all $(MAKE_OPTIONS)
-
-override_dh_auto_clean:
-	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
-	rm -rf locale libvdr-*.so.*
-
 override_dh_gencontrol:
 	sh /usr/share/vdr-dev/dependencies.sh
 	dh_gencontrol
 
-get-snapshot::
-	echo Downloading $(DEB_SOURCE_PACKAGE) $(VERSION_ID) from svn...
-	@DEB_UPSTREAM_VERSION=$(DEB_UPSTREAM_VERSION) \
-	  DEB_SOURCE_PACKAGE=$(DEB_SOURCE_PACKAGE) \
-	  sh debian/get-snapshot.sh
+get-vcs-snapshot:
+	sh debian/get-vcs-snapshot.sh

-- 
vdr-plugin-vnsiserver packaging repository

