rendered paste bodydiff -Nru xsynth-dssi-0.9.0/debian/changelog xsynth-dssi-0.9.0/debian/changelog
--- xsynth-dssi-0.9.0/debian/changelog 2007-05-19 07:20:09.000000000 +0200
+++ xsynth-dssi-0.9.0/debian/changelog 2007-05-19 07:20:10.000000000 +0200
@@ -1,3 +1,11 @@
+xsynth-dssi (0.9.0-2ubuntu1) gutsy; urgency=low
+
+ * Merge from Debian unstable, remainin changes:
+ - Update maintainer in field debian/control.
+ * Add +Conflicts:/Replaces: dssi-plugin-xsynth in debian/control.
+
+ -- Michele Angrisano <DarkSun1988@gmail.com> Sat, 19 May 2007 05:48:08 +0200
+
xsynth-dssi (0.9.0-2) unstable; urgency=low
* Second upload to Debian (Closes: #321464).
@@ -14,3 +22,9 @@
-- Free Ekanayaka <freee@debian.org> Fri, 2 Feb 2007 12:04:55 +0100
+xsynth-dssi (0.9.0-0ubuntu1) dapper; urgency=low
+
+ * Initial release
+
+ -- Forest Bond <forest@alittletooquiet.net> Sat, 18 Feb 2006 17:19:30 -0500
+
diff -Nru xsynth-dssi-0.9.0/debian/control xsynth-dssi-0.9.0/debian/control
--- xsynth-dssi-0.9.0/debian/control 2007-05-19 07:20:09.000000000 +0200
+++ xsynth-dssi-0.9.0/debian/control 2007-05-19 07:20:10.000000000 +0200
@@ -1,7 +1,8 @@
Source: xsynth-dssi
Section: sound
Priority: optional
-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org>
Uploaders: Willem van Engen <debrepo@willem.engen.nl>, Free Ekanayaka <freee@debian.org>
Build-Depends: debhelper (>= 4.0.0), dssi-dev, liblo0-dev, libgtk2.0-dev, ladspa-sdk, libasound2-dev, autotools-dev, chrpath
Standards-Version: 3.7.2
@@ -9,6 +10,8 @@
Package: xsynth-dssi
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: dssi-plugin-xsynth
+Replaces: dssi-plugin-xsynth
Description: classic-analog (VCOs-VCF-VCA) style software synthesizer
The xsynth-dssi package contains the Xsynth-DSSI plugin, a classic-analog
(VCOs-VCF-VCA) style software synthesizer with an editor GUI. Xsynth-DSSI was