r8997 - in /vdr/vdradmin-am/trunk/debian: ./ patches/ source/

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Sun Jun 5 11:57:41 UTC 2011 

Author: tiber-guest
Date: Sun Jun  5 11:57:40 2011
New Revision: 8997

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8997
Log:
* New upstream release
* Switched to source format 3.0 (quilt) (bzip2)
* Standards-Version: 3.9.2
* Updated debian/copyright

Added:
    vdr/vdradmin-am/trunk/debian/patches/01_dist-var.patch
      - copied, changed from r8996, vdr/vdradmin-am/trunk/debian/patches/01_dist-var.dpatch
    vdr/vdradmin-am/trunk/debian/patches/02_search-path.patch
      - copied, changed from r8996, vdr/vdradmin-am/trunk/debian/patches/02_search-path.dpatch
    vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.patch
      - copied, changed from r8996, vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch
    vdr/vdradmin-am/trunk/debian/patches/series
      - copied, changed from r8996, vdr/vdradmin-am/trunk/debian/patches/00list
    vdr/vdradmin-am/trunk/debian/source/options
Removed:
    vdr/vdradmin-am/trunk/debian/patches/00list
    vdr/vdradmin-am/trunk/debian/patches/01_dist-var.dpatch
    vdr/vdradmin-am/trunk/debian/patches/02_search-path.dpatch
    vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch
Modified:
    vdr/vdradmin-am/trunk/debian/changelog
    vdr/vdradmin-am/trunk/debian/control
    vdr/vdradmin-am/trunk/debian/copyright
    vdr/vdradmin-am/trunk/debian/rules
    vdr/vdradmin-am/trunk/debian/source/format

Modified: vdr/vdradmin-am/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/changelog?rev=8997&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/changelog (original)
+++ vdr/vdradmin-am/trunk/debian/changelog Sun Jun  5 11:57:40 2011
@@ -1,3 +1,12 @@
+vdradmin-am (3.6.8-1) unstable; urgency=low
+
+  * New upstream release
+  * Switched to source format 3.0 (quilt) (bzip2)
+  * Standards-Version: 3.9.2
+  * Updated debian/copyright
+
+ -- Tobias Grimm <etobi at debian.org>  Sun, 05 Jun 2011 13:57:31 +0200
+
 vdradmin-am (3.6.7-2) unstable; urgency=low
 
   * Changed default SVDRP port to 6419, suggest vdr (>= 1.7.15)

Modified: vdr/vdradmin-am/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/control?rev=8997&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/control (original)
+++ vdr/vdradmin-am/trunk/debian/control Sun Jun  5 11:57:40 2011
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>
-Build-Depends: debhelper (>= 7), dpatch
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdradmin-am/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/
 Homepage: http://andreas.vdr-developer.org/vdradmin-am/index.html

Modified: vdr/vdradmin-am/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/copyright?rev=8997&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/copyright (original)
+++ vdr/vdradmin-am/trunk/debian/copyright Sun Jun  5 11:57:40 2011
@@ -11,14 +11,14 @@
 
 Copyright:
     (C) 2001 - 2004 Thomas Koch
-    (C) 2005 - 2009 Andreas Mair
+    (C) 2005 - 2011 Andreas Mair
     (C) 2002        KDE Artists (KDE Crystal theme icons)
     (C) 2002        Klaus Knopper (Bubble help info boxes)
     (C) 2004        Tatsuhiko Miyagawa (Template-Plugin-JavaScript)
     (C) 2006        Mike Constabel (autotimer2searchtimer.pl)
 
 Copyright (Debian packaging):
-    (C) 2003 - 2010 Thomas Schmidt, Tobias Grimm
+    (C) 2003 - 2011 Thomas Schmidt, Tobias Grimm
 
 License:
     This program is free software; you can redistribute it and/or modify
@@ -36,7 +36,7 @@
     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 (Crystal theme icons):
     This library is free software; you can redistribute it and/or
