[SCM] vdr-plugin-cdda packaging repository branch, master, updated. debian/0.1.0-32-1-g6d26c6f

Sat Mar 31 22:50:08 UTC 2012

The following commit has been merged in the master branch:
commit 9b6a2a819b31cf76c17ecd4ce4365a346337d94c
Author: etobi <git at e-tobi.net>
Date:   Sat Mar 31 12:49:29 2012 +0200

    Dropped README.source, Source format 3.0 (quilt)

diff --git a/debian/changelog b/debian/changelog
index 44ac401..4c78331 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vdr-plugin-cdda (0.1.0-32) experimental; urgency=low
+
+  * Dropped README.source
+  * Source format 3.0 (quilt)
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 31 Mar 2012 12:45:18 +0200
+
 vdr-plugin-cdda (0.1.0-31) experimental; urgency=low
 
   * Switched to GIT using pristine tar
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index acbd30c..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,8 +0,0 @@
-01_Makefile-fPIC-fix
-02_fix-cdda_menu.h
-03_cdbremse
-
-90_APIVERSION.dpatch
-90_cdda-1.3.38
-90_gcc-4.4
-90_missing-includes
diff --git a/debian/patches/01_Makefile-fPIC-fix.dpatch b/debian/patches/01_Makefile-fPIC-fix.patch
similarity index 63%
rename from debian/patches/01_Makefile-fPIC-fix.dpatch
rename to debian/patches/01_Makefile-fPIC-fix.patch
index 271b477..f642a44 100644
--- a/debian/patches/01_Makefile-fPIC-fix.dpatch
+++ b/debian/patches/01_Makefile-fPIC-fix.patch
@@ -5,8 +5,10 @@
 ## DP: Adds -fPIC to Makefile to fix potential FTBFS.
 
 @DPATCH@
---- old/Makefile
-+++ new/Makefile
+Index: vdr-plugin-cdda/Makefile
+===================================================================
+--- vdr-plugin-cdda.orig/Makefile	2012-03-31 12:51:12.000000000 +0200
++++ vdr-plugin-cdda/Makefile	2012-03-31 12:54:58.000000000 +0200
 @@ -19,7 +19,7 @@
  ### The C++ compiler and options:
  
diff --git a/debian/patches/02_fix-cdda_menu.h.dpatch b/debian/patches/02_fix-cdda_menu.h.patch
similarity index 66%
rename from debian/patches/02_fix-cdda_menu.h.dpatch
rename to debian/patches/02_fix-cdda_menu.h.patch
index 41bae09..2e02e41 100644
--- a/debian/patches/02_fix-cdda_menu.h.dpatch
+++ b/debian/patches/02_fix-cdda_menu.h.patch
@@ -6,9 +6,10 @@
 ## DP: Fixes segfault in cdda_menu.h.
 
 @DPATCH@
-diff -Nur cdda-0.1.0.orig/cdda_menu.h cdda-0.1.0/cdda_menu.h
---- cdda-0.1.0.orig/cdda_menu.h	2005-12-15 13:45:07.000000000 +0100
-+++ cdda-0.1.0/cdda_menu.h	2006-03-03 15:19:16.000000000 +0100
+Index: vdr-plugin-cdda/cdda_menu.h
+===================================================================
+--- vdr-plugin-cdda.orig/cdda_menu.h	2012-03-31 12:51:12.000000000 +0200
++++ vdr-plugin-cdda/cdda_menu.h	2012-03-31 12:54:59.000000000 +0200
 @@ -60,7 +60,7 @@
      char *mp_newCddbServerFqdn;
      int m_newCddbServerPort;
