r7583 - in /vdr/vdr/trunk/debian: changelog rules

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

Author: tiber-guest
Date: Wed Apr  1 16:38:25 2009
New Revision: 7583

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7583
Log:
* Added removal of vdr-dbg.1 to clean target in debian/rules
* Fixed substitution of 00list in debian/rules

Modified:
    vdr/vdr/trunk/debian/changelog
    vdr/vdr/trunk/debian/rules

Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=7583&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Wed Apr  1 16:38:25 2009
@@ -1,9 +1,14 @@
 vdr (1.6.0-9) UNRELEASED; urgency=low
 
+  [ Tobias Grimm ]
   * Removed debconf note "VDR needs DVB kernel modules" - DVB modules should
     be part of the standard kernel (at least on i386 and amd64).
   * Fixed debconf to not ask to create /var/lib/video.00 if it already exists
   * Added 19_dvb-api-v5.dpatch for new DVB API version 5 in kernel 2.6.28
+
+  [ Thomas Günther ]
+  * Added removal of vdr-dbg.1 to clean target in debian/rules
+  * Fixed substitution of 00list in debian/rules
 
  -- Tobias Grimm <etobi at debian.org>  Sat, 10 Jan 2009 23:10:46 +0100
 

Modified: vdr/vdr/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/rules?rev=7583&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/rules (original)
+++ vdr/vdr/trunk/debian/rules Wed Apr  1 16:38:25 2009
@@ -47,11 +47,12 @@
 
 prepare-00list:
 	python debian/patchcheck.py -c $(PATCHCHECKOPTION)
-	[ "$(OOLIST)" = "debian/patches/00list" ] || \
-	  cp -b $(OOLIST) debian/patches/00list
+	cmp -s $(OOLIST) debian/patches/00list || \
+	  cp -b --suffix=.save $(OOLIST) debian/patches/00list
 
 restore-00list:
-	[ ! -e debian/patches/00list~ ] || mv debian/patches/00list~ debian/patches/00list
+	[ ! -e debian/patches/00list.save ] || \
+	  mv debian/patches/00list.save debian/patches/00list
 
 accept-patches:
 	python debian/patchcheck.py -u $(PATCHCHECKOPTION)
@@ -102,7 +103,7 @@
 	rm -f vdr-newplugin
 	rm -f debian/vdr-shutdown.wrapper
 	rm -f debian/patchinfo
-	rm -f $(MANPAGES)
+	rm -f $(MANPAGES) $(TXT2MANPAGES)
 	dh_clean
 
 install: patchinfo build