r6421 - in /vdr/vdr-plugin-rssreader/trunk/debian: changelog control copyright install patches/ rules

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Tue Feb 19 19:56:40 UTC 2008


Author: tiber-guest
Date: Tue Feb 19 19:56:40 2008
New Revision: 6421

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6421
Log:
* Merged devel branch
* New upstream release
* Switched Build-System to cdbs, Build-Depend on cdbs
* Added Homepage field to debian/control
* Renamed XS-Vcs-* fields to Vcs-* in debian/control
* Bumped Standards-Version to 3.7.3
* Updated debian/copyright
* Removed 90_rssreader-1.0.1-1.5.3.dpatch (integrated in upstream)
* Added gettext to Build-Depends
* Added installation of locale files
* Fixed debian-rules-ignores-make-clean-error
* Added full license disclaimer and copyright years to debian/copyright

Removed:
    vdr/vdr-plugin-rssreader/trunk/debian/patches/
Modified:
    vdr/vdr-plugin-rssreader/trunk/debian/changelog
    vdr/vdr-plugin-rssreader/trunk/debian/control
    vdr/vdr-plugin-rssreader/trunk/debian/copyright
    vdr/vdr-plugin-rssreader/trunk/debian/install
    vdr/vdr-plugin-rssreader/trunk/debian/rules

Modified: vdr/vdr-plugin-rssreader/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-rssreader/trunk/debian/changelog?rev=6421&op=diff
==============================================================================
--- vdr/vdr-plugin-rssreader/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-rssreader/trunk/debian/changelog Tue Feb 19 19:56:40 2008
@@ -1,8 +1,22 @@
-vdr-plugin-rssreader (1.0.1-12) experimental; urgency=low
+vdr-plugin-rssreader (1.1.4-1) experimental; urgency=low
 
-  * Force rebuild for vdr 1.5.15
+  [ Tobias Grimm ]
+  * Merged devel branch
+  * New upstream release
+  * Switched Build-System to cdbs, Build-Depend on cdbs
+  * Added Homepage field to debian/control
+  * Renamed XS-Vcs-* fields to Vcs-* in debian/control
+  * Bumped Standards-Version to 3.7.3
+  * Updated debian/copyright
 
- -- Tobias Grimm <tg at e-tobi.net>  Mon, 18 Feb 2008 21:08:51 +0100
+  [ Thomas Günther ]
+  * Removed 90_rssreader-1.0.1-1.5.3.dpatch (integrated in upstream)
+  * Added gettext to Build-Depends
+  * Added installation of locale files
+  * Fixed debian-rules-ignores-make-clean-error
+  * Added full license disclaimer and copyright years to debian/copyright
+
+ -- Tobias Grimm <tg at e-tobi.net>  Tue, 19 Feb 2008 20:55:36 +0100
 
 vdr-plugin-rssreader (1.0.1-11) experimental; urgency=low
 

Modified: vdr/vdr-plugin-rssreader/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-rssreader/trunk/debian/control?rev=6421&op=diff
==============================================================================
--- vdr/vdr-plugin-rssreader/trunk/debian/control (original)
+++ vdr/vdr-plugin-rssreader/trunk/debian/control Tue Feb 19 19:56:40 2008
@@ -3,10 +3,11 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.5-1), libexpat1-dev, libcurl-dev, dpatch
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-rssreader/trunk/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-rssreader/trunk/
+Build-Depends: debhelper (>> 4.1.16), cdbs, vdr-dev (>= 1.4.5-1), libexpat1-dev, libcurl-dev, gettext
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-rssreader/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-rssreader/trunk/
+Homepage: http://www.saunalahti.fi/~rahrenbe/vdr/rssreader
 
 Package: vdr-plugin-rssreader
 Architecture: any

Modified: vdr/vdr-plugin-rssreader/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-rssreader/trunk/debian/copyright?rev=6421&op=diff
==============================================================================
--- vdr/vdr-plugin-rssreader/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-rssreader/trunk/debian/copyright Tue Feb 19 19:56:40 2008
@@ -10,10 +10,10 @@
     Thomas Schmidt <tschmidt at debian.org>
 
 Copyright:
-    (C) 2005 - 2007 Rolf Ahrenberg
+    (C) 2005 - 2008 Rolf Ahrenberg
 
 Copyright (Debian packaging):
-    (C) 2005 - 2007 Tobias Grimm, Thomas Günther, Thomas Schmidt
+    (C) 2005 - 2008 Tobias Grimm, Thomas Günther, Thomas Schmidt
 
 License:
     This program is free software; you can redistribute it and/or modify
@@ -31,8 +31,8 @@
     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.
+    in /usr/share/common-licenses/GPL-2 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.
+    later version, see /usr/share/common-licenses/GPL-2.

Modified: vdr/vdr-plugin-rssreader/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-rssreader/trunk/debian/install?rev=6421&op=diff
==============================================================================
--- vdr/vdr-plugin-rssreader/trunk/debian/install (original)
+++ vdr/vdr-plugin-rssreader/trunk/debian/install Tue Feb 19 19:56:40 2008
@@ -1,2 +1,3 @@
-libvdr-rssreader.so.*    usr/lib/vdr/plugins/
-debian/rssreader.conf    etc/vdr/plugins/
+libvdr-rssreader.so.*          usr/lib/vdr/plugins/
+debian/rssreader.conf          etc/vdr/plugins/
+debian/tmp/usr/share/locale

Modified: vdr/vdr-plugin-rssreader/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-rssreader/trunk/debian/rules?rev=6421&op=diff
==============================================================================
--- vdr/vdr-plugin-rssreader/trunk/debian/rules (original)
+++ vdr/vdr-plugin-rssreader/trunk/debian/rules Tue Feb 19 19:56:40 2008
@@ -1,93 +1,20 @@
 #! /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
+DEB_INSTALL_CHANGELOGS_ALL = HISTORY
 
-# To use dpatch uncomment the following line and set Build-Depends to dpatch
-DPATCH=yes
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
+               LOCALEDIR=debian/tmp/usr/share/locale
 
-ifdef DPATCH
-include /usr/share/dpatch/dpatch.make
-else
-patch:
-patch-stamp:
-unpatch:
-endif
+common-build-arch::
+	$(MAKE) all $(MAKE_OPTIONS)
 
-MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=.
-
-configure: configure-stamp
-configure-stamp: patch-stamp
-	dh_testdir
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE) all $(MAKE_OPTIONS)
-	touch build-stamp
-
-clean: clean-patched unpatch
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
+cleanbuilddir::
 	$(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 HISTORY
-	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




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