diff -Nru blends-0.6.10/debian/changelog blends-0.6.10ubuntu1/debian/changelog --- blends-0.6.10/debian/changelog 2010-01-27 13:29:53.000000000 +0100 +++ blends-0.6.10ubuntu1/debian/changelog 2010-02-13 20:11:51.000000000 +0100 @@ -1,3 +1,12 @@ +blends (0.6.10ubuntu1) lucid; urgency=low + + * Merge with Debian. Remaining changes: + - Add sources.list.karmic and sources.list.lucid so blends ban be built + for Ubuntu 9.10 and 10.04. + - Add ghostscript as build dependency. + + -- 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 @@ -17,6 +26,13 @@ dependencies -- 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 @@ -27,6 +43,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 @@ -45,6 +69,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.10/debian/control blends-0.6.10ubuntu1/debian/control --- blends-0.6.10/debian/control 2010-01-18 23:04:41.000000000 +0100 +++ blends-0.6.10ubuntu1/debian/control 2010-02-13 19:58:56.000000000 +0100 @@ -1,14 +1,15 @@ 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 , José L. Redrejo Rodríguez , Jonas Smedegaard Build-Depends: debhelper (>= 7) -Build-Depends-Indep: debiandoc-sgml, texlive-latex-base, texlive-latex-extra, +Build-Depends-Indep: debiandoc-sgml, ghostscript, texlive-latex-base, texlive-latex-extra, texlive-latex-recommended, texlive-fonts-recommended Standards-Version: 3.8.3 Vcs-Browser: http://svn.debian.org/wsvn/blends/blends/trunk/blends/?rev=0&sc=0 diff -Nru blends-0.6.10/sources.list.karmic blends-0.6.10ubuntu1/sources.list.karmic --- blends-0.6.10/sources.list.karmic 1970-01-01 01:00:00.000000000 +0100 +++ blends-0.6.10ubuntu1/sources.list.karmic 2010-02-13 19:21:44.000000000 +0100 @@ -0,0 +1 @@ +deb http://archive.ubuntu.com/ubuntu/ karmic main universe diff -Nru blends-0.6.10/sources.list.lucid blends-0.6.10ubuntu1/sources.list.lucid --- blends-0.6.10/sources.list.lucid 1970-01-01 01:00:00.000000000 +0100 +++ blends-0.6.10ubuntu1/sources.list.lucid 2010-02-13 19:21:48.000000000 +0100 @@ -0,0 +1 @@ +deb http://archive.ubuntu.com/ubuntu/ lucid main universe