[SCM] vdr-plugin-dvdswitch packaging repository branch, master, updated. debian/0.2.0-2-9-g7cd793d

etobi git at e-tobi.net
Sat Mar 23 08:20:37 UTC 2013 

The following commit has been merged in the master branch:
commit 7cd793d3e0ae784f9f39868d608ee483db52fb64
Author: etobi <git at e-tobi.net>
Date:   Sat Mar 23 09:13:58 2013 +0100

    * New Upstream Snapshot (commit 958443c)
    * Dropped postinst which was chown-ing /usr/share/vdr-plugn-dvdswitch
    * 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 7dd3f53..680bd0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-vdr-plugin-dvdswitch (0.2.1-1) experimental; urgency=low
+vdr-plugin-dvdswitch (0.2.1+git20130323-1) experimental; urgency=low
 
-  * New upstream release
+  * New Upstream Snapshot (commit 958443c)
+  * Dropped postinst which was chown-ing /usr/share/vdr-plugn-dvdswitch
+  * Standards-Version: 3.9.4
+  * Build-depend in vdr-dev (>= 1.7.41)
+  * Use debhelper 9
 
- -- Tobias Grimm <etobi at debian.org>  Sat, 23 Mar 2013 09:06:32 +0100
+ -- Tobias Grimm <etobi at debian.org>  Sat, 23 Mar 2013 09:07:21 +0100
 
 vdr-plugin-dvdswitch (0.2.0-2) experimental; urgency=low
 
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 6224e6a..47c6336 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: vdr-plugin-dvdswitch
 Section: video
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
-Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.6.0-5)
-Standards-Version: 3.9.3
+Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <etobi at debian.org>, Thomas Schmidt <tschmidt at debian.org>
+Build-Depends: debhelper (>= 9), vdr-dev (>= 1.7.41), pkg-config, gettext
+Standards-Version: 3.9.4
 
 Package: vdr-plugin-dvdswitch
 Architecture: any
