r7560 - in /vdr/vdradmin-am/trunk/debian: changelog copyright patches/00list patches/02_search-path.dpatch rules vdradmin-am.install vdradmin-am.manpages

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Sat Feb 21 20:11:30 UTC 2009 

Author: tiber-guest
Date: Sat Feb 21 20:11:30 2009
New Revision: 7560

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7560
Log:
* New upstream release
* Updated 02_search-path.dpatch
* Make sure UTF8 locales are installed (Closes: #508723)

Modified:
    vdr/vdradmin-am/trunk/debian/changelog
    vdr/vdradmin-am/trunk/debian/copyright
    vdr/vdradmin-am/trunk/debian/patches/00list
    vdr/vdradmin-am/trunk/debian/patches/02_search-path.dpatch
    vdr/vdradmin-am/trunk/debian/rules
    vdr/vdradmin-am/trunk/debian/vdradmin-am.install
    vdr/vdradmin-am/trunk/debian/vdradmin-am.manpages

Modified: vdr/vdradmin-am/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/changelog?rev=7560&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/changelog (original)
+++ vdr/vdradmin-am/trunk/debian/changelog Sat Feb 21 20:11:30 2009
@@ -1,3 +1,11 @@
+vdradmin-am (3.6.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Updated 02_search-path.dpatch
+  * Make sure UTF8 locales are installed (Closes: #508723)
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 21 Feb 2009 21:11:07 +0100
+
 vdradmin-am (3.6.2-2) unstable; urgency=low
 
   * Now taking /etc/default/locale into account, when setting the locale for the

Modified: vdr/vdradmin-am/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/copyright?rev=7560&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/copyright (original)
+++ vdr/vdradmin-am/trunk/debian/copyright Sat Feb 21 20:11:30 2009
@@ -11,15 +11,15 @@
 
 Copyright:
     (C) 2001 - 2004 Thomas Koch
-    (C) 2005 - 2006 Andreas Mair
+    (C) 2005 - 2008 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 - 2007 Thomas Schmidt, Tobias Grimm
-                    
+    (C) 2003 - 2009 Thomas Schmidt, Tobias Grimm
+
 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
@@ -61,7 +61,7 @@
     This library is free software; you can redistribute it and/or modify
     it under the same terms as Perl itself. Perl is distributed under 
     your choice of the GNU General Public License or the Artistic License.
-    
+
     On Debian GNU/Linux systems, the complete text of the 
     GNU General Public License can be found in `/usr/share/common-licenses/GPL'
     and the Artistic Licence in `/usr/share/common-licenses/Artistic'.

Modified: vdr/vdradmin-am/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/00list?rev=7560&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/00list (original)
+++ vdr/vdradmin-am/trunk/debian/patches/00list Sat Feb 21 20:11:30 2009
@@ -1,5 +1,5 @@
 01_dist-var
 02_search-path.dpatch
 03_cfgfiles-fhs
-04_manpage-fixes
+#04_manpage-fixes
 06_template-cache

Modified: 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.dpatch?rev=7560&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/02_search-path.dpatch (original)
+++ vdr/vdradmin-am/trunk/debian/patches/02_search-path.dpatch Sat Feb 21 20:11:30 2009
@@ -5,13 +5,13 @@
 ## DP: Search perl files in /usr/share/perl5/vdradmin-am
 
 @DPATCH@
-diff -urNad vdradmin-am-3.5.0~/vdradmind.pl vdradmin-am-3.5.0/vdradmind.pl
---- vdradmin-am-3.5.0~/vdradmind.pl	2006-11-11 02:15:17.000000000 +0100
-+++ vdradmin-am-3.5.0/vdradmind.pl	2006-11-11 02:16:05.000000000 +0100
+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
 @@ -36,7 +36,7 @@
-     $0 =~ /(^.*\/)/;
      $EXENAME  = $0;
      $BASENAME = $1;
+     $0 = $PROCNAME;
 -    unshift(@INC, "/usr/share/vdradmin/lib");
 +    unshift(@INC, "/usr/share/perl5/vdradmin-am");
      unshift(@INC, $BASENAME . "lib/");

Modified: vdr/vdradmin-am/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/rules?rev=7560&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/rules (original)
+++ vdr/vdradmin-am/trunk/debian/rules Sat Feb 21 20:11:30 2009
@@ -15,13 +15,19 @@
 	dh_testdir
 	dh_testroot
 	#-$(MAKE) clean
-	@rm -f vdradmind vdradmind.1
+	@rm -f debian/vdradmind debian/vdradmind.1
 	dh_clean
+	#./make.sh utf8clean
+	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
-	#$(MAKE) all
 	# 
-	# Note: all files are installed using dh_install 
+	# Note: all files are installed using dh_install
+	[ -d locale.backup ] || mv locale locale.backup
+	[ -d po.backup ] || cp -r po po.backup
+	./make.sh utf8add
+	./make.sh po
 
 install: build
 	dh_testdir
@@ -31,8 +37,8 @@
 	dh_installdirs
 
 # Remove shell extensions
-	@cp vdradmind.pl vdradmind
-	@cp vdradmind.pl.1 vdradmind.1
+	@cp vdradmind.pl debian/vdradmind
+	@cp vdradmind.pl.1 debian/vdradmind.1
 
 # Set permissions
 	chmod a+x $(CURDIR)/debian/at2epgsearch

Modified: vdr/vdradmin-am/trunk/debian/vdradmin-am.install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/vdradmin-am.install?rev=7560&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/vdradmin-am.install (original)
+++ vdr/vdradmin-am/trunk/debian/vdradmin-am.install Sat Feb 21 20:11:30 2009
@@ -3,5 +3,5 @@
 convert.pl                           usr/share/vdradmin-am/
 autotimer2searchtimer.pl             usr/share/vdradmin-am/
 debian/at2epgsearch                  usr/share/vdradmin-am/
-vdradmind                            usr/bin/
+debian/vdradmind                     usr/bin/
 lib/Template/Plugin/JavaScript.pm    usr/share/perl5/vdradmin-am/Template/Plugin/

Modified: vdr/vdradmin-am/trunk/debian/vdradmin-am.manpages
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/vdradmin-am.manpages?rev=7560&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/vdradmin-am.manpages (original)
+++ vdr/vdradmin-am/trunk/debian/vdradmin-am.manpages Sat Feb 21 20:11:30 2009
@@ -1,1 +1,1 @@
-vdradmind.1
+debian/vdradmind.1

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