@@ -68,4 +68,4 @@
 
 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.

Copied: vdr/vdradmin-am/trunk/debian/patches/01_dist-var.patch (from r8996, vdr/vdradmin-am/trunk/debian/patches/01_dist-var.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/01_dist-var.patch?rev=8997&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/01_dist-var.dpatch (original)
+++ vdr/vdradmin-am/trunk/debian/patches/01_dist-var.patch Sun Jun  5 11:57:40 2011
@@ -7,15 +7,16 @@
 ## DP: instead of local, relative paths
 
 @DPATCH@
-diff -urNad vdradmin-am-3.4.5/vdradmind.pl /tmp/dpep.ADlxNb/vdradmin-am-3.4.5/vdradmind.pl
---- vdradmin-am-3.4.5/vdradmind.pl	2006-05-09 15:09:37.000000000 +0200
-+++ /tmp/dpep.ADlxNb/vdradmin-am-3.4.5/vdradmind.pl	2006-05-14 12:20:09.395714750 +0200
-@@ -81,7 +81,7 @@
+Index: vdradmin-am-3.6.8/vdradmind.pl
+===================================================================
+--- vdradmin-am-3.6.8.orig/vdradmind.pl	2011-06-03 06:33:40.000000000 +0200
++++ vdradmin-am-3.6.8/vdradmind.pl	2011-06-05 12:53:24.000000000 +0200
+@@ -96,7 +96,7 @@
  
  #use warnings;
  
 -my $SEARCH_FILES_IN_SYSTEM    = 0;
 +my $SEARCH_FILES_IN_SYSTEM    = 1;
  my $VDR_MAX_SVDRP_LENGTH      = 10000;                        # validate this value
- my $SUPPORTED_LOCALE_PREFIXES = "^(de|en|es|fi|fr|nl|ru)_";
+ my $SUPPORTED_LOCALE_PREFIXES = "^(cs|de|en|es|fi|fr|it|nl|ru)_";
  

Copied: vdr/vdradmin-am/trunk/debian/patches/02_search-path.patch (from r8996, vdr/vdradmin-am/trunk/debian/patches/02_search-path.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/02_search-path.patch?rev=8997&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/02_search-path.dpatch (original)
+++ vdr/vdradmin-am/trunk/debian/patches/02_search-path.patch Sun Jun  5 11:57:40 2011
@@ -5,9 +5,10 @@
 ## DP: Search perl files in /usr/share/perl5/vdradmin-am
 
 @DPATCH@
-diff -urNad vdradmin-am-3.6.4~/vdradmind.pl vdradmin-am-3.6.4/vdradmind.pl
---- vdradmin-am-3.6.4~/vdradmind.pl	2009-02-21 19:20:40.000000000 +0100
-+++ vdradmin-am-3.6.4/vdradmind.pl	2009-02-21 19:21:14.000000000 +0100
+Index: vdradmin-am-3.6.8/vdradmind.pl
+===================================================================
+--- vdradmin-am-3.6.8.orig/vdradmind.pl	2011-06-05 12:53:24.000000000 +0200
++++ vdradmin-am-3.6.8/vdradmind.pl	2011-06-05 12:53:35.000000000 +0200
 @@ -36,7 +36,7 @@
      $EXENAME  = $0;
      $BASENAME = $1;

Copied: vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.patch (from r8996, vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.patch?rev=8997&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch (original)
+++ vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.patch Sun Jun  5 11:57:40 2011
@@ -6,10 +6,11 @@
 ## DP: with the FHS (vdradmin changes these files at runtime)
 
 @DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdradmin-am-3.6.7~/vdradmind.pl vdradmin-am-3.6.7/vdradmind.pl
---- vdradmin-am-3.6.7~/vdradmind.pl	2010-05-02 01:33:41.000000000 +0200
-+++ vdradmin-am-3.6.7/vdradmind.pl	2010-05-02 01:34:30.000000000 +0200
-@@ -141,9 +141,9 @@
+Index: vdradmin-am-3.6.8/vdradmind.pl
+===================================================================
+--- vdradmin-am-3.6.8.orig/vdradmind.pl	2011-06-05 12:53:35.000000000 +0200
++++ vdradmin-am-3.6.8/vdradmind.pl	2011-06-05 12:53:38.000000000 +0200
+@@ -142,9 +142,9 @@
  $CONFIG{SERVERHOST} = "0.0.0.0";
  $CONFIG{SERVERPORT} = 8001;
  $CONFIG{LOCAL_NET}  = "0.0.0.0/32";
@@ -22,7 +23,7 @@
  
  #
  $CONFIG{TEMPLATE}   = "default";
-@@ -279,18 +279,18 @@
+@@ -280,18 +280,18 @@
      $USER_CSS      = "${BASENAME}user.css";
      bindtextdomain("vdradmin", "${BASENAME}locale");
  } else {

Copied: vdr/vdradmin-am/trunk/debian/patches/series (from r8996, vdr/vdradmin-am/trunk/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/series?rev=8997&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/00list (original)
+++ vdr/vdradmin-am/trunk/debian/patches/series Sun Jun  5 11:57:40 2011
@@ -1,3 +1,3 @@
-01_dist-var
-02_search-path.dpatch
-03_cfgfiles-fhs
+01_dist-var.patch
+02_search-path.patch
+03_cfgfiles-fhs.patch

Modified: vdr/vdradmin-am/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/rules?rev=8997&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/rules (original)
+++ vdr/vdradmin-am/trunk/debian/rules Sun Jun  5 11:57:40 2011
@@ -1,65 +1,20 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# 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 dpatch stuff
-include /usr/share/dpatch/dpatch.make
+%:
+	dh $@
 
-clean: clean-patched unpatch
-
-clean-patched:
-	dh_testdir
-	dh_testroot
-	#-$(MAKE) clean
-	@rm -f debian/vdradmind debian/vdradmind.1
-	dh_clean
-	if [ -d locale.backup ] ; then rm -rf locale; mv locale.backup locale; fi
-	if [ -d po.backup ] ; then rm -rf po; mv po.backup po; fi
-
-build: patch-stamp
-	# 
-	# Note: all files are installed using dh_install
+override_dh_auto_build:
 	[ -d locale.backup ] || mv locale locale.backup
 	[ -d po.backup ] || cp -r po po.backup
 	./make.sh po
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-
-	dh_installdirs
-
-# Remove shell extensions
 	@cp vdradmind.pl debian/vdradmind
 	@cp vdradmind.pl.1 debian/vdradmind.1
+	chmod a+x $(CURDIR)/debian/at2epgsearch
 
-# Set permissions
-	chmod a+x $(CURDIR)/debian/at2epgsearch
-        
-# Build architecture-independent files here.
-binary-indep: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs HISTORY 
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_installinit
-	dh_installman
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_perl
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep
-.PHONY: build clean binary-indep install patch unpatch
+override_dh_auto_clean:
+	rm -rf debian/vdradmind debian/vdradmind.1
+	if [ -d locale.backup ] ; then rm -rf locale; mv locale.backup locale; fi
+	if [ -d po.backup ] ; then rm -rf po; mv po.backup po; fi

Modified: vdr/vdradmin-am/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/source/format?rev=8997&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/source/format (original)
+++ vdr/vdradmin-am/trunk/debian/source/format Sun Jun  5 11:57:40 2011
@@ -1,1 +1,1 @@
-1.0
+3.0 (quilt)

Added: vdr/vdradmin-am/trunk/debian/source/options
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/source/options?rev=8997&op=file
==============================================================================
--- vdr/vdradmin-am/trunk/debian/source/options (added)
+++ vdr/vdradmin-am/trunk/debian/source/options Sun Jun  5 11:57:40 2011
@@ -1,0 +1,1 @@
+compression = "bzip2"

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