diff -Nru gegl-0.2.0/debian/changelog gegl-0.2.0/debian/changelog --- gegl-0.2.0/debian/changelog 2014-09-08 10:36:30.000000000 +0200 +++ gegl-0.2.0/debian/changelog 2015-02-16 23:32:15.000000000 +0100 @@ -1,3 +1,17 @@ +gegl (0.2.0-7ubuntu1) vivid; urgency=low + + * Merge from Debian unstable. (LP: #1422514) Remaining changes: + - debian/control: + + Drop Build-Depends on libopenraw-dev (in universe). + + Drop Build-Depends on libavcodec-dev + (can't be shipped on the CDs). + + Drop Build-Depends on libavformat-dev, otherwise + libavcodec-dev is still pulled in. + - debian/patches/ruby1.9.diff: + + Fix build failure with ruby1.9. + + -- Artur Rona Mon, 16 Feb 2015 23:32:13 +0100 + gegl (0.2.0-7) unstable; urgency=medium * debian/control: libblas-dev b-dep added (Closes: #760821) @@ -21,6 +35,18 @@ -- Matteo F. Vescovi Tue, 06 May 2014 08:23:57 +0200 +gegl (0.2.0-4ubuntu1) trusty; urgency=medium + + * Merge with Debian; remaining changes: + - Drop Build-Depends on libopenraw-dev (in universe). + - Drop Build-Depends on libavcodec-dev (can't be shipped on the CDs). + - Drop Build-Depends on libavformat-dev, otherwise libavcodec-dev is + still pulled in. + * Build using dh-autoreconf. + * Fix build failure with ruby1.9. + + -- Matthias Klose Sat, 28 Dec 2013 20:27:39 +0100 + gegl (0.2.0-4) unstable; urgency=low * debian/patches/: patchset updated @@ -30,6 +56,23 @@ -- Matteo F. Vescovi Mon, 09 Sep 2013 17:40:09 +0200 +gegl (0.2.0-3ubuntu2) trusty; urgency=medium + + * Rebuild for suitesparse 4.2.1. + + -- Colin Watson Mon, 23 Dec 2013 14:14:19 +0000 + +gegl (0.2.0-3ubuntu1) saucy; urgency=low + + * Sync with Debiam unstable (LP: #1189536). Remaining changes: + - debian/control: + + Drop Build-Depends on libopenraw-dev (in universe). + + Drop Build-Depends on libavcodec-dev (can't be shipped on the CDs). + + Drop Build-Depends on libavformat-dev, otherwise libavcodec-dev is + still pulled in. + + -- Jeremy Bicha Mon, 10 Jun 2013 12:06:21 -0400 + gegl (0.2.0-3) unstable; urgency=low * debian/control: bump of valac b-dep version (Closes: #709736) diff -Nru gegl-0.2.0/debian/control gegl-0.2.0/debian/control --- gegl-0.2.0/debian/control 2014-09-08 10:36:08.000000000 +0200 +++ gegl-0.2.0/debian/control 2015-02-16 22:45:25.000000000 +0100 @@ -1,15 +1,16 @@ Source: gegl Section: libs Priority: optional -Maintainer: Matteo F. Vescovi +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Matteo F. Vescovi Build-Depends: dh-autoreconf, cdbs (>= 0.4.93~), debhelper (>= 9), gnome-pkg-tools, gtk-doc-tools (>= 1.0), intltool (>= 0.40.1), - libavcodec-dev, - libavformat-dev, +# libavcodec-dev, +# libavformat-dev, libbabl-dev (>= 0.1.10), libblas-dev, libcairo2-dev, @@ -20,7 +21,7 @@ libjasper-dev (>= 1.900.1), libjpeg-dev, libopenexr-dev, - libopenraw-dev (>= 0.0.5), +# libopenraw-dev (>= 0.0.5), libpango1.0-dev, libpng-dev, librsvg2-dev (>= 2.14.0), diff -Nru gegl-0.2.0/debian/patches/ruby1.9.diff gegl-0.2.0/debian/patches/ruby1.9.diff --- gegl-0.2.0/debian/patches/ruby1.9.diff 1970-01-01 01:00:00.000000000 +0100 +++ gegl-0.2.0/debian/patches/ruby1.9.diff 2013-12-28 20:52:43.000000000 +0100 @@ -0,0 +1,14 @@ +--- gegl-0.2.0.orig/tools/create-reference.rb ++++ gegl-0.2.0/tools/create-reference.rb +@@ -5,6 +5,11 @@ + # Use under a public domain license. + # + ++if RUBY_VERSION =~ /1.9/ ++Encoding.default_external = Encoding::UTF_8 ++Encoding.default_internal = Encoding::UTF_8 ++end ++ + class Argument + attr_accessor :name, :data_type, :doc + def initialize diff -Nru gegl-0.2.0/debian/patches/series gegl-0.2.0/debian/patches/series --- gegl-0.2.0/debian/patches/series 2014-09-04 17:19:16.000000000 +0200 +++ gegl-0.2.0/debian/patches/series 2014-09-08 18:21:34.000000000 +0200 @@ -1,2 +1,3 @@ 0001-Fix_CVE-2012-4433.patch 0002-Port_gegl_forward_to_libav54.patch +ruby1.9.diff