diff --git a/debian/patches/03_cdbremse.dpatch b/debian/patches/03_cdbremse.dpatch
deleted file mode 100644
index 5d54c3a..0000000
--- a/debian/patches/03_cdbremse.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_cdbremse.dpatch by ramon.serrano at vdrportal.de
-## http://vdr-portal.de/board/thread.php?postid=429254#post429254
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set speed of cd drive to 2.
-
-diff -Nur cdda-0.1.0.orig/cdda_device.c cdda-0.1.0/cdda_device.c
---- cdda-0.1.0.orig/cdda_device.c	2005-12-23 10:10:30.000000000 +0100
-+++ cdda-0.1.0/cdda_device.c	2006-03-06 21:59:25.000000000 +0100
-@@ -228,6 +228,7 @@
-       mp_cdIo = cdio_open(mp_device, DRIVER_LINUX);
-       if (NULL == mp_cdIo)
-         return scCannotOpenDevice;
-+      cdio_set_speed(mp_cdIo,2);
-     } else
-       return scOutOfMemory;
-   } else
diff --git a/debian/patches/03_cdbremse.patch b/debian/patches/03_cdbremse.patch
new file mode 100644
index 0000000..e91c49a
--- /dev/null
+++ b/debian/patches/03_cdbremse.patch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_cdbremse.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+Index: vdr-plugin-cdda/cdda_device.c
+===================================================================
+--- vdr-plugin-cdda.orig/cdda_device.c	2012-03-31 12:53:30.000000000 +0200
++++ vdr-plugin-cdda/cdda_device.c	2012-03-31 12:56:16.000000000 +0200
+@@ -228,6 +228,7 @@
+       mp_cdIo = cdio_open(mp_device, DRIVER_LINUX);
+       if (NULL == mp_cdIo)
+         return scCannotOpenDevice;
++      cdio_set_speed(mp_cdIo,2);
+     } else
+       return scOutOfMemory;
+   } else
diff --git a/debian/patches/90_APIVERSION.dpatch b/debian/patches/90_APIVERSION.dpatch
deleted file mode 100644
index 2a60f84..0000000
--- a/debian/patches/90_APIVERSION.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh -e
-## 90_APIVERSION.dpatch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support for the APIVERSION define as introduced in VDR-1.3.47.
-
-case "$1" in
-    -patch)
-        sed -i -e s/VDRVERSION/APIVERSION/g Makefile
-        ;;
-    -unpatch)
-        sed -i -e s/APIVERSION/VDRVERSION/g Makefile
-        ;;
-     *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/debian/patches/90_APIVERSION.patch b/debian/patches/90_APIVERSION.patch
new file mode 100644
index 0000000..201c16b
--- /dev/null
+++ b/debian/patches/90_APIVERSION.patch
@@ -0,0 +1,24 @@
+# Support for the APIVERSION define as introduced in VDR-1.3.47.
+
+Index: vdr-plugin-cdda/Makefile
+===================================================================
+--- vdr-plugin-cdda.orig/Makefile	2012-03-31 12:54:58.000000000 +0200
++++ vdr-plugin-cdda/Makefile	2012-03-31 12:57:00.000000000 +0200
+@@ -34,7 +34,7 @@
+ 
+ ### The version number of VDR (taken from VDR's "config.h"):
+ 
+-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
++APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+ 
+ ### The name of the distribution archive:
+ 
+@@ -77,7 +77,7 @@
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) -shared $(LIBS) $(OBJS) -o $@
+-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
++	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ dist: clean
+ 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/debian/patches/90_cdda-1.3.38.dpatch b/debian/patches/90_cdda-1.3.38.patch
similarity index 74%
rename from debian/patches/90_cdda-1.3.38.dpatch
rename to debian/patches/90_cdda-1.3.38.patch
index 039787a..bd5071d 100644
--- a/debian/patches/90_cdda-1.3.38.dpatch
+++ b/debian/patches/90_cdda-1.3.38.patch
@@ -5,8 +5,10 @@
 ## DP: Changes for VDR >= 1.3.38.
 
 @DPATCH@
---- cdda-0.1.0/audio_player.c
-+++ cdda-0.1.0/audio_player.c
+Index: vdr-plugin-cdda/audio_player.c
+===================================================================
+--- vdr-plugin-cdda.orig/audio_player.c	2012-03-31 12:51:12.000000000 +0200
++++ vdr-plugin-cdda/audio_player.c	2012-03-31 12:57:01.000000000 +0200
 @@ -368,7 +368,11 @@
  }
  
diff --git a/debian/patches/90_gcc-4.4.dpatch b/debian/patches/90_gcc-4.4.patch
similarity index 71%
rename from debian/patches/90_gcc-4.4.dpatch
rename to debian/patches/90_gcc-4.4.patch
index 173ebf6..cba8bb6 100644
--- a/debian/patches/90_gcc-4.4.dpatch
+++ b/debian/patches/90_gcc-4.4.patch
@@ -5,9 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad vdr-plugin-cdda-0.1.0~/cdda_cddb.c vdr-plugin-cdda-0.1.0/cdda_cddb.c
---- vdr-plugin-cdda-0.1.0~/cdda_cddb.c	2005-12-24 11:17:06.000000000 +0100
-+++ vdr-plugin-cdda-0.1.0/cdda_cddb.c	2009-10-26 19:43:54.000000000 +0100
+Index: vdr-plugin-cdda/cdda_cddb.c
+===================================================================
+--- vdr-plugin-cdda.orig/cdda_cddb.c	2012-03-31 12:51:12.000000000 +0200
++++ vdr-plugin-cdda/cdda_cddb.c	2012-03-31 12:57:03.000000000 +0200
 @@ -58,7 +58,8 @@
  
      sscanf(key, "%a[^\n0-9]%d", &p_key, &track);
diff --git a/debian/patches/90_missing-includes.dpatch b/debian/patches/90_missing-includes.patch
similarity index 53%
rename from debian/patches/90_missing-includes.dpatch
rename to debian/patches/90_missing-includes.patch
index 419ae24..85510c2 100644
--- a/debian/patches/90_missing-includes.dpatch
+++ b/debian/patches/90_missing-includes.patch
@@ -5,9 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-plugin-cdda-0.1.0~/cdda_cddb.c vdr-plugin-cdda-0.1.0/cdda_cddb.c
---- vdr-plugin-cdda-0.1.0~/cdda_cddb.c	2005-12-24 11:17:06.000000000 +0100
-+++ vdr-plugin-cdda-0.1.0/cdda_cddb.c	2010-09-27 00:02:23.000000000 +0200
+Index: vdr-plugin-cdda/cdda_cddb.c
+===================================================================
+--- vdr-plugin-cdda.orig/cdda_cddb.c	2012-03-31 12:57:03.000000000 +0200
++++ vdr-plugin-cdda/cdda_cddb.c	2012-03-31 12:57:04.000000000 +0200
 @@ -9,6 +9,8 @@
  #include <unistd.h>
  #include <netdb.h>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ad1530d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,8 @@
+01_Makefile-fPIC-fix.patch
+02_fix-cdda_menu.h.patch
+03_cdbremse.patch
+
+90_APIVERSION.patch
+90_cdda-1.3.38.patch
+90_gcc-4.4.patch
+90_missing-includes.patch
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-cdda packaging repository

