r8868 - in /vdr/vdr-plugin-freecell/trunk/debian: ./ patches/ source/

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Thu Apr 7 18:03:17 UTC 2011 

Author: tiber-guest
Date: Thu Apr  7 18:03:08 2011
New Revision: 8868

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8868
Log:
* Build-depend on vdr-dev >= 1.7.17
* Updated debian/copyright
* Standards-Version: 3.9.1
* Switched to debhelper 7 and dropped cdbs / dpatch

Added:
    vdr/vdr-plugin-freecell/trunk/debian/patches/01_Makefile-fPIC-fix.patch
      - copied, changed from r8867, vdr/vdr-plugin-freecell/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
    vdr/vdr-plugin-freecell/trunk/debian/patches/02_gcc3.4-fix.patch
      - copied, changed from r8867, vdr/vdr-plugin-freecell/trunk/debian/patches/02_gcc3.4-fix.dpatch
    vdr/vdr-plugin-freecell/trunk/debian/patches/90_APIVERSION.patch
      - copied, changed from r8867, vdr/vdr-plugin-freecell/trunk/debian/patches/90_APIVERSION.dpatch
    vdr/vdr-plugin-freecell/trunk/debian/patches/92_freecell-1.3.18.patch
      - copied, changed from r8867, vdr/vdr-plugin-freecell/trunk/debian/patches/92_freecell-1.3.18.dpatch
    vdr/vdr-plugin-freecell/trunk/debian/patches/93_freecell-0.0.2-1.5.4.patch
      - copied, changed from r8867, vdr/vdr-plugin-freecell/trunk/debian/patches/93_freecell-0.0.2-1.5.4.dpatch
    vdr/vdr-plugin-freecell/trunk/debian/patches/series
      - copied, changed from r8867, vdr/vdr-plugin-freecell/trunk/debian/patches/00list
    vdr/vdr-plugin-freecell/trunk/debian/source/
    vdr/vdr-plugin-freecell/trunk/debian/source/format
Removed:
    vdr/vdr-plugin-freecell/trunk/debian/README.source
    vdr/vdr-plugin-freecell/trunk/debian/patches/00list
    vdr/vdr-plugin-freecell/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
    vdr/vdr-plugin-freecell/trunk/debian/patches/02_gcc3.4-fix.dpatch
    vdr/vdr-plugin-freecell/trunk/debian/patches/90_APIVERSION.dpatch
    vdr/vdr-plugin-freecell/trunk/debian/patches/92_freecell-1.3.18.dpatch
    vdr/vdr-plugin-freecell/trunk/debian/patches/93_freecell-0.0.2-1.5.4.dpatch
Modified:
    vdr/vdr-plugin-freecell/trunk/debian/changelog
    vdr/vdr-plugin-freecell/trunk/debian/compat
    vdr/vdr-plugin-freecell/trunk/debian/control
    vdr/vdr-plugin-freecell/trunk/debian/copyright
    vdr/vdr-plugin-freecell/trunk/debian/rules

Modified: vdr/vdr-plugin-freecell/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/debian/changelog?rev=8868&op=diff
==============================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-freecell/trunk/debian/changelog Thu Apr  7 18:03:08 2011
@@ -1,3 +1,12 @@
+vdr-plugin-freecell (0.0.2-49) unstable; urgency=low
+
+  * Build-depend on vdr-dev >= 1.7.17
+  * Updated debian/copyright
+  * Standards-Version: 3.9.1
+  * Switched to debhelper 7 and dropped cdbs / dpatch
+
+ -- Tobias Grimm <etobi at debian.org>  Thu, 07 Apr 2011 20:02:45 +0200
+
 vdr-plugin-freecell (0.0.2-48) unstable; urgency=low
 
   * Build-depend on vdr-dev >= 1.6.0-16

Modified: vdr/vdr-plugin-freecell/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/debian/compat?rev=8868&op=diff
==============================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/compat (original)
+++ vdr/vdr-plugin-freecell/trunk/debian/compat Thu Apr  7 18:03:08 2011
@@ -1,1 +1,1 @@
-5
+7

Modified: vdr/vdr-plugin-freecell/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/debian/control?rev=8868&op=diff
==============================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/control (original)
+++ vdr/vdr-plugin-freecell/trunk/debian/control Thu Apr  7 18:03:08 2011
@@ -3,8 +3,8 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <etobi at debian.org>, Thomas Schmidt <tschmidt at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 5), cdbs, dpatch, vdr-dev (>= 1.6.0-16)
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.17)
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/
 Homepage: http://linux.kompiliert.net/index.php?view=freecell

