diff -Nru preseed-1.57ubuntu2/debian/changelog preseed-1.60ubuntu1/debian/changelog --- preseed-1.57ubuntu2/debian/changelog 2013-01-09 14:58:23.000000000 +0000 +++ preseed-1.60ubuntu1/debian/changelog 2013-08-02 10:34:04.000000000 +0000 @@ -1,3 +1,34 @@ +preseed (1.60ubuntu1) saucy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Change the "keymap" alias to keyboard-configuration/layoutcode. + - Change default preseed root to "d-i/saucy/./preseed.cfg". + + -- Dmitrijs Ledkovs Fri, 02 Aug 2013 11:34:04 +0100 + +preseed (1.60) unstable; urgency=low + + [ Dmitrijs Ledkovs ] + * Set debian source format to '3.0 (native)'. + * Bump debhelper compat level to 9. + * Set Vcs-* to canonical format. + + -- Christian Perrier Sat, 13 Jul 2013 12:18:33 +0200 + +preseed (1.59) unstable; urgency=low + + [ Updated translations ] + * Croatian (hr.po) by Tomislav Krznar + + -- Christian Perrier Sun, 19 May 2013 18:23:32 +0200 + +preseed (1.58) unstable; urgency=low + + [ Updated translations ] + * Malayalam fixed (preseed URLs) + + -- Christian Perrier Thu, 10 Jan 2013 07:38:34 +0100 + preseed (1.57ubuntu2) raring; urgency=low * Cherrypick ml.po template fix from d-i svn. Fixes ubiquity ftbfs. diff -Nru preseed-1.57ubuntu2/debian/compat preseed-1.60ubuntu1/debian/compat --- preseed-1.57ubuntu2/debian/compat 2013-01-09 13:52:45.000000000 +0000 +++ preseed-1.60ubuntu1/debian/compat 2013-08-02 10:31:28.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru preseed-1.57ubuntu2/debian/control preseed-1.60ubuntu1/debian/control --- preseed-1.57ubuntu2/debian/control 2013-01-09 13:52:45.000000000 +0000 +++ preseed-1.60ubuntu1/debian/control 2013-08-02 10:31:50.000000000 +0000 @@ -4,9 +4,9 @@ Maintainer: Ubuntu Installer Team XSBC-Original-Maintainer: Debian Install System Team Uploaders: Philip Hands , Christian Perrier -Build-Depends: debhelper (>= 7.3.10), dpkg-dev (>= 1.9) -XS-Debian-Vcs-Browser: http://git.debian.org/?p=d-i/preseed.git -XS-Debian-Vcs-Git: git://git.debian.org/d-i/preseed.git +Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.9) +XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/preseed.git +XS-Debian-Vcs-Git: git://anonscm.debian.org/d-i/preseed.git Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/preseed/ubuntu Package: preseed-common diff -Nru preseed-1.57ubuntu2/debian/network-preseed.templates preseed-1.60ubuntu1/debian/network-preseed.templates --- preseed-1.57ubuntu2/debian/network-preseed.templates 2013-01-09 13:52:45.000000000 +0000 +++ preseed-1.60ubuntu1/debian/network-preseed.templates 2013-08-02 10:32:05.000000000 +0000 @@ -38,6 +38,6 @@ Template: auto-install/defaultroot Type: string -Default: d-i/raring/./preseed.cfg +Default: d-i/saucy/./preseed.cfg Description: for internal use; can be preseeded Path added to local server to give the preseed root diff -Nru preseed-1.57ubuntu2/debian/po/hr.po preseed-1.60ubuntu1/debian/po/hr.po --- preseed-1.57ubuntu2/debian/po/hr.po 2013-01-09 13:52:45.000000000 +0000 +++ preseed-1.60ubuntu1/debian/po/hr.po 2013-08-02 10:31:28.000000000 +0000 @@ -15,14 +15,14 @@ # Krunoslav Gernhard, 2004 # Vladimir Vuksan , 2000. # Vlatko Kosturjak, 2001 -# Tomislav Krznar , 2012. +# Tomislav Krznar , 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: Debian-installer 1st-stage master file HR\n" "Report-Msgid-Bugs-To: preseed@packages.debian.org\n" "POT-Creation-Date: 2011-01-30 18:05+0000\n" -"PO-Revision-Date: 2012-06-21 18:59+0200\n" +"PO-Revision-Date: 2013-04-17 18:08+0200\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" "Language: hr\n" @@ -30,7 +30,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: error #. Description @@ -47,8 +47,8 @@ "The file needed for preconfiguration could not be retrieved from " "${LOCATION}. The installation will proceed in non-automated mode." msgstr "" -"Datoteku koja je potrebna za prepostavljanje nije moguće dobaviti s " -"${LOCATION}. Instalacija će se nastaviti u ne-automatskom načinu." +"Datoteku koja je potrebna za pred-postavljanje nije moguće dobaviti s " +"${LOCATION}. Instalacija će se nastaviti u neautomatskom načinu." #. Type: error #. Description @@ -66,7 +66,7 @@ "The file may be corrupt." msgstr "" "Instalacija nije uspjela učitati datoteku s pred-postavkama s ${LOCATION}. " -"Datoteka je bi mogla biti neispravna." +"Datoteka je možda oštećena." #. Type: error #. Description diff -Nru preseed-1.57ubuntu2/debian/source/format preseed-1.60ubuntu1/debian/source/format --- preseed-1.57ubuntu2/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ preseed-1.60ubuntu1/debian/source/format 2013-08-02 10:35:22.026466092 +0000 @@ -0,0 +1 @@ +3.0 (native)