[SCM] vdr-plugin-dvdswitch packaging repository branch, master, updated. upstream/0.1.3-6-ga56f2ad
etobi
git at e-tobi.net
Wed May 9 21:09:45 UTC 2012
The following commit has been merged in the master branch:
commit a56f2ada0d95c1f722c96f678f2c453728eb44d7
Author: etobi <git at e-tobi.net>
Date: Wed May 9 22:59:14 2012 +0200
Switched to debhelper 7 and dropped cdbs
diff --git a/debian/changelog b/debian/changelog
index 46a96c4..1ea09a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ vdr-plugin-dvdswitch (0.2.0-1) experimental; urgency=low
* Added debian/watch
* Updatd upstream location
* New upstream release
+ * Switched to debhelper 7 and dropped cdbs
-- Tobias Grimm <etobi at debian.org> Wed, 09 May 2012 22:50:50 +0200
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 214de86..6224e6a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ 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 (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.6.0-5)
+Standards-Version: 3.9.3
Package: vdr-plugin-dvdswitch
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7110778..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-01_Makefile-fPIC-fix
-02_debian-paths
-03_no-files-crash
-
-90_dvdswitch-0.1.3-1.5.4
diff --git a/debian/patches/01_Makefile-fPIC-fix.dpatch b/debian/patches/01_Makefile-fPIC-fix.dpatch
deleted file mode 100644
index b23293d..0000000
--- a/debian/patches/01_Makefile-fPIC-fix.dpatch
+++ /dev/null
@@ -1,20 +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@
-diff -Nur dvdswitch-0.1.1.orig/Makefile dvdswitch-0.1.1/Makefile
---- dvdswitch-0.1.1.orig/Makefile 2006-03-03 23:27:02.000000000 +0100
-+++ dvdswitch-0.1.1/Makefile 2006-03-24 20:32:55.000000000 +0100
-@@ -16,7 +16,7 @@
- ### The C++ compiler and options:
-
- CXX ?= g++
--CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
-
- ### The directory environment:
-
diff --git a/debian/patches/01_Makefile-fPIC-fix.patch b/debian/patches/01_Makefile-fPIC-fix.patch
new file mode 100644
index 0000000..4997a64
--- /dev/null
+++ b/debian/patches/01_Makefile-fPIC-fix.patch
@@ -0,0 +1,21 @@
+#!/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.dpatch b/debian/patches/02_debian-paths.dpatch
deleted file mode 100644
index d9e5a3e..0000000
--- a/debian/patches/02_debian-paths.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## debian-paths patch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change paths do debian conform paths.
-
- at DPATCH@
-diff -Nur dvdswitch-0.1.1.orig/setup.c dvdswitch-0.1.1/setup.c
---- dvdswitch-0.1.1.orig/setup.c 2006-03-03 23:27:02.000000000 +0100
-+++ dvdswitch-0.1.1/setup.c 2006-03-24 20:42:42.000000000 +0100
-@@ -13,7 +13,7 @@
- HideMenuEntry = 0;
- strcpy(MenuName, "DVDSwitch");
- CustomMenuName = false;
-- strcpy(ImageDir, "/video/dvd");
-+ strcpy(ImageDir, "/var/lib/video/film/dvd");
- ImageDirPerParam = false;
- ViewFreeDiskSpace = 1;
-
-@@ -52,8 +52,8 @@
- kOk = 4;
-
- DVDPluginExist = false;
-- strcpy(DVDReadScript, "/usr/local/bin/dvdswitch_readdvd.sh");
-- strcpy(DVDWriteScript, "/usr/local/bin/dvdswitch_writedvd.sh");
-+ strcpy(DVDReadScript, "/usr/share/vdr-plugin-dvdswitch/dvdswitch_readdvd.sh");
-+ strcpy(DVDWriteScript, "/usr/share/vdr-plugin-dvdswitch/dvdswitch_writedvd.sh");
- }
-
- cDVDSwitchSetup::~ cDVDSwitchSetup(void)
diff --git a/debian/patches/02_debian-paths.patch b/debian/patches/02_debian-paths.patch
new file mode 100644
index 0000000..1fa5ef0
--- /dev/null
+++ b/debian/patches/02_debian-paths.patch
@@ -0,0 +1,32 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## debian-paths patch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change paths do debian conform paths.
+
+ at DPATCH@
+Index: vdr-plugin-dvdswitch/setup.c
+===================================================================
+--- vdr-plugin-dvdswitch.orig/setup.c 2012-05-09 22:54:52.000000000 +0200
++++ vdr-plugin-dvdswitch/setup.c 2012-05-09 23:04:08.000000000 +0200
+@@ -14,7 +14,7 @@
+ HideMenuEntry = 0;
+ strncpy(MenuName, "DVDSwitch", memberof(MenuName));
+ CustomMenuName = false;
+- strncpy(ImageDir, "/video/dvd", memberof(ImageDir));
++ strncpy(ImageDir, "/var/lib/video/film/dvd", memberof(ImageDir));
+ ImageDirPerParam = false;
+ ViewFreeDiskSpace = 1;
+
+@@ -53,8 +53,8 @@
+ kOk = 4;
+
+ 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));
+ }
+
+ cDVDSwitchSetup::~ cDVDSwitchSetup(void)
diff --git a/debian/patches/03_no-files-crash.dpatch b/debian/patches/03_no-files-crash.patch
similarity index 100%
rename from debian/patches/03_no-files-crash.dpatch
rename to debian/patches/03_no-files-crash.patch
diff --git a/debian/patches/90_dvdswitch-0.1.3-1.5.4.dpatch b/debian/patches/90_dvdswitch-0.1.3-1.5.4.dpatch
deleted file mode 100644
index 301df7e..0000000
--- a/debian/patches/90_dvdswitch-0.1.3-1.5.4.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_dvdswitch-0.1.3-1.5.4.dpatch by Thomas Günther <tom at toms-cafe.de>
-## http://toms-cafe.de/vdr/download/dvdswitch-0.1.3-1.5.4.diff
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes for VDR >= 1.5.4.
-
- at DPATCH@
---- dvdswitch-0.1.3/helpers.h
-+++ dvdswitch-0.1.3/helpers.h
-@@ -80,7 +80,7 @@ class cStringListItem : public cListObje
- char *Value(void) { return String; }
- };
-
--class cStringList : public cList<cStringListItem> {};
-+//class cStringList : public cList<cStringListItem> {};
-
- // --- cTokenizer ---------------------------------------
-
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b22c225
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_Makefile-fPIC-fix.patch
+02_debian-paths.patch
+03_no-files-crash.patch
diff --git a/debian/rules b/debian/rules
index 4ba013e..20b91bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,24 @@
#!/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 = DVBDIR=/usr 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)
-binary-install/vdr-plugin-dvdswitch::
- chmod a+x debian/vdr-plugin-dvdswitch/usr/share/vdr-plugin-dvdswitch/*.sh
-
-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
+
+override_dh_install:
+ dh_install
+ chmod a+x debian/vdr-plugin-dvdswitch/usr/share/vdr-plugin-dvdswitch/*.sh
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
vdr-plugin-dvdswitch packaging repository
More information about the pkg-vdr-dvb-changes
mailing list