diff -Nru debconf-1.5.58ubuntu1/debian/changelog debconf-1.5.59ubuntu1/debian/changelog --- debconf-1.5.58ubuntu1/debian/changelog 2015-11-10 02:50:27.000000000 +0000 +++ debconf-1.5.59ubuntu1/debian/changelog 2016-04-27 02:32:00.000000000 +0000 @@ -1,3 +1,24 @@ +debconf (1.5.59ubuntu1) yakkety; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Gnome.pm: Do not show "Cancel" or "Close" buttons, to avoid breaking + maintainer scripts. + * Dropped changes: + - Do not generate Ui_DebconfWizard.pm at build time, use a pre-generated + copy instead. Delta no longer needed as build dependencies in universe + are now allowed. + + -- Steve Langasek Tue, 26 Apr 2016 19:31:02 -0700 + +debconf (1.5.59) unstable; urgency=medium + + * Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb. + * Set source format to 3.0 (native). + * frontend: Load templates when we're being run from any maintainer + script, not just preinst/postinst (closes: #817083). + + -- Colin Watson Fri, 11 Mar 2016 10:59:28 +0000 + debconf (1.5.58ubuntu1) xenial; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru debconf-1.5.58ubuntu1/debian/control debconf-1.5.59ubuntu1/debian/control --- debconf-1.5.58ubuntu1/debian/control 2015-11-10 20:41:09.000000000 +0000 +++ debconf-1.5.59ubuntu1/debian/control 2016-04-27 02:44:15.000000000 +0000 @@ -5,11 +5,10 @@ XSBC-Original-Maintainer: Debconf Developers Uploaders: Colin Watson Standards-Version: 3.9.5 -Build-Depends-Indep: perl (>= 5.10.0-16), python (>= 2.6.6-3~), python3 (>= 3.1.2-8), gettext (>= 0.13), libintl-perl +Build-Depends-Indep: perl (>= 5.10.0-16), python (>= 2.6.6-3~), python3 (>= 3.1.2-8), gettext (>= 0.13), libintl-perl, libqtgui4-perl Build-Depends: debhelper (>= 8.1.0~), po-debconf, po4a (>= 0.23) -XS-Debian-Vcs-Git: git://anonscm.debian.org/debconf/debconf.git -XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debconf/debconf.git;a=summary -Vcs-Bzr: http://bazaar.launchpad.net/+branch/ubuntu/debconf +Vcs-Git: https://anonscm.debian.org/git/debconf/debconf.git +Vcs-Browser: https://anonscm.debian.org/cgit/debconf/debconf.git X-Python-Version: >= 2.6 Package: debconf diff -Nru debconf-1.5.58ubuntu1/debian/source/format debconf-1.5.59ubuntu1/debian/source/format --- debconf-1.5.58ubuntu1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ debconf-1.5.59ubuntu1/debian/source/format 2016-01-27 11:00:13.000000000 +0000 @@ -0,0 +1 @@ +3.0 (native) diff -Nru debconf-1.5.58ubuntu1/frontend debconf-1.5.59ubuntu1/frontend --- debconf-1.5.58ubuntu1/frontend 2015-11-08 10:09:54.000000000 +0000 +++ debconf-1.5.59ubuntu1/frontend 2016-03-11 16:09:43.000000000 +0000 @@ -96,6 +96,15 @@ $frontend->default_title($package) if length $package and !$no_title; $frontend->info(undef); +# Load any associated templates if we're being run from a package maintainer +# script. +if ($ARGV[0] =~/^(.*[.\/])(?:preinst|postinst|prerm|postrm)$/) { + my $base=$1; + my $templates=$base."templates"; + Debconf::Template->load($templates, $package) + if -e $templates; +} + # See if the preinst or postinst of the package is being run, and if there # is a config script associated with this package. If so, run it first as a # confmodule (also loading the templates). This is a bit of a nasty hack, that @@ -106,11 +115,6 @@ if ($ARGV[0] =~/^(.*[.\/])(?:postinst|preinst)$/) { my $base=$1; - # Load templates, if any. - my $templates=$base."templates"; - Debconf::Template->load($templates, $package) - if -e $templates; - # Run config script, if any. my $config=$base."config"; if (-e $config) { diff -Nru debconf-1.5.58ubuntu1/Makefile debconf-1.5.59ubuntu1/Makefile --- debconf-1.5.58ubuntu1/Makefile 2015-11-08 10:09:54.000000000 +0000 +++ debconf-1.5.59ubuntu1/Makefile 2016-04-27 02:43:00.000000000 +0000 @@ -49,7 +49,7 @@ # This one is the ultimate backup copy. grep -v '^#' debconf.conf > $(prefix)/usr/share/debconf/debconf.conf #build the Qt ui file - -cd $(CURDIR)/Debconf/FrontEnd/Kde/ && bash generateui.sh + cd $(CURDIR)/Debconf/FrontEnd/Kde/ && bash generateui.sh # Make module directories. find Debconf -type d |grep -v CVS | \ xargs -i install -d $(prefix)/usr/share/perl5/{} diff -Nru debconf-1.5.58ubuntu1/po/ar.po debconf-1.5.59ubuntu1/po/ar.po --- debconf-1.5.58ubuntu1/po/ar.po 2015-11-08 10:09:58.000000000 +0000 +++ debconf-1.5.59ubuntu1/po/ar.po 2016-04-27 02:45:05.000000000 +0000 @@ -320,6 +320,13 @@ #: ../dpkg-reconfigure:99 #, fuzzy +#| msgid "" +#| "Usage: dpkg-reconfigure [options] packages\n" +#| " -a, --all\t\t\tReconfigure all packages.\n" +#| " -u, --unseen-only\t\tShow only not yet seen questions.\n" +#| " --default-priority\tUse default priority instead of low.\n" +#| " --force\t\t\tForce reconfiguration of broken packages.\n" +#| " --no-reload\t\tDo not reload templates. (Use with caution.)" msgid "" "Usage: dpkg-reconfigure [options] packages\n" " -u, --unseen-only\t\tShow only not yet seen questions.\n" diff -Nru debconf-1.5.58ubuntu1/po/ast.po debconf-1.5.59ubuntu1/po/ast.po --- debconf-1.5.58ubuntu1/po/ast.po 2015-11-08 10:09:58.000000000 +0000 +++ debconf-1.5.59ubuntu1/po/ast.po 2016-04-27 02:45:05.000000000 +0000 @@ -334,6 +334,13 @@ #: ../dpkg-reconfigure:99 #, fuzzy +#| msgid "" +#| "Usage: dpkg-reconfigure [options] packages\n" +#| " -a, --all\t\t\tReconfigure all packages.\n" +#| " -u, --unseen-only\t\tShow only not yet seen questions.\n" +#| " --default-priority\tUse default priority instead of low.\n" +#| " --force\t\t\tForce reconfiguration of broken packages.\n" +#| " --no-reload\t\tDo not reload templates. (Use with caution.)" msgid "" "Usage: dpkg-reconfigure [options] packages\n" " -u, --unseen-only\t\tShow only not yet seen questions.\n" diff -Nru debconf-1.5.58ubuntu1/po/bn.po debconf-1.5.59ubuntu1/po/bn.po --- debconf-1.5.58ubuntu1/po/bn.po 2015-11-08 10:09:57.000000000 +0000 +++ debconf-1.5.59ubuntu1/po/bn.po 2016-04-27 02:45:05.000000000 +0000 @@ -316,6 +316,13 @@ #: ../dpkg-reconfigure:99 #, fuzzy +#| msgid "" +#| "Usage: dpkg-reconfigure [options] packages\n" +#| " -a, --all\t\t\tReconfigure all packages.\n" +#| " -u, --unseen-only\t\tShow only not yet seen questions.\n" +#| " --default-priority\tUse default priority instead of low.\n" +#| " --force\t\t\tForce reconfiguration of broken packages.\n" +#| " --no-reload\t\tDo not reload templates. (Use with caution.)" msgid "" "Usage: dpkg-reconfigure [options] packages\n" " -u, --unseen-only\t\tShow only not yet seen questions.\n" diff -Nru debconf-1.5.58ubuntu1/po/fi.po debconf-1.5.59ubuntu1/po/fi.po --- debconf-1.5.58ubuntu1/po/fi.po 2015-11-08 10:09:58.000000000 +0000 +++ debconf-1.5.59ubuntu1/po/fi.po 2016-04-27 02:45:05.000000000 +0000 @@ -325,6 +325,13 @@ #: ../dpkg-reconfigure:99 #, fuzzy +#| msgid "" +#| "Usage: dpkg-reconfigure [options] packages\n" +#| " -a, --all\t\t\tReconfigure all packages.\n" +#| " -u, --unseen-only\t\tShow only not yet seen questions.\n" +#| " --default-priority\tUse default priority instead of low.\n" +#| " --force\t\t\tForce reconfiguration of broken packages.\n" +#| " --no-reload\t\tDo not reload templates. (Use with caution.)" msgid "" "Usage: dpkg-reconfigure [options] packages\n" " -u, --unseen-only\t\tShow only not yet seen questions.\n" diff -Nru debconf-1.5.58ubuntu1/po/gl.po debconf-1.5.59ubuntu1/po/gl.po --- debconf-1.5.58ubuntu1/po/gl.po 2015-11-08 10:09:58.000000000 +0000 +++ debconf-1.5.59ubuntu1/po/gl.po 2016-04-27 02:45:05.000000000 +0000 @@ -332,6 +332,13 @@ #: ../dpkg-reconfigure:99 #, fuzzy +#| msgid "" +#| "Usage: dpkg-reconfigure [options] packages\n" +#| " -a, --all\t\t\tReconfigure all packages.\n" +#| " -u, --unseen-only\t\tShow only not yet seen questions.\n" +#| " --default-priority\tUse default priority instead of low.\n" +#| " --force\t\t\tForce reconfiguration of broken packages.\n" +#| " --no-reload\t\tDo not reload templates. (Use with caution.)" msgid "" "Usage: dpkg-reconfigure [options] packages\n" " -u, --unseen-only\t\tShow only not yet seen questions.\n" diff -Nru debconf-1.5.58ubuntu1/po/he.po debconf-1.5.59ubuntu1/po/he.po --- debconf-1.5.58ubuntu1/po/he.po 2015-11-08 10:09:58.000000000 +0000 +++ debconf-1.5.59ubuntu1/po/he.po 2016-04-27 02:45:05.000000000 +0000 @@ -313,6 +313,13 @@ #: ../dpkg-reconfigure:99 #, fuzzy +#| msgid "" +#| "Usage: dpkg-reconfigure [options] packages\n" +#| " -a, --all\t\t\tReconfigure all packages.\n" +#| " -u, --unseen-only\t\tShow only not yet seen questions.\n" +#| " --default-priority\tUse default priority instead of low.\n" +#| " --force\t\t\tForce reconfiguration of broken packages.\n" +#| " --no-reload\t\tDo not reload templates. (Use with caution.)" msgid "" "Usage: dpkg-reconfigure [options] packages\n" " -u, --unseen-only\t\tShow only not yet seen questions.\n" diff -Nru debconf-1.5.58ubuntu1/po/km.po debconf-1.5.59ubuntu1/po/km.po --- debconf-1.5.58ubuntu1/po/km.po 2015-11-08 10:09:58.000000000 +0000 +++ debconf-1.5.59ubuntu1/po/km.po 2016-04-27 02:45:05.000000000 +0000 @@ -318,6 +318,13 @@ #: ../dpkg-reconfigure:99 #, fuzzy +#| msgid "" +#| "Usage: dpkg-reconfigure [options] packages\n" +#| " -a, --all\t\t\tReconfigure all packages.\n" +#| " -u, --unseen-only\t\tShow only not yet seen questions.\n" +#| " --default-priority\tUse default priority instead of low.\n" +#| " --force\t\t\tForce reconfiguration of broken packages.\n" +#| " --no-reload\t\tDo not reload templates. (Use with caution.)" msgid "" "Usage: dpkg-reconfigure [options] packages\n" " -u, --unseen-only\t\tShow only not yet seen questions.\n" diff -Nru debconf-1.5.58ubuntu1/po/nb.po debconf-1.5.59ubuntu1/po/nb.po --- debconf-1.5.58ubuntu1/po/nb.po 2015-11-08 10:09:58.000000000 +0000 +++ debconf-1.5.59ubuntu1/po/nb.po 2016-04-27 02:45:05.000000000 +0000 @@ -324,6 +324,13 @@ #: ../dpkg-reconfigure:99 #, fuzzy +#| msgid "" +#| "Usage: dpkg-reconfigure [options] packages\n" +#| " -a, --all\t\t\tReconfigure all packages.\n" +#| " -u, --unseen-only\t\tShow only not yet seen questions.\n" +#| " --default-priority\tUse default priority instead of low.\n" +#| " --force\t\t\tForce reconfiguration of broken packages.\n" +#| " --no-reload\t\tDo not reload templates. (Use with caution.)" msgid "" "Usage: dpkg-reconfigure [options] packages\n" " -u, --unseen-only\t\tShow only not yet seen questions.\n" diff -Nru debconf-1.5.58ubuntu1/po/sk.po debconf-1.5.59ubuntu1/po/sk.po --- debconf-1.5.58ubuntu1/po/sk.po 2015-11-08 10:09:58.000000000 +0000 +++ debconf-1.5.59ubuntu1/po/sk.po 2016-04-27 02:45:05.000000000 +0000 @@ -324,6 +324,13 @@ #: ../dpkg-reconfigure:99 #, fuzzy +#| msgid "" +#| "Usage: dpkg-reconfigure [options] packages\n" +#| " -a, --all\t\t\tReconfigure all packages.\n" +#| " -u, --unseen-only\t\tShow only not yet seen questions.\n" +#| " --default-priority\tUse default priority instead of low.\n" +#| " --force\t\t\tForce reconfiguration of broken packages.\n" +#| " --no-reload\t\tDo not reload templates. (Use with caution.)" msgid "" "Usage: dpkg-reconfigure [options] packages\n" " -u, --unseen-only\t\tShow only not yet seen questions.\n" diff -Nru debconf-1.5.58ubuntu1/po/vi.po debconf-1.5.59ubuntu1/po/vi.po --- debconf-1.5.58ubuntu1/po/vi.po 2015-11-08 10:09:58.000000000 +0000 +++ debconf-1.5.59ubuntu1/po/vi.po 2016-04-27 02:45:05.000000000 +0000 @@ -328,6 +328,13 @@ #: ../dpkg-reconfigure:99 #, fuzzy +#| msgid "" +#| "Usage: dpkg-reconfigure [options] packages\n" +#| " -a, --all\t\t\tReconfigure all packages.\n" +#| " -u, --unseen-only\t\tShow only not yet seen questions.\n" +#| " --default-priority\tUse default priority instead of low.\n" +#| " --force\t\t\tForce reconfiguration of broken packages.\n" +#| " --no-reload\t\tDo not reload templates. (Use with caution.)" msgid "" "Usage: dpkg-reconfigure [options] packages\n" " -u, --unseen-only\t\tShow only not yet seen questions.\n" diff -Nru debconf-1.5.58ubuntu1/po/zh_CN.po debconf-1.5.59ubuntu1/po/zh_CN.po --- debconf-1.5.58ubuntu1/po/zh_CN.po 2015-11-08 10:09:57.000000000 +0000 +++ debconf-1.5.59ubuntu1/po/zh_CN.po 2016-04-27 02:45:05.000000000 +0000 @@ -305,6 +305,13 @@ #: ../dpkg-reconfigure:99 #, fuzzy +#| msgid "" +#| "Usage: dpkg-reconfigure [options] packages\n" +#| " -a, --all\t\t\tReconfigure all packages.\n" +#| " -u, --unseen-only\t\tShow only not yet seen questions.\n" +#| " --default-priority\tUse default priority instead of low.\n" +#| " --force\t\t\tForce reconfiguration of broken packages.\n" +#| " --no-reload\t\tDo not reload templates. (Use with caution.)" msgid "" "Usage: dpkg-reconfigure [options] packages\n" " -u, --unseen-only\t\tShow only not yet seen questions.\n" diff -Nru debconf-1.5.58ubuntu1/po/zh_TW.po debconf-1.5.59ubuntu1/po/zh_TW.po --- debconf-1.5.58ubuntu1/po/zh_TW.po 2015-11-08 10:09:58.000000000 +0000 +++ debconf-1.5.59ubuntu1/po/zh_TW.po 2016-04-27 02:45:05.000000000 +0000 @@ -307,6 +307,13 @@ #: ../dpkg-reconfigure:99 #, fuzzy +#| msgid "" +#| "Usage: dpkg-reconfigure [options] packages\n" +#| " -a, --all\t\t\tReconfigure all packages.\n" +#| " -u, --unseen-only\t\tShow only not yet seen questions.\n" +#| " --default-priority\tUse default priority instead of low.\n" +#| " --force\t\t\tForce reconfiguration of broken packages.\n" +#| " --no-reload\t\tDo not reload templates. (Use with caution.)" msgid "" "Usage: dpkg-reconfigure [options] packages\n" " -u, --unseen-only\t\tShow only not yet seen questions.\n"