diff -Nru gegl-0.2.0/debian/changelog gegl-0.2.0/debian/changelog --- gegl-0.2.0/debian/changelog 2013-12-28 20:53:09.000000000 +0100 +++ gegl-0.2.0/debian/changelog 2015-02-16 23:32:15.000000000 +0100 @@ -1,3 +1,40 @@ +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) + + -- Matteo F. Vescovi Mon, 08 Sep 2014 10:36:25 +0200 + +gegl (0.2.0-6) unstable; urgency=medium + + * debian/watch: ftp:// => http:// + * debian/rules: parallel building enabled. (Closes: #759127) + Thanks to Pino Toscano (pino) for the patch. + + -- Matteo F. Vescovi Mon, 25 Aug 2014 15:12:36 +0200 + +gegl (0.2.0-5) unstable; urgency=medium + + * debian/: dh-autoreconf usage added (Closes: #747137) + Thanks to Fernando Seiti Furusato for the patch. + * debian/control: S-V bump 3.9.4 => 3.9.5 (no changes needed) + * debian/control: Maintainer e-mail address updated + + -- Matteo F. Vescovi Tue, 06 May 2014 08:23:57 +0200 + gegl (0.2.0-4ubuntu1) trusty; urgency=medium * Merge with Debian; remaining changes: diff -Nru gegl-0.2.0/debian/control gegl-0.2.0/debian/control --- gegl-0.2.0/debian/control 2013-12-28 20:43:16.000000000 +0100 +++ gegl-0.2.0/debian/control 2015-02-16 22:45:25.000000000 +0100 @@ -2,17 +2,17 @@ Section: libs Priority: optional Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Matteo F. Vescovi -Build-Depends: autotools-dev, +XSBC-Original-Maintainer: Matteo F. Vescovi +Build-Depends: dh-autoreconf, cdbs (>= 0.4.93~), debhelper (>= 9), - dh-autoreconf, gnome-pkg-tools, gtk-doc-tools (>= 1.0), intltool (>= 0.40.1), # libavcodec-dev, # libavformat-dev, libbabl-dev (>= 0.1.10), + libblas-dev, libcairo2-dev, libexiv2-dev, libgdk-pixbuf2.0-dev (>= 2.18.0), @@ -30,7 +30,7 @@ libsuitesparse-dev, pkg-config, valac (>= 0.20) -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: http://gegl.org/ Vcs-Git: git://anonscm.debian.org/collab-maint/gegl.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/gegl.git diff -Nru gegl-0.2.0/debian/rules gegl-0.2.0/debian/rules --- gegl-0.2.0/debian/rules 2013-12-28 20:43:31.000000000 +0100 +++ gegl-0.2.0/debian/rules 2015-02-16 23:25:34.000000000 +0100 @@ -3,10 +3,10 @@ GNOME_DOWNLOAD_URL = ftp://ftp.gimp.org/pub/$(GNOME_MODULE)/$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/$(GNOME_TARBALL) TARBALL_EXT := tar.bz2 -include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/autoreconf.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk export LDFLAGS += -Wl,--as-needed @@ -20,6 +20,8 @@ --disable-mmx \ --disable-sse +DEB_BUILD_PARALLEL = 1 + binary-install/libgegl-doc:: find debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ -name Makefile\* -delete find debian/$(cdbs_curpkg)/usr/share/gtk-doc -type f -exec chmod -x {} \; diff -Nru gegl-0.2.0/debian/watch gegl-0.2.0/debian/watch --- gegl-0.2.0/debian/watch 2013-09-10 17:33:13.000000000 +0200 +++ gegl-0.2.0/debian/watch 2014-09-08 18:21:34.000000000 +0200 @@ -1,2 +1,2 @@ version=3 -ftp://ftp.gtk.org/pub/gegl/([\d\.]+)/gegl-(.+)\.tar\.bz2 +http://ftp.gtk.org/pub/gegl/([\d\.]+)/gegl-(.+)\.tar\.bz2