[SCM] vdr-plugin-mailbox packaging repository branch, master, updated. debian/0.6.0-1-3-g97d0d2f

Thomas Günther tom at toms-cafe.de
Wed Apr 24 23:12:39 UTC 2013 

The following commit has been merged in the master branch:
commit 97d0d2f398af48af28551d3a7da0a244e354c61b
Author: Thomas Günther <tom at toms-cafe.de>
Date:   Thu Apr 25 01:05:08 2013 +0200

    Switched to debhelper 9 and dropped cdbs / dpatch

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 54d6fec..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,7 +0,0 @@
-This package uses the dpatch system to save and apply patches to the
-upstream source code of the software that is packaged. For details
-about how to use dpatch read
-
-   /usr/share/doc/dpatch/README.source.gz
-
-from the dpatch package.
diff --git a/debian/changelog b/debian/changelog
index b42994f..e420e07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+vdr-plugin-mailbox (0.7.0-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Removed 90_mailbox-0.5.0-vdr-1.7.13.dpatch (fixed upstream)
+  * Switched to debhelper 9 and dropped cdbs / dpatch
+  * Standards-Version: 3.9.4
+
+ -- Thomas Günther <tom at toms-cafe.de>  Thu, 25 Apr 2013 01:02:09 +0200
+
 vdr-plugin-mailbox (0.6.0-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index c11204c..fa509b4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,11 @@ Section: video
 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>, Thomas Schmidt <tschmidt at debian.org>
-Origin: ctvdr
-Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), libc-client-dev | libc-client2001-dev, libssl-dev, gettext
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), vdr-dev (>= 2.0.0), libc-client-dev, libssl-dev, gettext
+Standards-Version: 3.9.4
 Homepage: http://alex.vdr-developer.org/mailbox/
+Vcs-Git: git://git.debian.org/git/pkg-vdr-dvb/vdr-plugin-mailbox.git
+Vcs-Browser: http://git.debian.org/?p=pkg-vdr-dvb/vdr-plugin-mailbox.git
 
 Package: vdr-plugin-mailbox
 Architecture: any
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e845566..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/install b/debian/install
index d302743..6f5b712 100644
--- a/debian/install
+++ b/debian/install
@@ -1,5 +1,3 @@
-libvdr-mailbox.so.*             usr/lib/vdr/plugins/
 debian/plugin.mailbox.conf      etc/vdr/plugins/
 mailcmd.sh                      etc/vdr/plugins/mailbox/
 mailconv.sh                     etc/vdr/plugins/mailbox/
-debian/tmp/usr/share/locale
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 57c1346..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-10_imap_lib
-11_mailcmd
-90_mailbox-0.5.0-vdr-1.7.13
diff --git a/debian/patches/10_imap_lib.dpatch b/debian/patches/10_imap_lib.dpatch
deleted file mode 100644
index f5b935d..0000000
--- a/debian/patches/10_imap_lib.dpatch
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## imap lib/include path patch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: corrects lib/include path for imap in makefile.
-
- at DPATCH@
---- vdr-plugin-mailbox-0.4.0-pre2/Makefile
-+++ vdr-plugin-mailbox-0.4.0-pre2/Makefile
-@@ -44,8 +44,8 @@
- #  ------
- #  emerge c-client
- 
--IMAPINCDIR ?= /usr/include/imap
--IMAPLFLAGS ?= -lc-client -lssl -lpam
-+#IMAPINCDIR ?= /usr/include/imap
-+#IMAPLFLAGS ?= -lc-client -lssl -lpam
- 
- #
- #  Debian 3.0
-@@ -59,8 +59,8 @@
- #  or install 'libc-client-ssh2001-dev'
- #  and set the following variables
- #
--# IMAPINCDIR ?= /usr/include/c-client
--# IMAPLFLAGS ?= -lc-client -lssl
-+IMAPINCDIR ?= /usr/include/c-client
-+IMAPLFLAGS ?= -lc-client -lssl
- 
- #
- #  c-client installation from source
diff --git a/debian/patches/10_imap_lib.patch b/debian/patches/10_imap_lib.patch
new file mode 100644
index 0000000..f7f239c
--- /dev/null
+++ b/debian/patches/10_imap_lib.patch
@@ -0,0 +1,27 @@
+## imap lib/include path patch
+## corrects lib/include path for imap in makefile.
+
+--- vdr-0.7.0/Makefile
++++ vdr-0.7.0/Makefile
+@@ -53,8 +53,8 @@
+ #  ------
+ #  emerge c-client (tested with c-client-2007e-r2)
+ 
+-IMAPINCDIR ?= /usr/include/imap
+-IMAPLFLAGS ?= -lc-client
++# IMAPINCDIR ?= /usr/include/imap
++# IMAPLFLAGS ?= -lc-client
+ 
+ #
+ #  Debian/Ubuntu
+@@ -62,8 +62,8 @@
+ #  install the packages 'libc-client2007e-dev'
+ #  and set the following variables
+ #
+-# IMAPINCDIR ?= /usr/include/c-client
+-# IMAPLFLAGS ?= -lc-client
++IMAPINCDIR ?= /usr/include/c-client
++IMAPLFLAGS ?= -lc-client
+ #
+ #  c-client installation from source
+ #  ---------------------------------
diff --git a/debian/patches/11_mailcmd.dpatch b/debian/patches/11_mailcmd.patch
similarity index 71%
rename from debian/patches/11_mailcmd.dpatch
rename to debian/patches/11_mailcmd.patch
index e563c4c..817beff 100644
--- a/debian/patches/11_mailcmd.dpatch
+++ b/debian/patches/11_mailcmd.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## mailcmd patch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add path to svdrpsend.pl.
+## Add path to svdrpsend.pl.
 
