r6198 - in /vdr/vdr-plugin-femon/trunk/debian: changelog control copyright install rules

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Sat Feb 16 11:42:29 2008
New Revision: 6198

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6198
Log:
* New upstream release
* Updated debian/copyright
* Merge devel branch
* Build-depend on vdr-dev (>= 1.5.7-1)
* Added gettext to Build-Depends

Modified:
    vdr/vdr-plugin-femon/trunk/debian/changelog
    vdr/vdr-plugin-femon/trunk/debian/control
    vdr/vdr-plugin-femon/trunk/debian/copyright
    vdr/vdr-plugin-femon/trunk/debian/install
    vdr/vdr-plugin-femon/trunk/debian/rules

Modified: vdr/vdr-plugin-femon/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-femon/trunk/debian/changelog?rev=6198&op=diff
==============================================================================
--- vdr/vdr-plugin-femon/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-femon/trunk/debian/changelog Sat Feb 16 11:42:29 2008
@@ -1,3 +1,16 @@
+vdr-plugin-femon (1.2.3-1) experimental; urgency=low
+
+  [ Tobias Grimm ]
+  * New upstream release
+  * Updated debian/copyright
+  * Merge devel branch
+  * Build-depend on vdr-dev (>= 1.5.7-1)
+
+  [Thomas Günther]
+  * Added gettext to Build-Depends
+
+ -- Tobias Grimm <tg at e-tobi.net>  Sat, 16 Feb 2008 12:40:41 +0100
+
 vdr-plugin-femon (1.1.4-1) unstable; urgency=low
 
   * New upstream release

Modified: vdr/vdr-plugin-femon/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-femon/trunk/debian/control?rev=6198&op=diff
==============================================================================
--- vdr/vdr-plugin-femon/trunk/debian/control (original)
+++ vdr/vdr-plugin-femon/trunk/debian/control Sat Feb 16 11:42:29 2008
@@ -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), cdbs, dpatch, vdr-dev (>= 1.4.5-1)
+Build-Depends: debhelper (>> 4.1.16), cdbs, dpatch, vdr-dev (>= 1.5.7-1), gettext
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-femon/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-femon/trunk/

Modified: vdr/vdr-plugin-femon/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-femon/trunk/debian/copyright?rev=6198&op=diff
==============================================================================
--- vdr/vdr-plugin-femon/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-femon/trunk/debian/copyright Sat Feb 16 11:42:29 2008
@@ -10,10 +10,10 @@
     Thomas Günther <tom at toms-cafe.de>
 
 Copyright:
-    (C) 2004 - 2007 Rolf Ahrenberg
+    (C) 2004 - 2008 Rolf Ahrenberg
 
 Copyright (Debian packaging):
-    (C) 2004 - 2007 Tobias Grimm, Thomas Günther, Thomas Schmidt
+    (C) 2004 - 2008 Tobias Grimm, Thomas Günther, Thomas Schmidt
 
 License:
     This program is free software; you can redistribute it and/or modify
@@ -32,8 +32,8 @@
     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-femon/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-femon/trunk/debian/install?rev=6198&op=diff
==============================================================================
--- vdr/vdr-plugin-femon/trunk/debian/install (original)
+++ vdr/vdr-plugin-femon/trunk/debian/install Sat Feb 16 11:42:29 2008
@@ -1,1 +1,2 @@
 libvdr-femon.so.*               usr/lib/vdr/plugins/
+debian/tmp/usr/share/locale

Modified: vdr/vdr-plugin-femon/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-femon/trunk/debian/rules?rev=6198&op=diff
==============================================================================
--- vdr/vdr-plugin-femon/trunk/debian/rules (original)
+++ vdr/vdr-plugin-femon/trunk/debian/rules Sat Feb 16 11:42:29 2008
@@ -6,17 +6,15 @@
 DEB_INSTALL_CHANGELOGS_ALL = HISTORY
 
 MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
-               INCLUDES=-I/usr/include/vdr LOCALEDIR=locale
+               LOCALEDIR=debian/tmp/usr/share/locale
 
 common-build-arch::
 	$(MAKE) all $(MAKE_OPTIONS)
 
-clean::
+cleanbuilddir::
 	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -f libvdr-*.so.*
-	rm -rf locale
 
 common-binary-predeb-arch::
 	sh /usr/share/vdr-dev/patchlevel.sh subst
 	sh /usr/share/vdr-dev/dependencies.sh
-