diff -u rosegarden-1.7.2/debian/changelog rosegarden-1.7.2/debian/changelog --- rosegarden-1.7.2/debian/changelog +++ rosegarden-1.7.2/debian/changelog @@ -1,3 +1,16 @@ +rosegarden (1:1.7.2-2ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #321364), Ubuntu remaining changes: + - debian/rosegarden-data.install: + + Add usr/share/doc/kde/HTML to rosegarden-data, to provide online + help documentation. + - debian/control: + + Build-Depends on libfftw3-dev instead of fftw3-dev. + + Use khelpcenter4 instead of khelpcenter. + * Move khelpcenter4 from Recommends to Suggests (LP: #321361). + + -- Alessio Treglia Wed, 28 Jan 2009 08:11:17 +0100 + rosegarden (1:1.7.2-2) unstable; urgency=low * fix debian/rules so build-arch doesn't build arch-indep package and @@ -11,6 +24,16 @@ -- Mike O'Connor Thu, 15 Jan 2009 16:33:03 -0500 +rosegarden (1:1.7.2-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: LP: #313399 + - Add usr/share/doc/kde/HTML to rosegarden-data, to provide online + help documentation. + - Change fftw3-dev to libfftw3-dev + - Recommend khelpcenter4 instead of khelpcenter. + + -- Bhavani Shankar Sat, 03 Jan 2009 13:33:41 +0530 + rosegarden (1:1.7.2-1) unstable; urgency=low * New upstream release @@ -18,6 +41,16 @@ -- Mike O'Connor Wed, 31 Dec 2008 11:52:51 -0500 +rosegarden (1:1.7.1-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Add usr/share/doc/kde/HTML to rosegarden-data, to provide online + help documentation. + - Change fftw3-dev to libfftw3-dev. + - Recommend khelpcenter4 instead of khelpcenter. + + -- Luke Yelavich Thu, 20 Nov 2008 06:08:19 +1100 + rosegarden (1:1.7.1-1) unstable; urgency=low * New upstream release @@ -26,6 +59,29 @@ -- Free Ekanayaka Sat, 30 Aug 2008 07:37:05 +0100 +rosegarden (1:1.7.0-1ubuntu3) intrepid; urgency=low + + * debian/rules: Depend on khelpcenter4 instead of the obsolete + khelpcenter. + + -- Steve Langasek Wed, 24 Sep 2008 09:40:44 +0000 + +rosegarden (1:1.7.0-1ubuntu2) intrepid; urgency=low + + * Rebuild for liblo0 -> liblo transition (LP: #254734) + + -- Riccardo Coccioli Mon, 04 Aug 2008 19:08:50 +0200 + +rosegarden (1:1.7.0-1ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. (LP: #225849) Remaining Ubuntu changes: + - Add usr/share/doc/kde/HTML to rosegarden-data, to provide online + help documentation. + - Change fftw3-dev to libfftw3-dev. + - Update maintainer field as per spec. + + -- Stefan Ebner Fri, 02 May 2008 00:33:44 +0200 + rosegarden (1:1.7.0-1) unstable; urgency=low * New upstream release @@ -45,6 +101,16 @@ -- Mike O'Connor Sat, 22 Mar 2008 09:14:25 -0400 +rosegarden (1:1.6.1-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Add usr/share/doc/kde/HTML to rosegarden-data, to provide online + help documentation. + - Change fftw3-dev to libfftw3-dev. + - Update maintainer field as per spec. + + -- Ubuntu Merge-o-Matic Mon, 24 Dec 2007 21:51:51 +0000 + rosegarden (1:1.6.1-1) unstable; urgency=low * New upstream release (Closes: 457007) @@ -55,6 +121,22 @@ -- Mike O'Connor Fri, 21 Dec 2007 08:15:32 -0500 +rosegarden (1:1.6.0-1ubuntu2) hardy; urgency=low + + * Change fftw3-dev to libfftw3-dev. + + -- Steve Kowalik Wed, 19 Dec 2007 22:19:04 +1100 + +rosegarden (1:1.6.0-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable, remaining changes: + Add usr/share/doc/kde/HTML to rosegarden-data, to provide online + help documentation. + debian/control: + + Update maintainer field. + + -- Michele Angrisano Thu, 13 Dec 2007 16:09:44 +0100 + rosegarden (1:1.6.0-1) unstable; urgency=low * New upstream version (Closes: #454824) @@ -66,6 +148,15 @@ -- Mike O'Connor Sun, 09 Dec 2007 15:22:35 -0500 +rosegarden (1:1.5.1-3ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Add usr/share/doc/kde/HTML/ to rosegarden-data, to provide online + help documentation. + - Update maintainer field in debian/control. + + -- Michele Angrisano Fri, 20 Jul 2007 14:52:39 +0200 + rosegarden (1:1.5.1-3) unstable; urgency=low * applying patch from Martin Michlmayr for gcc 4.2 (Closes: #421327) @@ -77,6 +168,15 @@ -- Free Ekanayaka Thu, 19 Jul 2007 02:08:24 +0200 +rosegarden (1:1.5.1-2ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Add usr/share/doc/kde/HTML/ to rosegarden-data, to provide online + help documentation. + - Changed maintainer field to MOTU. + + -- Luke Yelavich Sun, 6 May 2007 20:26:54 +1000 + rosegarden (1:1.5.1-2) unstable; urgency=low * Updated README.Debian (Closes: 392181) @@ -118,6 +218,14 @@ -- Free Ekanayaka Wed, 7 Feb 2007 10:36:44 +0000 +rosegarden (1:1.4.0-1ubuntu1) feisty; urgency=low + + * Add usr/share/doc/kde/HTML/ to rosegarden-data, to provide online + help documentation. (Closes LP: #77079) + * Changed maintainer field to MOTU. + + -- Luke Yelavich Fri, 16 Mar 2007 17:21:16 +1100 + rosegarden (1:1.4.0-1) unstable; urgency=low * New upstream version (Closes: 385658) diff -u rosegarden-1.7.2/debian/rosegarden-data.install rosegarden-1.7.2/debian/rosegarden-data.install --- rosegarden-1.7.2/debian/rosegarden-data.install +++ rosegarden-1.7.2/debian/rosegarden-data.install @@ -3,0 +4 @@ +debian/tmp/usr/share/doc/kde/HTML/ diff -u rosegarden-1.7.2/debian/control rosegarden-1.7.2/debian/control --- rosegarden-1.7.2/debian/control +++ rosegarden-1.7.2/debian/control @@ -1,9 +1,10 @@ Source: rosegarden Section: sound -Priority: extra -Maintainer: Debian Multimedia Team +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Multimedia Team Uploaders: Mike O'Connor , Free Ekanayaka -Build-Depends: debhelper (>> 5.0.0), cmake, kdelibs4-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo0-dev (>= 0.7), libxft-dev, dpatch, fftw3-dev +Build-Depends: debhelper (>> 5.0.0), cmake, kdelibs4-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo0-dev (>= 0.7), libxft-dev, dpatch, libfftw3-dev Standards-Version: 3.8.0 Homepage: http://www.rosegardenmusic.com/ Vcs-Svn: svn://svn.debian.org/demudi/rosegarden/trunk/ @@ -15,8 +16,8 @@ Replaces: rosegarden4,rosegarden2 Provides: rosegarden4,rosegarden2 Conflicts: rosegarden4 (<< 1:1.2.3), rosegarden2 (<< 1:1.2.3) -Recommends: jackd, lilypond, swh-plugins | ladspa-plugin, khelpcenter -Suggests: qjackctl +Recommends: jackd, lilypond, swh-plugins | ladspa-plugin +Suggests: qjackctl, khelpcenter4 Description: music editor and MIDI/audio sequencer Rosegarden is a KDE application which provides a mixed Audio/MIDI sequencer (for playback and recording), a multi-track editor, music