diff -Nru blends-0.6.14/debian/changelog blends-0.6.14ubuntu1/debian/changelog --- blends-0.6.14/debian/changelog 2010-08-03 13:38:40.000000000 +0530 +++ blends-0.6.14ubuntu1/debian/changelog 2010-08-04 11:42:20.000000000 +0530 @@ -1,3 +1,12 @@ +blends (0.6.14ubuntu1) maverick; urgency=low + + * Merge from Debian unstable(LP: #613318). Remaining changes: + - Add sources.list.karmic and sources.list.lucid so blends ban be built + for Ubuntu 9.10 and 10.04. + - Add sources.list.maverick + + -- Bhavani Shankar Wed, 04 Aug 2010 11:41:01 +0530 + blends (0.6.14) unstable; urgency=low * doc/en: Updated documentation about webtools @@ -7,6 +16,16 @@ -- Andreas Tille Tue, 03 Aug 2010 10:03:45 +0200 +blends (0.6.13ubuntu1) maverick; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Add sources.list.karmic and sources.list.lucid so blends ban be built + for Ubuntu 9.10 and 10.04. + * Added sources.list.maverick + + -- Fabrice Coutadeur Tue, 18 May 2010 19:30:16 +0000 + + blends (0.6.13) unstable; urgency=low * Do not use explicite PATH to blend-update-menus to avoid @@ -32,6 +51,16 @@ -- Andreas Tille Mon, 15 Feb 2010 08:40:54 +0100 +blends (0.6.10ubuntu1) lucid; urgency=low + + * Merge with Debian (LP: #521455). Remaining changes: + - Add sources.list.karmic and sources.list.lucid so blends ban be built + for Ubuntu 9.10 and 10.04. + * debian/control: Add ghostscript as build dependency to fix "ERROR: thumbnail + images could not be generated properly" error. + + -- Leo Iannacone Sat, 13 Feb 2010 19:22:03 +0100 + blends (0.6.10) unstable; urgency=low * rm debian/blends-dev.preinst = do not try to take over config @@ -52,6 +81,14 @@ -- Andreas Tille Mon, 11 Jan 2010 19:23:04 +0100 +blends (0.6.8ubuntu1) lucid; urgency=low + + * Merge from Debian Testing. Remaining changes: + - Add sources.list.karmic and sources.list.lucid so blends ban be built + for Ubuntu 9.10 and 10.04 + + -- Scott Kitterman Tue, 22 Dec 2009 00:30:56 -0500 + blends (0.6.8) unstable; urgency=low * templates/config.postinst: Really fix the problem of missing @@ -61,6 +98,14 @@ -- Andreas Tille Mon, 09 Nov 2009 11:59:52 +0100 +blends (0.6.7ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: + - Add sources.list.karmic and sources.list.lucid so blends ban be built + for Ubuntu 9.10 and 10.04 + + -- Scott Kitterman Sun, 29 Nov 2009 00:27:25 -0500 + blends (0.6.7) unstable; urgency=low * Better documentation how to generate tasks pages @@ -79,6 +124,12 @@ -- Andreas Tille Wed, 04 Nov 2009 22:25:05 +0100 +blends (0.6.6ubuntu1) karmic; urgency=low + + * Add sources.list.karmic so blends can be built for Ubuntu Karmic + + -- Scott Kitterman Sun, 30 Aug 2009 11:23:01 -0400 + blends (0.6.6) unstable; urgency=low * Fixing some links in the documentation which is addressed by bug diff -Nru blends-0.6.14/debian/control blends-0.6.14ubuntu1/debian/control --- blends-0.6.14/debian/control 2010-08-03 13:38:48.000000000 +0530 +++ blends-0.6.14ubuntu1/debian/control 2010-08-04 11:37:38.000000000 +0530 @@ -1,7 +1,8 @@ Source: blends Priority: optional Section: devel -Maintainer: Debian Pure Blend Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Pure Blend Team Uploaders: Petter Reinholdtsen , Andreas Tille , Cosimo Alfarano , diff -Nru blends-0.6.14/sources.list.karmic blends-0.6.14ubuntu1/sources.list.karmic --- blends-0.6.14/sources.list.karmic 1970-01-01 05:30:00.000000000 +0530 +++ blends-0.6.14ubuntu1/sources.list.karmic 2010-08-04 11:37:38.000000000 +0530 @@ -0,0 +1 @@ +deb http://archive.ubuntu.com/ubuntu/ karmic main universe diff -Nru blends-0.6.14/sources.list.lucid blends-0.6.14ubuntu1/sources.list.lucid --- blends-0.6.14/sources.list.lucid 1970-01-01 05:30:00.000000000 +0530 +++ blends-0.6.14ubuntu1/sources.list.lucid 2010-08-04 11:37:38.000000000 +0530 @@ -0,0 +1 @@ +deb http://archive.ubuntu.com/ubuntu/ lucid main universe diff -Nru blends-0.6.14/sources.list.maverick blends-0.6.14ubuntu1/sources.list.maverick --- blends-0.6.14/sources.list.maverick 1970-01-01 05:30:00.000000000 +0530 +++ blends-0.6.14ubuntu1/sources.list.maverick 2010-08-04 11:37:38.000000000 +0530 @@ -0,0 +1 @@ +deb http://archive.ubuntu.com/ubuntu/ maverick main universe