diff -Nru filezilla-3.14.1/debian/changelog filezilla-3.14.1/debian/changelog --- filezilla-3.14.1/debian/changelog 2015-12-16 16:50:09.000000000 +0100 +++ filezilla-3.14.1/debian/changelog 2015-12-17 09:26:23.000000000 +0100 @@ -1,3 +1,11 @@ +filezilla (3.14.1-1ubuntu1) xenial; urgency=low + + * Merge from Debian unstable (LP: #1527125, LP: #1509989). Remaining changes: + - Add debian/patches/11_use-decimal-si-by-default.patch in order to comply + with UnitsPolicy. + + -- Gianfranco Costamagna Thu, 17 Dec 2015 09:25:45 +0100 + filezilla (3.14.1-1) unstable; urgency=medium * New upstream release (LP: #1485345) @@ -11,6 +19,21 @@ -- Adrien Cunin Wed, 16 Dec 2015 15:03:10 +0100 +filezilla (3.12.0.2-1ubuntu2) wily; urgency=medium + + * Link with -latomic to fix ppc FTBFS. + + -- Iain Lane Sun, 16 Aug 2015 11:40:53 +0100 + +filezilla (3.12.0.2-1ubuntu1) wily; urgency=medium + + * Merge from Debian unstable. Remaining Ubuntu change: + - Added debian/patches/11_use-decimal-si-by-default.patch in order to + comply with UnitsPolicy + * Refreshed debian/patches/11_use-decimal-si-by-default.patch + + -- Adrien Cunin Sun, 16 Aug 2015 02:02:38 +0200 + filezilla (3.12.0.2-1) unstable; urgency=medium * New upstream release (Closes: #789678) @@ -19,6 +42,14 @@ -- Adrien Cunin Thu, 13 Aug 2015 16:00:10 +0200 +filezilla (3.9.0.5-1ubuntu1) vivid; urgency=medium + + * Merge from Debian unstable (LP: #1391431). Remaining changes: + - Add debian/patches/11_use-decimal-si-by-default.patch in order to comply + with UnitsPolicy. + + -- Gianfranco Costamagna Tue, 11 Nov 2014 09:18:47 +0100 + filezilla (3.9.0.5-1) unstable; urgency=medium * New upstream release @@ -26,6 +57,15 @@ -- Adrien Cunin Sun, 14 Sep 2014 12:11:33 +0200 +filezilla (3.9.0.1-0.1ubuntu1) utopic; urgency=low + + * Merge from Debian unstable (LP: #1348527). Remaining changes: + - Add debian/patches/11_use-decimal-si-by-default.patch in order to comply + with UnitsPolicy. + * Refresh patch. + + -- Gianfranco Costamagna Fri, 25 Jul 2014 10:08:43 +0200 + filezilla (3.9.0.1-0.1) unstable; urgency=medium * Non-maintainer upload. @@ -51,6 +91,15 @@ -- Olly Betts Fri, 06 Jun 2014 13:28:54 +1200 +filezilla (3.8.0-1ubuntu1) utopic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Add debian/patches/11_use-decimal-si-by-default.patch in order to comply + with UnitsPolicy. + * Refresh patch. + + -- Logan Rosen Tue, 29 Apr 2014 23:22:36 -0400 + filezilla (3.8.0-1) unstable; urgency=medium * New upstream release @@ -60,6 +109,14 @@ -- Adrien Cunin Wed, 23 Apr 2014 13:57:10 +0200 +filezilla (3.7.3-1ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Add debian/patches/11_use-decimal-si-by-default.patch in order to comply + with UnitsPolicy. + + -- Logan Rosen Fri, 13 Sep 2013 21:01:50 -0400 + filezilla (3.7.3-1) unstable; urgency=low * New upstream release, fixing the following PuTTY security vulnerabilities: @@ -68,6 +125,22 @@ -- Adrien Cunin Tue, 27 Aug 2013 11:47:04 +0200 +filezilla (3.7.3-0ubuntu1) saucy; urgency=low + + * New upstream release (LP: #1209196) + - Fixes the following PuTTY security vulnerabilities: + CVE-2013-4852, CVE-2013-4206, CVE-2013-4207, CVE-2013-4208 + + -- Adrien Cunin Tue, 27 Aug 2013 15:53:40 +0200 + +filezilla (3.7.0.2-1ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu change: + - Added debian/patches/11_use-decimal-si-by-default.patch in order to + comply with UnitsPolicy + + -- Adrien Cunin Wed, 19 Jun 2013 13:08:32 +0200 + filezilla (3.7.0.2-1) unstable; urgency=low * New upstream release (LP: #1176547) @@ -75,6 +148,14 @@ -- Adrien Cunin Mon, 03 Jun 2013 10:39:05 +0200 +filezilla (3.6.0.2-1ubuntu1) raring; urgency=low + + * Merge from Debian experimental. Remaining Ubuntu change: + - Added debian/patches/11_use-decimal-si-by-default.patch in order to + comply with UnitsPolicy + + -- Adrien Cunin Fri, 07 Dec 2012 17:17:17 +0100 + filezilla (3.6.0.2-1) experimental; urgency=low * Upload to experimental due to freeze @@ -88,6 +169,15 @@ -- Adrien Cunin Mon, 03 Dec 2012 10:45:03 +0100 +filezilla (3.5.3-2ubuntu1) quantal; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu change: + - Added debian/patches/11_use-decimal-si-by-default.patch in order to + comply with UnitsPolicy (name it 11_ instead of 02_ to avoid conflicts + with Debian patches) + + -- Adrien Cunin Tue, 17 Jul 2012 10:51:12 +0200 + filezilla (3.5.3-2) unstable; urgency=low * Added debian/filezilla.svg and install it as application icon @@ -100,12 +190,36 @@ -- Adrien Cunin Sun, 24 Jun 2012 17:27:38 +0200 +filezilla (3.5.3-1ubuntu2) precise; urgency=low + + * Added debian/filezilla.svg and install it as application icon + - http://svn.filezilla-project.org/svn/artwork/FileZilla%20logo.svg + - Scales better to a larger size (LP: #937980) + + -- Adrien Cunin Wed, 28 Mar 2012 10:28:29 +0200 + +filezilla (3.5.3-1ubuntu1) precise; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu change: + - Added debian/patches/02_use-decimal-si-by-default.patch in order to + comply with UnitsPolicy + + -- Adrien Cunin Sun, 29 Jan 2012 23:11:01 +0100 + filezilla (3.5.3-1) unstable; urgency=low * New upstream release -- Adrien Cunin Sun, 15 Jan 2012 23:09:11 +0100 +filezilla (3.5.2-1ubuntu1) precise; urgency=low + + * Sync from Debian unstable + * Re-added debian/patches/02_use-decimal-si-by-default.patch in order to + comply with UnitsPolicy (the patch got lost in the previous Ubuntu upload) + + -- Adrien Cunin Fri, 23 Dec 2011 22:57:59 +0100 + filezilla (3.5.2-1) unstable; urgency=low * New upstream release (Closes: #630687) diff -Nru filezilla-3.14.1/debian/patches/11_use-decimal-si-by-default.patch filezilla-3.14.1/debian/patches/11_use-decimal-si-by-default.patch --- filezilla-3.14.1/debian/patches/11_use-decimal-si-by-default.patch 1970-01-01 01:00:00.000000000 +0100 +++ filezilla-3.14.1/debian/patches/11_use-decimal-si-by-default.patch 2015-12-17 09:26:23.000000000 +0100 @@ -0,0 +1,13 @@ +Author: Adrien Cunin +Description: by default, display file sizes using decimal base and SI units instead of just bytes; complies with Ubuntu UnitsPolicy. +--- a/src/interface/Options.cpp ++++ b/src/interface/Options.cpp +@@ -104,7 +104,7 @@ + { "Logging file", string, _T(""), normal }, + { "Logging filesize limit", number, _T("10"), normal }, + { "Logging show detailed logs", number, _T("0"), internal }, +- { "Size format", number, _T("0"), normal }, ++ { "Size format", number, _T("3"), normal }, + { "Size thousands separator", number, _T("1"), normal }, + { "Size decimal places", number, _T("1"), normal }, + diff -Nru filezilla-3.14.1/debian/patches/series filezilla-3.14.1/debian/patches/series --- filezilla-3.14.1/debian/patches/series 2015-12-16 16:50:09.000000000 +0100 +++ filezilla-3.14.1/debian/patches/series 2015-12-17 09:26:23.000000000 +0100 @@ -1,2 +1,3 @@ 01_remove-xdg-check.patch 02_PIPE_BUF.patch +11_use-decimal-si-by-default.patch