- at DPATCH@
 diff -urNad mailbox-0.3.0/mailcmd.sh /tmp/dpep.ryG5yV/mailbox-0.3.0/mailcmd.sh
 --- mailbox-0.3.0/mailcmd.sh	Sat Jan 24 16:11:39 2004
 +++ /tmp/dpep.ryG5yV/mailbox-0.3.0/mailcmd.sh	Sun Nov 14 15:01:54 2004
@@ -13,7 +9,7 @@ diff -urNad mailbox-0.3.0/mailcmd.sh /tmp/dpep.ryG5yV/mailbox-0.3.0/mailcmd.sh
  #------------------------------------------------------------------
  LOGCMD="logger -t $CMDNAME"
 -SVDRPSEND="svdrpsend.pl"
-+SVDRPSEND="/usr/lib/vdr/svdrpsend.pl"
++SVDRPSEND="/usr/bin/svdrpsend"
  
  #------------------------------------------------------------------
  #     log the parameters
diff --git a/debian/patches/90_mailbox-0.5.0-vdr-1.7.13.dpatch b/debian/patches/90_mailbox-0.5.0-vdr-1.7.13.dpatch
deleted file mode 100644
index dd32c3e..0000000
--- a/debian/patches/90_mailbox-0.5.0-vdr-1.7.13.dpatch
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_mailbox-0.5.0-vdr-1.7.13.dpatch by Thomas Günther <tom at toms-cafe.de>
-## http://toms-cafe.de/vdr/download/mailbox-0.5.0-vdr-1.7.13.diff
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes for VDR >= 1.7.13.
-
- at DPATCH@
---- mailbox-0.5.0/AxLib/src/VDR/Tools.cpp
-+++ mailbox-0.5.0/AxLib/src/VDR/Tools.cpp
-@@ -202,7 +202,11 @@ void Tools::dumpChannel(const cChannel *
-     wsinfo(("  Provider  : '%s'", theChannel->Provider()));
-     wsinfo(("  PortalName: '%s'", theChannel->PortalName()));
-     wsinfo(("  Frequency : %5d   Transponder: %5d", theChannel->Frequency(), theChannel->Transponder()));
-+#if VDRVERSNUM >= 10713
-+    wsinfo(("  Source    : %5d  Srate: %5d  Vpid: %5d  Ppid: %5d  Tpid: %5d  Nid: %d  Tid: %d  Sid: %d  Rid: %d  Par: %s"
-+#else
-     wsinfo(("  Source    : %5d  Srate: %5d  Vpid: %5d  Ppid: %5d  Tpid: %5d  Nid: %d  Tid: %d  Sid: %d  Rid: %d  Pol: %c"
-+#endif
-           , theChannel->Source()
-           , theChannel->Srate()
-           , theChannel->Vpid()
-@@ -212,7 +216,11 @@ void Tools::dumpChannel(const cChannel *
-           , theChannel->Tid()
-           , theChannel->Sid()
-           , theChannel->Rid()
-+#if VDRVERSNUM >= 10713
-+          , theChannel->Parameters()
-+#else
-           , theChannel->Polarization()
-+#endif
-           ));
- 
- #if 0
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..492f8dd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10_imap_lib.patch
+11_mailcmd.patch
diff --git a/debian/rules b/debian/rules
index 12130f8..25d9982 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,11 @@
 #!/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
+%:
+	dh $@
 
-MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. \
-               LOCALEDIR=debian/tmp/usr/share/locale
-
-common-build-arch::
-	$(MAKE) all $(MAKE_OPTIONS)
-
-cleanbuilddir::
-	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
-	rm -f libvdr-*.so.*
-
-common-binary-predeb-arch::
+override_dh_gencontrol:
 	sh /usr/share/vdr-dev/dependencies.sh
+	dh_gencontrol
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-mailbox packaging repository

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