rev 5927 - kde-extras/kaffeine/trunk/debian

[Mark Purcell]

Author: msp
Date: 2007-04-18 19:50:20 +0000 (Wed, 18 Apr 2007)
New Revision: 5927

Modified:
   kde-extras/kaffeine/trunk/debian/changelog
   kde-extras/kaffeine/trunk/debian/docs
   kde-extras/kaffeine/trunk/debian/rules
Log:
* Remove CMakeLists.txt
  - Problem during upgrade: trying to overwrite
  `/usr/share/doc/kde/HTML/en/doc/CMakeLists.txt' (Closes: #419477)

Modified: kde-extras/kaffeine/trunk/debian/changelog
===================================================================
--- kde-extras/kaffeine/trunk/debian/changelog	2007-04-18 16:30:59 UTC (rev 5926)
+++ kde-extras/kaffeine/trunk/debian/changelog	2007-04-18 19:50:20 UTC (rev 5927)
@@ -1,8 +1,10 @@
-kaffeine (0.8.4-2) UNRELEASED; urgency=low
+kaffeine (0.8.4-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Remove CMakeLists.txt
+    - Problem during upgrade: trying to overwrite
+    `/usr/share/doc/kde/HTML/en/doc/CMakeLists.txt' (Closes: #419477)
 
- -- Mark Purcell <msp at debian.org>  Sat, 14 Apr 2007 10:39:16 +0100
+ -- Mark Purcell <msp at debian.org>  Thu, 19 Apr 2007 05:50:00 +1000
 
 kaffeine (0.8.4-1) unstable; urgency=low
 

Modified: kde-extras/kaffeine/trunk/debian/docs
===================================================================
--- kde-extras/kaffeine/trunk/debian/docs	2007-04-18 16:30:59 UTC (rev 5926)
+++ kde-extras/kaffeine/trunk/debian/docs	2007-04-18 19:50:20 UTC (rev 5927)
@@ -1,2 +1,7 @@
 README
 TODO
+kaffeine/BUGS
+kaffeine/CREDITS
+kaffeine/README.atsc
+kaffeine/README.dvb
+kaffeine/README.gstreamer

Modified: kde-extras/kaffeine/trunk/debian/rules
===================================================================
--- kde-extras/kaffeine/trunk/debian/rules	2007-04-18 16:30:59 UTC (rev 5926)
+++ kde-extras/kaffeine/trunk/debian/rules	2007-04-18 19:50:20 UTC (rev 5927)
@@ -17,6 +17,8 @@
 
 	# file shipped by kdelibs
 	rm -f debian/kaffeine/usr/share/mimelnk/application/x-mplayer2.desktop
+	# Bogus, shouldn't be shipped..
+	rm -f debian/kaffeine/usr/share/doc/kde/HTML/en/doc/CMakeLists.txt
 
 get-orig-source:
 	 @@dh_testdir