[Python-modules-commits] r6587 - in packages/python-osd/trunk/debian (4 files)

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

    Date: Thursday, September 25, 2008 @ 04:30:10
  Author: mlizaur-guest
Revision: 6587

Conflics/Replaces reintroduced, dots escaped from debian/watch, and upstream changelog is installed too.

Modified:
  packages/python-osd/trunk/debian/changelog
  packages/python-osd/trunk/debian/control
  packages/python-osd/trunk/debian/rules
  packages/python-osd/trunk/debian/watch

Modified: packages/python-osd/trunk/debian/changelog
===================================================================
--- packages/python-osd/trunk/debian/changelog	2008-09-24 19:58:49 UTC (rev 6586)
+++ packages/python-osd/trunk/debian/changelog	2008-09-25 04:30:10 UTC (rev 6587)
@@ -2,11 +2,11 @@
 
   * Fixed missing dependencies on libxosd2 using 
     ${shlibs:Depends} to solve this. (closes: #497768)
-  * Removed unnecessary dependency on python-simplejson.
-  * Added debian/watch file.
-  * $PWD replaced by $(CURDIR) to avoid FTBFS on debian/rules.
-  * Removed Conflics and Replaces from debian/control, since previous 
-    installed versions are automatically replaced.
+  * Removed unnecessary dependency on python-simplejson
+  * Added debian/watch file
+  * $PWD replaced by $(CURDIR) to avoid FTBFS on debian/rules
+  * Removed Conflics and Replaces from debian/control, since previous
+    installed versions are automatically replaced
   * Replaced 'python' to 'Python' on the small desc of debian/control
   * Updated Standard-Version to 3.8.0
 
@@ -112,4 +112,3 @@
     usage in _pyosd.c, upstream xosd doesn't support them yet.
 
  -- Tommi Virtanen <tv at debian.org>  Sun, 21 Jul 2002 18:16:50 +0300
-

Modified: packages/python-osd/trunk/debian/control
===================================================================
--- packages/python-osd/trunk/debian/control	2008-09-24 19:58:49 UTC (rev 6586)
+++ packages/python-osd/trunk/debian/control	2008-09-25 04:30:10 UTC (rev 6587)
@@ -15,6 +15,8 @@
 Depends: ${python:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
 Suggests: python-twisted
+Replaces: python-osd (<< 0.2.14-3)
+Conflicts: python-osd (<< 0.2.14-3)
 Description: Python bindings for X On-Screen Display library
  PyOSD is a Python module for displaying text on your X display, much
  like the "On Screen Displays" used on TVs and some monitors.

Modified: packages/python-osd/trunk/debian/rules
===================================================================
--- packages/python-osd/trunk/debian/rules	2008-09-24 19:58:49 UTC (rev 6586)
+++ packages/python-osd/trunk/debian/rules	2008-09-25 04:30:10 UTC (rev 6587)
@@ -38,7 +38,7 @@
 	dh_install --list-missing
 	dh_installdocs
 	dh_installexamples
-	dh_installchangelogs
+	dh_installchangelogs ChangeLog
 	dh_link
 	dh_strip
 	dh_compress

Modified: packages/python-osd/trunk/debian/watch
===================================================================
--- packages/python-osd/trunk/debian/watch	2008-09-24 19:58:49 UTC (rev 6586)
+++ packages/python-osd/trunk/debian/watch	2008-09-25 04:30:10 UTC (rev 6587)
@@ -1,3 +1,3 @@
 version=3
 
-http://ichi2.net/pyosd/pyosd-(.*).tar.gz
+http://ichi2.net/pyosd/pyosd-(.*)\.tar\.gz