diffstat of debian/ for zenity_3.18.1.1-1 zenity_3.18.1.1-1ubuntu2co1 changelog | 27 +++++++++++++++++++++++++++ control | 7 +++++-- control.in | 5 ++++- rules | 3 +++ 4 files changed, 39 insertions(+), 3 deletions(-) diff -Nru zenity-3.18.1.1/debian/changelog zenity-3.18.1.1/debian/changelog --- zenity-3.18.1.1/debian/changelog 2015-10-17 19:39:18.000000000 +0000 +++ zenity-3.18.1.1/debian/changelog 2016-07-20 17:18:10.000000000 +0000 @@ -1,3 +1,30 @@ +zenity (3.18.1.1-1ubuntu2co1) 16.06; urgency=medium + + * Build with with --disable-webkitgtk. + We do not want to pull in webkit2 as dependency yet. + (Apertis: T2232) + + -- Andrew Lee (李健秋) Thu, 21 Jul 2016 00:07:57 +0800 + +zenity (3.18.1.1-1ubuntu2) xenial; urgency=medium + + * debian/control{,.in}, debian/patches/ubuntu_use_webkit1.patch: Drop patch, + switch to webkit2. + + -- Iain Lane Tue, 12 Jan 2016 17:59:39 +0000 + +zenity (3.18.1.1-1ubuntu1) xenial; urgency=medium + + * Resynchronize with Debian, remaining changes + * debian/control.in: + - Build-Depends on dh-autoreconf and gnome-common + * debian/patches/ubuntu_use_webkit1.patch: + - revert use of webkit2 which is not in main yet + * debian/rules: + - use dh-autoreconf rule + + -- Sebastien Bacher Fri, 23 Oct 2015 11:26:25 +0200 + zenity (3.18.1.1-1) unstable; urgency=medium * New upstream release. diff -Nru zenity-3.18.1.1/debian/control zenity-3.18.1.1/debian/control --- zenity-3.18.1.1/debian/control 2015-10-17 19:39:46.000000000 +0000 +++ zenity-3.18.1.1/debian/control 2016-07-20 17:18:25.000000000 +0000 @@ -5,10 +5,13 @@ Source: zenity Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Jordi Mallach , Laurent Bigonville , Michael Biebl +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers , Laurent Bigonville , Michael Biebl Build-Depends: debhelper (>= 9), cdbs (>= 0.4.4), + dh-autoreconf, + gnome-common, gnome-pkg-tools (>= 0.10), yelp-tools, intltool (>= 0.40.0), diff -Nru zenity-3.18.1.1/debian/control.in zenity-3.18.1.1/debian/control.in --- zenity-3.18.1.1/debian/control.in 2015-10-10 00:49:32.000000000 +0000 +++ zenity-3.18.1.1/debian/control.in 2016-01-12 17:59:05.000000000 +0000 @@ -1,10 +1,13 @@ Source: zenity Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: debhelper (>= 9), cdbs (>= 0.4.4), + dh-autoreconf, + gnome-common, gnome-pkg-tools (>= 0.10), yelp-tools, intltool (>= 0.40.0), diff -Nru zenity-3.18.1.1/debian/rules zenity-3.18.1.1/debian/rules --- zenity-3.18.1.1/debian/rules 2015-05-18 23:15:05.000000000 +0000 +++ zenity-3.18.1.1/debian/rules 2016-07-20 16:07:55.000000000 +0000 @@ -1,5 +1,6 @@ #!/usr/bin/make -f +include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/utils.mk @@ -9,3 +10,5 @@ LDFLAGS += -Wl,-O1 -Wl,-z,defs -Wl,--as-needed DEB_DH_INSTALL_ARGS += --list-missing + +DEB_CONFIGURE_EXTRA_FLAGS := --disable-webkitgtk