r8882 - in /vdr/vdr-plugin-solitaire/trunk/debian: ./ patches/ source/

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Fri Apr 8 18:33:31 UTC 2011 

Author: tiber-guest
Date: Fri Apr  8 18:33:24 2011
New Revision: 8882

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

Added:
    vdr/vdr-plugin-solitaire/trunk/debian/patches/01_Makefile-fPIC-fix.patch
      - copied unchanged from r8881, vdr/vdr-plugin-solitaire/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
    vdr/vdr-plugin-solitaire/trunk/debian/patches/02_gcc3.4-fix.patch
      - copied unchanged from r8881, vdr/vdr-plugin-solitaire/trunk/debian/patches/02_gcc3.4-fix.dpatch
    vdr/vdr-plugin-solitaire/trunk/debian/patches/90_APIVERSION.patch
      - copied, changed from r8881, vdr/vdr-plugin-solitaire/trunk/debian/patches/90_APIVERSION.dpatch
    vdr/vdr-plugin-solitaire/trunk/debian/patches/91_solitaire-0.0.2-1.5.4.patch
      - copied unchanged from r8881, vdr/vdr-plugin-solitaire/trunk/debian/patches/91_solitaire-0.0.2-1.5.4.dpatch
    vdr/vdr-plugin-solitaire/trunk/debian/patches/series
      - copied, changed from r8881, vdr/vdr-plugin-solitaire/trunk/debian/patches/00list
    vdr/vdr-plugin-solitaire/trunk/debian/source/
    vdr/vdr-plugin-solitaire/trunk/debian/source/format
Removed:
    vdr/vdr-plugin-solitaire/trunk/debian/README.source
    vdr/vdr-plugin-solitaire/trunk/debian/patches/00list
    vdr/vdr-plugin-solitaire/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
    vdr/vdr-plugin-solitaire/trunk/debian/patches/02_gcc3.4-fix.dpatch
    vdr/vdr-plugin-solitaire/trunk/debian/patches/90_APIVERSION.dpatch
    vdr/vdr-plugin-solitaire/trunk/debian/patches/91_solitaire-0.0.2-1.5.4.dpatch
Modified:
    vdr/vdr-plugin-solitaire/trunk/debian/changelog
    vdr/vdr-plugin-solitaire/trunk/debian/compat
    vdr/vdr-plugin-solitaire/trunk/debian/control
    vdr/vdr-plugin-solitaire/trunk/debian/copyright
    vdr/vdr-plugin-solitaire/trunk/debian/rules

Modified: vdr/vdr-plugin-solitaire/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-solitaire/trunk/debian/changelog?rev=8882&op=diff
==============================================================================
--- vdr/vdr-plugin-solitaire/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-solitaire/trunk/debian/changelog Fri Apr  8 18:33:24 2011
@@ -1,3 +1,12 @@
+vdr-plugin-solitaire (0.0.2-47) 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
+
+ -- Tobias Grimm <etobi at debian.org>  Fri, 08 Apr 2011 20:29:06 +0200
+
 vdr-plugin-solitaire (0.0.2-46) unstable; urgency=low
 
   * Build-depend on vdr-dev >= 1.6.0-16

Modified: vdr/vdr-plugin-solitaire/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-solitaire/trunk/debian/compat?rev=8882&op=diff
==============================================================================
--- vdr/vdr-plugin-solitaire/trunk/debian/compat (original)
+++ vdr/vdr-plugin-solitaire/trunk/debian/compat Fri Apr  8 18:33:24 2011
@@ -1,1 +1,1 @@
-5
+7

Modified: vdr/vdr-plugin-solitaire/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-solitaire/trunk/debian/control?rev=8882&op=diff
==============================================================================
--- vdr/vdr-plugin-solitaire/trunk/debian/control (original)
+++ vdr/vdr-plugin-solitaire/trunk/debian/control Fri Apr  8 18:33:24 2011
@@ -3,8 +3,8 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>
-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-solitaire/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-solitaire/trunk/
 Homepage: http://www.djdagobert.com/vdr/solitaire/

Modified: vdr/vdr-plugin-solitaire/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-solitaire/trunk/debian/copyright?rev=8882&op=diff
==============================================================================
--- vdr/vdr-plugin-solitaire/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-solitaire/trunk/debian/copyright Fri Apr  8 18:33:24 2011
@@ -13,7 +13,7 @@
     (C) 2004 - 2007 Patrick Maier
 
 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-solitaire/trunk/debian/patches/90_APIVERSION.patch (from r8881, vdr/vdr-plugin-solitaire/trunk/debian/patches/90_APIVERSION.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-solitaire/trunk/debian/patches/90_APIVERSION.patch?rev=8882&op=diff
==============================================================================
--- vdr/vdr-plugin-solitaire/trunk/debian/patches/90_APIVERSION.dpatch (original)
+++ vdr/vdr-plugin-solitaire/trunk/debian/patches/90_APIVERSION.patch Fri Apr  8 18:33:24 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-solitaire/trunk/debian/patches/series (from r8881, vdr/vdr-plugin-solitaire/trunk/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-solitaire/trunk/debian/patches/series?rev=8882&op=diff
==============================================================================
--- vdr/vdr-plugin-solitaire/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-solitaire/trunk/debian/patches/series Fri Apr  8 18:33:24 2011
@@ -1,5 +1,5 @@
-01_Makefile-fPIC-fix
-02_gcc3.4-fix
+01_Makefile-fPIC-fix.patch
+02_gcc3.4-fix.patch
 
-90_APIVERSION.dpatch
-91_solitaire-0.0.2-1.5.4
+90_APIVERSION.patch
+91_solitaire-0.0.2-1.5.4.patch

Modified: vdr/vdr-plugin-solitaire/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-solitaire/trunk/debian/rules?rev=8882&op=diff
==============================================================================
--- vdr/vdr-plugin-solitaire/trunk/debian/rules (original)
+++ vdr/vdr-plugin-solitaire/trunk/debian/rules Fri Apr  8 18:33:24 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-solitaire/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-solitaire/trunk/debian/source/format?rev=8882&op=file
==============================================================================
--- vdr/vdr-plugin-solitaire/trunk/debian/source/format (added)
+++ vdr/vdr-plugin-solitaire/trunk/debian/source/format Fri Apr  8 18:33:24 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)

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