[Demudi-commits] r815 - rosegarden/trunk/debian

[Mike O'Connor]

Author: stew-guest
Date: 2006-06-18 13:48:35 +0000 (Sun, 18 Jun 2006)
New Revision: 815

Modified:
   rosegarden/trunk/debian/changelog
   rosegarden/trunk/debian/control
Log:
adding conflicts for older rosegarden{2,4} packages

Modified: rosegarden/trunk/debian/changelog
===================================================================
--- rosegarden/trunk/debian/changelog	2006-06-18 10:16:10 UTC (rev 814)
+++ rosegarden/trunk/debian/changelog	2006-06-18 13:48:35 UTC (rev 815)
@@ -1,3 +1,9 @@
+rosegarden (1:1.2.3-2) unstable; urgency=low
+
+  * Adding missing Conflicts: on rosegarden-data (Closes: #373885)
+
+ -- Mike O'Connor <stew at vireo.org>  Sun, 18 Jun 2006 09:46:52 -0400
+
 rosegarden (1:1.2.3-1) unstable; urgency=low
 
   [Mike O'Connor]

Modified: rosegarden/trunk/debian/control
===================================================================
--- rosegarden/trunk/debian/control	2006-06-18 10:16:10 UTC (rev 814)
+++ rosegarden/trunk/debian/control	2006-06-18 13:48:35 UTC (rev 815)
@@ -11,6 +11,7 @@
 Depends: ${shlibs:Depends}, khelpcenter, rosegarden-data
 Replaces: rosegarden4,rosegarden2
 Provides: rosegarden4,rosegarden2
+Conflicts: rosegarden4 (< 1:1.2.3), rosegarden2 (< 1:1.2.3)
 Recommends: jackd, swh-plugins | ladspa-plugin
 Description: music editor and MIDI/audio sequencer
  Rosegarden is a KDE application which provides a mixed Audio/MIDI
@@ -45,6 +46,7 @@
 Package: rosegarden-data
 Architecture: all
 Recommends: rosegarden
+Conflicts: rosegarden4 (< 1:1.2.3), rosegarden2 (< 1:1.2.3)
 Description: music editor and MIDI/audio sequencer data files
  Rosegarden is a KDE application which provides a mixed Audio/MIDI
  sequencer (for playback and recording), a multi-track editor, music