Modified: vdr/vdr-plugin-freecell/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/debian/copyright?rev=8868&op=diff
==============================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-freecell/trunk/debian/copyright Thu Apr  7 18:03:08 2011
@@ -13,7 +13,7 @@
     (C) 2004 Sascha Volkenandt
 
 Copyright (Debian packaging):
-    (C) 2004 - 2010 Tobias Grimm, Thomas Günther, Thomas Schmidt
+    (C) 2004 - 2011 Tobias Grimm, Thomas Günther, Thomas Schmidt
 
 License:
     This program is free software; you can redistribute it and/or modify

Copied: vdr/vdr-plugin-freecell/trunk/debian/patches/01_Makefile-fPIC-fix.patch (from r8867, vdr/vdr-plugin-freecell/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/debian/patches/01_Makefile-fPIC-fix.patch?rev=8868&op=diff
==============================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch (original)
+++ vdr/vdr-plugin-freecell/trunk/debian/patches/01_Makefile-fPIC-fix.patch Thu Apr  7 18:03:08 2011
@@ -6,9 +6,10 @@
 ## DP: Adds -fPIC to Makefile
 
 @DPATCH@
-diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-freecell/vdr-plugin-freecell-0.0.1/Makefile vdr-plugin-freecell-0.0.1/Makefile
---- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-freecell/vdr-plugin-freecell-0.0.1/Makefile	2004-03-21 01:54:39.000000000 +0100
-+++ vdr-plugin-freecell-0.0.1/Makefile	2004-08-09 15:02:51.000000000 +0200
+Index: vdr-plugin-freecell-0.0.2/Makefile
+===================================================================
+--- vdr-plugin-freecell-0.0.2.orig/Makefile	2004-03-21 01:54:39.000000000 +0100
++++ vdr-plugin-freecell-0.0.2/Makefile	2011-04-07 19:57:16.000000000 +0200
 @@ -54,7 +54,7 @@
  	DEFINES  += -DTOOLBOX_DEBUG -DDEBUG
  	CXXFLAGS += -g

Copied: vdr/vdr-plugin-freecell/trunk/debian/patches/02_gcc3.4-fix.patch (from r8867, vdr/vdr-plugin-freecell/trunk/debian/patches/02_gcc3.4-fix.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/debian/patches/02_gcc3.4-fix.patch?rev=8868&op=diff
==============================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/patches/02_gcc3.4-fix.dpatch (original)
+++ vdr/vdr-plugin-freecell/trunk/debian/patches/02_gcc3.4-fix.patch Thu Apr  7 18:03:08 2011
@@ -7,9 +7,10 @@
 ## DP: with gcc-3.4
 
 @DPATCH@
-diff -urNad /home/chelli/vdr/cvs/vdr/vdr-plugin-freecell/tools/list.h vdr-plugin-freecell/tools/list.h
---- /home/chelli/vdr/cvs/vdr/vdr-plugin-freecell/tools/list.h	2004-02-11 13:33:26.000000000 +0100
-+++ vdr-plugin-freecell/tools/list.h	2004-09-11 16:00:20.000000000 +0200
+Index: vdr-plugin-freecell-0.0.2/tools/list.h
+===================================================================
+--- vdr-plugin-freecell-0.0.2.orig/tools/list.h	2004-02-11 13:33:26.000000000 +0100
++++ vdr-plugin-freecell-0.0.2/tools/list.h	2011-04-07 19:57:26.000000000 +0200
 @@ -90,22 +90,22 @@
  	T &SetNextCurrent  ();
  	T &SetPrevCurrent  ();

Copied: vdr/vdr-plugin-freecell/trunk/debian/patches/90_APIVERSION.patch (from r8867, vdr/vdr-plugin-freecell/trunk/debian/patches/90_APIVERSION.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/debian/patches/90_APIVERSION.patch?rev=8868&op=diff
==============================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/patches/90_APIVERSION.dpatch (original)
+++ vdr/vdr-plugin-freecell/trunk/debian/patches/90_APIVERSION.patch Thu Apr  7 18:03:08 2011
@@ -1,20 +1,22 @@
-#! /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
+Index: vdr-plugin-freecell-0.0.2/Makefile
+===================================================================
+--- vdr-plugin-freecell-0.0.2.orig/Makefile	2011-04-07 19:57:16.000000000 +0200
++++ vdr-plugin-freecell-0.0.2/Makefile	2011-04-07 19:57:27.000000000 +0200
+@@ -31,7 +31,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 $(OBJS) -o $@
+-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
++	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ dist: clean
+ 	@-rm -rf $(TMPDIR)/$(ARCHIVE)

Copied: vdr/vdr-plugin-freecell/trunk/debian/patches/92_freecell-1.3.18.patch (from r8867, vdr/vdr-plugin-freecell/trunk/debian/patches/92_freecell-1.3.18.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/debian/patches/92_freecell-1.3.18.patch?rev=8868&op=diff
==============================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/patches/92_freecell-1.3.18.dpatch (original)
+++ vdr/vdr-plugin-freecell/trunk/debian/patches/92_freecell-1.3.18.patch Thu Apr  7 18:03:08 2011
@@ -6,8 +6,10 @@
 ## DP: Changes for VDR >= 1.3.18.
 
 @DPATCH@
---- freecell-0.0.2/cards.c
-+++ freecell-0.0.2/cards.c
+Index: vdr-plugin-freecell-0.0.2/cards.c
+===================================================================
+--- vdr-plugin-freecell-0.0.2.orig/cards.c	2004-08-14 14:02:55.000000000 +0200
++++ vdr-plugin-freecell-0.0.2/cards.c	2011-04-07 19:57:28.000000000 +0200
 @@ -52,7 +52,11 @@
  	mX = X;
  	mY = Y;
@@ -15,7 +17,7 @@
 +#if VDRVERSNUM >= 10318
 +	mSeed = cTimeMs::Now();
 +#else
-	mSeed = time_ms();
+ 	mSeed = time_ms();
 +#endif
  }
  

Copied: vdr/vdr-plugin-freecell/trunk/debian/patches/93_freecell-0.0.2-1.5.4.patch (from r8867, vdr/vdr-plugin-freecell/trunk/debian/patches/93_freecell-0.0.2-1.5.4.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/debian/patches/93_freecell-0.0.2-1.5.4.patch?rev=8868&op=diff
==============================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/patches/93_freecell-0.0.2-1.5.4.dpatch (original)
+++ vdr/vdr-plugin-freecell/trunk/debian/patches/93_freecell-0.0.2-1.5.4.patch Thu Apr  7 18:03:08 2011
@@ -6,8 +6,10 @@
 ## DP: Changes for VDR >= 1.5.4.
 
 @DPATCH@
---- freecell-0.0.2/tools/list.h
-+++ freecell-0.0.2/tools/list.h
+Index: vdr-plugin-freecell-0.0.2/tools/list.h
+===================================================================
+--- vdr-plugin-freecell-0.0.2.orig/tools/list.h	2011-04-07 19:57:26.000000000 +0200
++++ vdr-plugin-freecell-0.0.2/tools/list.h	2011-04-07 19:57:29.000000000 +0200
 @@ -523,7 +523,7 @@
  	return neu;
  }

Copied: vdr/vdr-plugin-freecell/trunk/debian/patches/series (from r8867, vdr/vdr-plugin-freecell/trunk/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/debian/patches/series?rev=8868&op=diff
==============================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-freecell/trunk/debian/patches/series Thu Apr  7 18:03:08 2011
@@ -1,6 +1,6 @@
-01_Makefile-fPIC-fix
-02_gcc3.4-fix
+01_Makefile-fPIC-fix.patch
+02_gcc3.4-fix.patch
 
-90_APIVERSION.dpatch
-92_freecell-1.3.18
-93_freecell-0.0.2-1.5.4
+90_APIVERSION.patch
+92_freecell-1.3.18.patch
+93_freecell-0.0.2-1.5.4.patch

Modified: vdr/vdr-plugin-freecell/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/debian/rules?rev=8868&op=diff
==============================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/rules (original)
+++ vdr/vdr-plugin-freecell/trunk/debian/rules Thu Apr  7 18:03:08 2011
@@ -1,19 +1,20 @@
 #!/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=.
+%:
+	dh $@
 
-common-build-arch::
-	$(MAKE) all $(MAKE_OPTIONS)
+override_dh_auto_build:
+	dh_auto_build -- all $(MAKE_OPTIONS)
 
-clean::
+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

Added: vdr/vdr-plugin-freecell/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-freecell/trunk/debian/source/format?rev=8868&op=file
==============================================================================
--- vdr/vdr-plugin-freecell/trunk/debian/source/format (added)
+++ vdr/vdr-plugin-freecell/trunk/debian/source/format Thu Apr  7 18:03:08 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)

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