r821 - in vdr/vdr-plugin-games/trunk/debian: . patches
Thomas Günther
tom-guest at costa.debian.org
Sun Aug 7 18:40:59 UTC 2005
Author: tom-guest
Date: 2005-08-07 18:40:58 +0000 (Sun, 07 Aug 2005)
New Revision: 821
Added:
vdr/vdr-plugin-games/trunk/debian/compat
Modified:
vdr/vdr-plugin-games/trunk/debian/changelog
vdr/vdr-plugin-games/trunk/debian/control
vdr/vdr-plugin-games/trunk/debian/docs
vdr/vdr-plugin-games/trunk/debian/install
vdr/vdr-plugin-games/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-games/trunk/debian/patches/02_Makefile-nosilent.dpatch
vdr/vdr-plugin-games/trunk/debian/rules
Log:
Adapted to vdrdevel-plugin-games
Modified: vdr/vdr-plugin-games/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-games/trunk/debian/changelog 2005-08-07 10:41:14 UTC (rev 820)
+++ vdr/vdr-plugin-games/trunk/debian/changelog 2005-08-07 18:40:58 UTC (rev 821)
@@ -1,3 +1,13 @@
+vdr-plugin-games (0.6.2-2) unstable; urgency=low
+
+ * Thomas Günther <tom at toms-cafe.de>
+ - Adapted patches for new dpatch >= 2.0.9
+ - Using debian/compat now
+ - Adapted debian/control, debian/install, debian/docs and debian/rules
+ to vdrdevel-plugin-games
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sun, 7 Aug 2005 20:18:38 +0200
+
vdr-plugin-games (0.6.2-1) unstable; urgency=low
* Tobias Grimm <tg at e-tobi.net>
Added: vdr/vdr-plugin-games/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-games/trunk/debian/compat 2005-08-07 10:41:14 UTC (rev 820)
+++ vdr/vdr-plugin-games/trunk/debian/compat 2005-08-07 18:40:58 UTC (rev 821)
@@ -0,0 +1 @@
+4
Modified: vdr/vdr-plugin-games/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-games/trunk/debian/control 2005-08-07 10:41:14 UTC (rev 820)
+++ vdr/vdr-plugin-games/trunk/debian/control 2005-08-07 18:40:58 UTC (rev 821)
@@ -15,4 +15,4 @@
Description: Plugin to vdr for playing tetris, snake and others
This plugin(s) for vdr allows you to play Tetris, TicTacToe, Tron
and Snake via vdr's OSD.
-XB-VDR-Patchlevel: ${patchlevel}
+XB-VDR-Patchlevel: ${patchlevel}
Modified: vdr/vdr-plugin-games/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-games/trunk/debian/docs 2005-08-07 10:41:14 UTC (rev 820)
+++ vdr/vdr-plugin-games/trunk/debian/docs 2005-08-07 18:40:58 UTC (rev 821)
@@ -1,2 +1 @@
README
-HISTORY
Modified: vdr/vdr-plugin-games/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-games/trunk/debian/install 2005-08-07 10:41:14 UTC (rev 820)
+++ vdr/vdr-plugin-games/trunk/debian/install 2005-08-07 18:40:58 UTC (rev 821)
@@ -1 +1 @@
-libvdr-games.so.* usr/lib/vdr/plugins
+libvdr-games.so.* usr/lib/vdr/plugins/
Modified: vdr/vdr-plugin-games/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-games/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-08-07 10:41:14 UTC (rev 820)
+++ vdr/vdr-plugin-games/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2005-08-07 18:40:58 UTC (rev 821)
@@ -1,27 +1,10 @@
-#! /bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
## 01_Makefile-fPIC-fix.dpatch by Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Adds -fPIC to Makefiles, to fix FTBFS (#266793)
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/minesweeper/Makefile vdr-plugin-games-0.6.1/minesweeper/Makefile
--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/minesweeper/Makefile 2004-07-03 16:44:40.000000000 +0200
Modified: vdr/vdr-plugin-games/trunk/debian/patches/02_Makefile-nosilent.dpatch
===================================================================
--- vdr/vdr-plugin-games/trunk/debian/patches/02_Makefile-nosilent.dpatch 2005-08-07 10:41:14 UTC (rev 820)
+++ vdr/vdr-plugin-games/trunk/debian/patches/02_Makefile-nosilent.dpatch 2005-08-07 18:40:58 UTC (rev 821)
@@ -1,27 +1,10 @@
-#! /bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
## 02_Makefile-nosilent.dpatch by Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Removes output-suppresions from the Makefiles
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/Makefile vdr-plugin-games-0.6.1/Makefile
--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/Makefile 2004-08-19 17:19:17.000000000 +0200
Modified: vdr/vdr-plugin-games/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-games/trunk/debian/rules 2005-08-07 10:41:14 UTC (rev 820)
+++ vdr/vdr-plugin-games/trunk/debian/rules 2005-08-07 18:40:58 UTC (rev 821)
@@ -5,12 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
-# include dpatch stuff
-include /usr/share/dpatch/dpatch.make
-
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
endif
@@ -18,39 +12,41 @@
INSTALL_PROGRAM += -s
endif
-# Set VDR=vdr or VDR=vdrdevel
+# Set VDR=vdr or VDR=vdrdevel - vdrdevel always uses dpatch
VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
+ifeq ($(VDR), vdrdevel)
+ DPATCH=yes
+endif
-PACKAGE=$(VDR)-plugin-games
-VDRDIR=/usr/include/$(VDR)
-DVBDIR=/usr/include
+# To use dpatch uncomment the following line and set Build-Depends to dpatch
+DPATCH=yes
+ifdef DPATCH
+include /usr/share/dpatch/dpatch.make
+else
+patch:
+patch-stamp:
+unpatch:
+endif
+
configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
dh_testdir
-
touch configure-stamp
-
-build: patch-stamp build-stamp
-
-build-stamp: configure-stamp
+build: build-stamp
+build-stamp: configure-stamp
dh_testdir
-
- $(MAKE) all DVBDIR=$(DVBDIR) VDRDIR=$(VDRDIR) LIBDIR=.
-
+ $(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=.
touch build-stamp
clean: clean-patched unpatch
-
clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- rm -rf build-tree
- rm -f libvdr-*.so*
- -make clean
-
+ -$(MAKE) -o .dependencies clean VDRDIR=/usr/include/$(VDR)
+ rm -f libvdr-*.so.*
dh_clean
install: build
@@ -58,9 +54,8 @@
dh_testroot
dh_clean -k
dh_installdirs
+ dh_install
- dh_install
-
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
@@ -69,23 +64,33 @@
binary-arch: build install
dh_testdir
dh_testroot
+# dh_installdebconf
dh_installdocs
dh_installexamples
- dh_installmenu
- dh_installcron
- dh_installman
- dh_installinfo
- dh_installchangelogs
+# dh_installmenu
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installman
+# dh_installinfo
+# dh_undocumented
+ dh_installchangelogs HISTORY
dh_link
dh_strip
dh_compress
dh_fixperms
+# dh_makeshlibs
dh_installdeb
+# dh_perl
dh_shlibdeps
- /usr/lib/$(VDR)-dev/patchlevel.sh subst
+ /usr/lib/$(VDR)-dev/patchlevel.sh subst
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch configure
+.PHONY: build clean binary-indep binary-arch binary install configure \
+ clean-patched patch unpatch
More information about the pkg-vdr-dvb-changes
mailing list