r5971 - in /vdr/vdr-plugin-ffnetdev/trunk/debian: changelog control copyright docs patches/00list patches/01_Makefile-fPIC-fix.dpatch patches/92_vdr-1.5.12-ffnetdev-svn20071122.dpatch rules watch
tom-guest at users.alioth.debian.org
tom-guest at users.alioth.debian.org
Sat Dec 1 16:13:50 UTC 2007
Author: tom-guest
Date: Sat Dec 1 16:13:49 2007
New Revision: 5971
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5971
Log:
New Upstream Snapshot
Added:
vdr/vdr-plugin-ffnetdev/trunk/debian/patches/92_vdr-1.5.12-ffnetdev-svn20071122.dpatch
vdr/vdr-plugin-ffnetdev/trunk/debian/watch
Removed:
vdr/vdr-plugin-ffnetdev/trunk/debian/docs
Modified:
vdr/vdr-plugin-ffnetdev/trunk/debian/changelog
vdr/vdr-plugin-ffnetdev/trunk/debian/control
vdr/vdr-plugin-ffnetdev/trunk/debian/copyright
vdr/vdr-plugin-ffnetdev/trunk/debian/patches/00list
vdr/vdr-plugin-ffnetdev/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch (props changed)
vdr/vdr-plugin-ffnetdev/trunk/debian/rules
Modified: vdr/vdr-plugin-ffnetdev/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-ffnetdev/trunk/debian/changelog?rev=5971&op=diff
==============================================================================
--- vdr/vdr-plugin-ffnetdev/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-ffnetdev/trunk/debian/changelog Sat Dec 1 16:13:49 2007
@@ -1,3 +1,18 @@
+vdr-plugin-ffnetdev (0.1.0+svn20071201.1427-1) unstable; urgency=low
+
+ * New Upstream Snapshot
+ * Added get-orig-source target to debian/rules to download the newest
+ svn-snapshot
+ * Added debian/watch file for uscan
+ * Added 92_vdr-1.5.12-ffnetdev-svn20071122.dpatch (Thx to free-x at vdrportal.de)
+ * Switched Build-system to cdbs
+ * Added cdbs to Build-Depends
+ * Removed debian/docs (not necessary with cdbs)
+ * Fixed debian-rules-ignores-make-clean-error
+ * Added full license disclaimer and copyright years to debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de> Sat, 1 Dec 2007 15:27:47 +0100
+
vdr-plugin-ffnetdev (0.1.0+svn20070610-5) unstable; urgency=low
* New version to force update with new VDR 1.4.7-2ctvdr4
Modified: vdr/vdr-plugin-ffnetdev/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-ffnetdev/trunk/debian/control?rev=5971&op=diff
==============================================================================
--- vdr/vdr-plugin-ffnetdev/trunk/debian/control (original)
+++ vdr/vdr-plugin-ffnetdev/trunk/debian/control Sat Dec 1 16:13:49 2007
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.5-1)
+Build-Depends: cdbs, debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.5-1)
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-ffnetdev/trunk/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-ffnetdev/trunk/
Modified: vdr/vdr-plugin-ffnetdev/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-ffnetdev/trunk/debian/copyright?rev=5971&op=diff
==============================================================================
--- vdr/vdr-plugin-ffnetdev/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-ffnetdev/trunk/debian/copyright Sat Dec 1 16:13:49 2007
@@ -1,19 +1,57 @@
-This package was debianized by Tobias Grimm <tg at e-tobi.net> on
-Sun, 25 Jun 2006 21:54:33 +0200.
-
-It was downloaded from http://ffnetdev.berlios.de/
+Upstream Homepage:
+ http://ffnetdev.berlios.de/
Upstream Authors:
Christian Cier-Zniewski <c.cier at gmx.de>
Jurij Retzlaff <jurij at topofweb.de>
Debian Maintainers:
-
- Tobias Grimm <tg at e-tobi.net>
- Thomas Schmidt <tschmidt at debian.org>
- Thomas Günther <tom at toms-cafe.de>
+ Tobias Grimm <tg at e-tobi.net>
+ Thomas Günther <tom at toms-cafe.de>
+ Thomas Schmidt <tschmidt at debian.org>
Copyright:
+ (C) 2005-2007 Christian Cier-Zniewski, Jurij Retzlaff
-It may be redistributed under the terms of the GNU GPL, Version 2
-found on Debian systems in the file /usr/share/common-licenses/GPL .
+Copyright for MinMax.h, rfb.h, translate.c, translate.h, vncEncodeCoRRE.h:
+ (C) 1999 AT&T Laboratories Cambridge
+
+Copyright for rfbproto.h:
+ (C) 2000, 2001 Const Kaplinsky
+ (C) 2000 Tridia Corporation
+ (C) 1999 AT&T Laboratories Cambridge
+
+Copyright for vncEncodeCoRRE.c, vncEncodeHexT.c, vncEncodeHexT.h,
+ vncEncodeRRE.c, vncEncodeRRE.h:
+ (C) 2000 Tridia Corporation
+ (C) 1999 AT&T Laboratories Cambridge
+
+Copyright for vncEncoder.c, vncEncoder.h:
+ (C) 2001 Constantin Kaplinsky
+ (C) 2000 Tridia Corporation
+ (C) 1999 AT&T Laboratories Cambridge
+
+Copyright (Debian packaging):
+ (C) 2006-2007 Tobias Grimm, Thomas Günther, Thomas Schmidt
+
+License:
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ The complete text of the GNU General Public License can be found
+ in /usr/share/common-licenses/GPL on most Debian systems.
+
+License (Debian packaging):
+ The Debian packaging is licensed under the GPL, version 2 or any
+ later version, see /usr/share/common-licenses/GPL.
Modified: vdr/vdr-plugin-ffnetdev/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-ffnetdev/trunk/debian/patches/00list?rev=5971&op=diff
==============================================================================
--- vdr/vdr-plugin-ffnetdev/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-ffnetdev/trunk/debian/patches/00list Sat Dec 1 16:13:49 2007
@@ -1,2 +1,3 @@
01_Makefile-fPIC-fix
91_ffnetdev-0.1.0+svn20060625-1.5.0
+92_vdr-1.5.12-ffnetdev-svn20071122
Propchange: vdr/vdr-plugin-ffnetdev/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
('svn:executable' removed)
Added: vdr/vdr-plugin-ffnetdev/trunk/debian/patches/92_vdr-1.5.12-ffnetdev-svn20071122.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-ffnetdev/trunk/debian/patches/92_vdr-1.5.12-ffnetdev-svn20071122.dpatch?rev=5971&op=file
==============================================================================
--- vdr/vdr-plugin-ffnetdev/trunk/debian/patches/92_vdr-1.5.12-ffnetdev-svn20071122.dpatch (added)
+++ vdr/vdr-plugin-ffnetdev/trunk/debian/patches/92_vdr-1.5.12-ffnetdev-svn20071122.dpatch Sat Dec 1 16:13:49 2007
@@ -1,0 +1,75 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 92_vdr-1.5.12-ffnetdev-svn20071122.dpatch by free-x at vdrportal.de
+## http://vdrportal.de/board/thread.php?postid=672306#post672306
+##
+## Thomas Günther <tom at toms-cafe.de>:
+## - Added compatibility to VDR < 1.5.9
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.9.
+
+ at DPATCH@
+diff -ur /home/oleg/plugins/ffnetdev/ffnetdev.c ffnetdev/ffnetdev.c
+--- /home/oleg/plugins/ffnetdev/ffnetdev.c 2007-11-22 09:53:42.000000000 +0100
++++ ffnetdev/ffnetdev.c 2007-11-22 10:10:58.000000000 +0100
+@@ -33,10 +33,18 @@
+
+ }
+
++#if VDRVERSNUM >= 10509
++cOsd * cNetOSDProvider::CreateOsd(int Left, int Top, uint Layer)
++#else
+ cOsd * cNetOSDProvider::CreateOsd(int Left, int Top)
++#endif
+ {
+
++#if VDRVERSNUM >= 10509
++ osd = new cNetOSD(Left, Top, 0);
++#else
+ osd = new cNetOSD(Left, Top);
++#endif
+ return osd;
+ }
+
+diff -ur /home/oleg/plugins/ffnetdev/netosd.c ffnetdev/netosd.c
+--- /home/oleg/plugins/ffnetdev/netosd.c 2007-11-22 09:53:42.000000000 +0100
++++ ffnetdev/netosd.c 2007-11-22 10:08:14.000000000 +0100
+@@ -9,7 +9,11 @@
+ #include "osdworker.h"
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////
++#if VDRVERSNUM >= 10509
++cNetOSD::cNetOSD(int Left, int Top, uint Layer) : cOsd(Left, Top, Layer)
++#else
+ cNetOSD::cNetOSD(int Left, int Top) : cOsd(Left, Top)
++#endif
+ {
+ #ifdef DEBUG
+ fprintf(stderr,"[ffnetdev] NetOSD: Constructor cNetOSD.\n");
+diff -ur /home/oleg/plugins/ffnetdev/netosd.h ffnetdev/netosd.h
+--- /home/oleg/plugins/ffnetdev/netosd.h 2007-11-22 09:53:42.000000000 +0100
++++ ffnetdev/netosd.h 2007-11-22 10:10:00.000000000 +0100
+@@ -17,7 +17,11 @@
+ bool truecolor;
+ protected:
+ public:
++#if VDRVERSNUM >= 10509
++ cNetOSD(int XOfs, int XOfs, uint Layer);
++#else
+ cNetOSD(int XOfs, int XOfs);
++#endif
+ virtual ~cNetOSD();
+ virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
+ virtual void Flush(void);
+@@ -31,7 +35,11 @@
+ cNetOSD **NetOSD;
+ public:
+ cNetOSDProvider(void);
++#if VDRVERSNUM >= 10509
++ virtual cOsd *CreateOsd(int Left, int Top, uint Layer);
++#else
+ virtual cOsd *CreateOsd(int Left, int Top);
++#endif
+ };
+
+ #endif //_NETOSD__H
Modified: vdr/vdr-plugin-ffnetdev/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-ffnetdev/trunk/debian/rules?rev=5971&op=diff
==============================================================================
--- vdr/vdr-plugin-ffnetdev/trunk/debian/rules (original)
+++ vdr/vdr-plugin-ffnetdev/trunk/debian/rules Sat Dec 1 16:13:49 2007
@@ -1,93 +1,27 @@
#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-# 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
+DEB_INSTALL_CHANGELOGS_ALL = CHANGELOG
MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
-configure: configure-stamp
-configure-stamp: patch-stamp
- dh_testdir
- touch configure-stamp
+common-build-arch::
+ $(MAKE) all $(MAKE_OPTIONS)
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
- $(MAKE) all $(MAKE_OPTIONS)
- touch build-stamp
+clean::
+ $(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+ rm -f libvdr-*.so.*
-clean: clean-patched unpatch
-clean-patched:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- -$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
- rm -f libvdr-*.so.*
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- dh_install
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-# dh_installdebconf
- dh_installdocs
- dh_installexamples
-# dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installman
-# dh_installinfo
-# dh_undocumented
- dh_installchangelogs CHANGELOG
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_makeshlibs
- dh_installdeb
-# dh_perl
- dh_shlibdeps
+common-binary-predeb-arch::
sh /usr/share/vdr-dev/patchlevel.sh subst
sh /usr/share/vdr-dev/dependencies.sh
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure \
- clean-patched patch unpatch
+VERSION_ID = $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/\+svn.*//')+svn$(shell date --utc +%0Y%0m%0d.%0k%0M)
+get-orig-source::
+ echo Downloading $(DEB_SOURCE_PACKAGE) $(VERSION_ID) from svn...
+ svn export -q svn://svn.berlios.de/ffnetdev/trunk $(DEB_SOURCE_PACKAGE)-$(VERSION_ID)
+ tar czf ../$(DEB_SOURCE_PACKAGE)_$(VERSION_ID).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(VERSION_ID)
+ rm -rf $(DEB_SOURCE_PACKAGE)-$(VERSION_ID)
+ dch -v "$(VERSION_ID)-1" "New Upstream Snapshot"
Added: vdr/vdr-plugin-ffnetdev/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-ffnetdev/trunk/debian/watch?rev=5971&op=file
==============================================================================
--- vdr/vdr-plugin-ffnetdev/trunk/debian/watch (added)
+++ vdr/vdr-plugin-ffnetdev/trunk/debian/watch Sat Dec 1 16:13:49 2007
@@ -1,0 +1,4 @@
+version=3
+opts=downloadurlmangle=s/prdownload/download/ \
+ http://developer.berlios.de/project/showfiles.php?group_id=5833 \
+ .*/ffnetdev/vdr-ffnetdev-(.*)\.tar\.bz2
More information about the pkg-vdr-dvb-changes
mailing list