diff -Nru filezilla-3.5.3/debian/changelog filezilla-3.5.3/debian/changelog --- filezilla-3.5.3/debian/changelog 2012-03-28 08:28:35.000000000 +0000 +++ filezilla-3.5.3/debian/changelog 2012-07-17 09:00:28.000000000 +0000 @@ -1,3 +1,24 @@ +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 + - http://svn.filezilla-project.org/svn/artwork/FileZilla%20logo.svg + - Scales better to a larger size (Closes: #663634) + * Set myself as maintainer replacing Adam Cécile (Le_Vert) + (Closes: #673961) + * Updated Standards-Version to 3.9.3, no change needed + * Added debian/patches/02_fix-ftbfs.patch to fix FTBFS + + -- 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 diff -Nru filezilla-3.5.3/debian/control filezilla-3.5.3/debian/control --- filezilla-3.5.3/debian/control 2012-01-29 22:10:31.000000000 +0000 +++ filezilla-3.5.3/debian/control 2012-07-17 08:50:17.000000000 +0000 @@ -2,13 +2,12 @@ Section: net Priority: optional Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Adam Cécile (Le_Vert) -Uploaders: Adrien Cunin +XSBC-Original-Maintainer: Adrien Cunin Build-Depends: debhelper (>= 7.0.50~), autotools-dev, pkg-config, libwxgtk2.8-dev (>= 2.8.6) | libwxgtk-dev (>= 2.8.6), wx-common, libgtk2.0-dev, libidn11-dev, gettext, libgnutls-dev (>= 2.8.3), imagemagick, libdbus-1-dev, libtinyxml-dev, libsqlite3-dev -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://filezilla-project.org/ Vcs-Git: git://git.debian.org/git/collab-maint/filezilla.git Vcs-Browser: http://git.debian.org/?p=collab-maint/filezilla.git diff -Nru filezilla-3.5.3/debian/patches/02_fix-ftbfs.patch filezilla-3.5.3/debian/patches/02_fix-ftbfs.patch --- filezilla-3.5.3/debian/patches/02_fix-ftbfs.patch 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.5.3/debian/patches/02_fix-ftbfs.patch 2012-06-25 11:41:53.000000000 +0000 @@ -0,0 +1,22 @@ +Author: Adrien Cunin +Description: fix FTBFS. +--- a/src/engine/directorylistingparser.cpp ++++ b/src/engine/directorylistingparser.cpp +@@ -514,7 +514,7 @@ + + //French month names + m_MonthNamesMap[_T("janv")] = 1; +- m_MonthNamesMap[_T("f\xe9")_T("b")] = 1; ++ m_MonthNamesMap[_T("f\xe9") _T("b")] = 1; + m_MonthNamesMap[_T("f\xe9v")] = 2; + m_MonthNamesMap[_T("fev")] = 2; + m_MonthNamesMap[_T("f\xe9vr")] = 2; +@@ -528,7 +528,7 @@ + m_MonthNamesMap[_T("ao\xfb")] = 8; + m_MonthNamesMap[_T("ao\xfbt")] = 8; + m_MonthNamesMap[_T("aout")] = 8; +- m_MonthNamesMap[_T("d\xe9")_T("c")] = 12; ++ m_MonthNamesMap[_T("d\xe9") _T("c")] = 12; + m_MonthNamesMap[_T("dec")] = 12; + + //Italian month names diff -Nru filezilla-3.5.3/debian/patches/02_use-decimal-si-by-default.patch filezilla-3.5.3/debian/patches/02_use-decimal-si-by-default.patch --- filezilla-3.5.3/debian/patches/02_use-decimal-si-by-default.patch 2012-01-29 22:10:31.000000000 +0000 +++ filezilla-3.5.3/debian/patches/02_use-decimal-si-by-default.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -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 -@@ -92,7 +92,7 @@ - { "Logging file", string, _T(""), normal }, - { "Logging filesize limit", number, _T("10"), normal }, - { "Trusted root certificate", string, _T(""), 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.5.3/debian/patches/11_use-decimal-si-by-default.patch filezilla-3.5.3/debian/patches/11_use-decimal-si-by-default.patch --- filezilla-3.5.3/debian/patches/11_use-decimal-si-by-default.patch 1970-01-01 00:00:00.000000000 +0000 +++ filezilla-3.5.3/debian/patches/11_use-decimal-si-by-default.patch 2012-01-29 22:10:31.000000000 +0000 @@ -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 +@@ -92,7 +92,7 @@ + { "Logging file", string, _T(""), normal }, + { "Logging filesize limit", number, _T("10"), normal }, + { "Trusted root certificate", string, _T(""), 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.5.3/debian/patches/series filezilla-3.5.3/debian/patches/series --- filezilla-3.5.3/debian/patches/series 2012-01-29 22:10:31.000000000 +0000 +++ filezilla-3.5.3/debian/patches/series 2012-07-17 08:50:53.000000000 +0000 @@ -1,2 +1,3 @@ 01_remove-xdg-check.patch -02_use-decimal-si-by-default.patch +02_fix-ftbfs.patch +11_use-decimal-si-by-default.patch