diff -Nru zenity-3.8.0/debian/changelog zenity-3.8.0/debian/changelog --- zenity-3.8.0/debian/changelog 2013-05-25 15:06:32.000000000 -0700 +++ zenity-3.8.0/debian/changelog 2014-03-23 00:09:50.000000000 -0700 @@ -1,3 +1,9 @@ +zenity (3.8.0-1ubuntu1) trusty; urgency=medium + + * Import upstream patch to fix single-line issue (LP: #1296191) + + -- Scott Ritchie Sat, 22 Mar 2014 19:58:21 -0700 + zenity (3.8.0-1) unstable; urgency=low * New upstream release. diff -Nru zenity-3.8.0/debian/control zenity-3.8.0/debian/control --- zenity-3.8.0/debian/control 2013-05-25 15:07:50.000000000 -0700 +++ zenity-3.8.0/debian/control 2014-03-23 00:17:22.000000000 -0700 @@ -2,12 +2,12 @@ # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. - Source: zenity Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Emilio Pozuelo Monfort , Frederic Peters , Jordi Mallach , Laurent Bigonville , Michael Biebl +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers , Frederic Peters , Jordi Mallach , Laurent Bigonville , Michael Biebl Build-Depends: debhelper (>= 9), cdbs (>= 0.4.4), gnome-pkg-tools (>= 0.10), diff -Nru zenity-3.8.0/debian/control.in zenity-3.8.0/debian/control.in --- zenity-3.8.0/debian/control.in 2013-05-25 14:58:34.000000000 -0700 +++ zenity-3.8.0/debian/control.in 2014-03-23 00:16:44.000000000 -0700 @@ -1,7 +1,8 @@ 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), diff -Nru zenity-3.8.0/debian/patches/series zenity-3.8.0/debian/patches/series --- zenity-3.8.0/debian/patches/series 2013-05-25 14:52:10.000000000 -0700 +++ zenity-3.8.0/debian/patches/series 2014-03-23 00:12:12.000000000 -0700 @@ -1 +1,2 @@ 01_dont_quit_zenity_when_stdin_ends.patch +zenity-fixheight.patch diff -Nru zenity-3.8.0/debian/patches/zenity-fixheight.patch zenity-3.8.0/debian/patches/zenity-fixheight.patch --- zenity-3.8.0/debian/patches/zenity-fixheight.patch 1969-12-31 16:00:00.000000000 -0800 +++ zenity-3.8.0/debian/patches/zenity-fixheight.patch 2014-03-23 00:12:12.000000000 -0700 @@ -0,0 +1,20 @@ +From 80bc8ce643979fec201c4ebd5cd6405b6310357f Mon Sep 17 00:00:00 2001 +From: Arx Cruz +Date: Thu, 10 Oct 2013 19:52:38 +0000 +Subject: But #702535 - List box doesn't expand to fill window + +--- +diff --git a/src/zenity.ui b/src/zenity.ui +index ee89093..7c0ab1f 100644 +--- a/src/zenity.ui ++++ b/src/zenity.ui +@@ -1021,6 +1021,7 @@ + True + True + in ++ True + + + True +-- +cgit v0.9.2