diff --git a/debian/dvdswitch_readdvd.sh b/debian/dvdswitch_readdvd
old mode 100644
new mode 100755
similarity index 100%
rename from debian/dvdswitch_readdvd.sh
rename to debian/dvdswitch_readdvd
diff --git a/debian/dvdswitch_writedvd.sh b/debian/dvdswitch_writedvd
old mode 100644
new mode 100755
similarity index 100%
rename from debian/dvdswitch_writedvd.sh
rename to debian/dvdswitch_writedvd
diff --git a/debian/install b/debian/install
index 896e912..6f70884 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,2 @@
-libvdr-dvdswitch.so.*           usr/lib/vdr/plugins/
-debian/*.sh                     usr/share/vdr-plugin-dvdswitch/
+debian/dvdswitch_*              usr/share/vdr-plugin-dvdswitch/
 debian/plugin.dvdswitch.conf    etc/vdr/plugins/
diff --git a/debian/patches/01_Makefile-fPIC-fix.patch b/debian/patches/01_Makefile-fPIC-fix.patch
deleted file mode 100644
index 4997a64..0000000
--- a/debian/patches/01_Makefile-fPIC-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## Makefile-fPIC-fix patch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds -fPIC to Makefile to fix potential FTBFS.
-
- at DPATCH@
-Index: vdr-plugin-dvdswitch/Makefile
-===================================================================
---- vdr-plugin-dvdswitch.orig/Makefile	2012-05-09 22:54:52.000000000 +0200
-+++ vdr-plugin-dvdswitch/Makefile	2012-05-09 23:00:41.000000000 +0200
-@@ -16,7 +16,7 @@
- ### The C++ compiler and options:
- 
- CXX      ?= g++
--CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual -Wno-parentheses
- 
- ### The directory environment:
- 
diff --git a/debian/patches/02_debian-paths.patch b/debian/patches/02_debian-paths.patch
index 1fa5ef0..7d1a287 100644
--- a/debian/patches/02_debian-paths.patch
+++ b/debian/patches/02_debian-paths.patch
@@ -25,8 +25,8 @@ Index: vdr-plugin-dvdswitch/setup.c
    DVDPluginExist = false;
 -  strncpy(DVDReadScript, "/usr/local/bin/dvdswitch_readdvd.sh",memberof(DVDReadScript));
 -  strncpy(DVDWriteScript, "/usr/local/bin/dvdswitch_writedvd.sh",memberof(DVDWriteScript));
-+  strncpy(DVDReadScript, "/usr/share/vdr-plugin-dvdswitch/dvdswitch_readdvd.sh",memberof(DVDReadScript));
-+  strncpy(DVDWriteScript, "/usr/share/vdr-plugin-dvdswitch/dvdswitch_writedvd.sh",memberof(DVDReadScript));
++  strncpy(DVDReadScript, "/usr/share/vdr-plugin-dvdswitch/dvdswitch_readdvd",memberof(DVDReadScript));
++  strncpy(DVDWriteScript, "/usr/share/vdr-plugin-dvdswitch/dvdswitch_writedvd",memberof(DVDReadScript));
  }
  
  cDVDSwitchSetup::~ cDVDSwitchSetup(void)
diff --git a/debian/patches/03_no-files-crash.patch b/debian/patches/03_no-files-crash.patch
index 1ec0c29..b4e22cc 100644
--- a/debian/patches/03_no-files-crash.patch
+++ b/debian/patches/03_no-files-crash.patch
@@ -7,11 +7,11 @@
 ## DP: and then pressing some arrow key crashes vdr.
 
 @DPATCH@
-Index: dvdswitch-0.1.3/menu.c
+Index: vdr-plugin-dvdswitch/menu.c
 ===================================================================
---- dvdswitch-0.1.3.orig/menu.c
-+++ dvdswitch-0.1.3/menu.c
-@@ -754,8 +754,10 @@ eOSState cMainMenu::MenuMove(eKeys Key)
+--- vdr-plugin-dvdswitch.orig/menu.c	2013-03-23 09:03:59.000000000 +0100
++++ vdr-plugin-dvdswitch/menu.c	2013-03-23 09:15:11.000000000 +0100
+@@ -740,8 +740,10 @@
    SetHelp();
  
    mItem = (cMainMenuItem*)Get(Current());
diff --git a/debian/patches/series b/debian/patches/series
index b22c225..b8d901f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-01_Makefile-fPIC-fix.patch
 02_debian-paths.patch
 03_no-files-crash.patch
diff --git a/debian/plugin.dvdswitch.conf b/debian/plugin.dvdswitch.conf
index 39f6da1..45e2daa 100644
--- a/debian/plugin.dvdswitch.conf
+++ b/debian/plugin.dvdswitch.conf
@@ -9,12 +9,12 @@
 # --debug=LOGFILE
 
 # Use this script reading DVD's into ISO image
-# (default is /usr/share/vdr-plugin-dvdswitch/dvdswitch_readdvd.sh)
+# (default is /usr/share/vdr-plugin-dvdswitch/dvdswitch_readdvd)
 #
 # --readscript=SCRIPT
 
 # Use this script for writing DVD images onto a DVD
-# (default is /usr/share/vdr-plugin-dvdswitch/dvdswitch_writedvd.sh)
+# (default is /usr/share/vdr-plugin-dvdswitch/dvdswitch_writedvd)
 #
 # --writescript=SCRIPT
 #
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 7f60e91..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# postinst script for vdr-plugin-dvdswitch
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
-case "$1" in
-    configure)
-        chown -R vdr:vdr /usr/share/vdr-plugin-dvdswitch
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index 79741aa..1c1b37b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,25 +3,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
-
 %:
 	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
 
-override_dh_install:
-	dh_install
-	chmod a+x debian/vdr-plugin-dvdswitch/usr/share/vdr-plugin-dvdswitch/*.sh
-
 get-vcs-snapshot:
 	sh debian/get-vcs-snapshot.sh

-- 
vdr-plugin-dvdswitch packaging repository

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