← Back to branch summary

~ubuntu-branches/ubuntu/saucy/filezilla/saucy-proposed

~ubuntu-branches/ubuntu/saucy/filezilla/saucy-proposed

Viewing all changes in revision 37.

Committer: Bazaar Package Importer
Author(s): Adrien Cunin
Date: 2010-12-12 16:11:49 UTC
mfrom: (1.1.27 upstream) (3.2.9 sid)
Revision ID: james.westby@ubuntu.com-20101212161149-0tsniecmy8o1f6yc

Tags: 3.3.5.1-1ubuntu1

* Merge from Debian unstable. Remaining changes:
   - 02_use-decimal-si-by-default.patch: by default, display file sizes using
     decimal base and SI units instead of just bytes; complies with Ubuntu
     UnitsPolicy.

files added:
debian/.pc

debian/.pc/.quilt_patches

debian/.pc/.quilt_series

debian/.pc/.version

locales/hy.po

locales/sr.po

m4

m4/cppunit.m4

m4/fz_check_tinyxml.m4

m4/fz_checkversion.m4

m4/libgnutls.m4

m4/pkg.m4

m4/wxwin.m4

src/interface/resources/20x20

src/interface/resources/20x20/unknown.png

src/interface/resources/24x24

src/interface/resources/24x24/unknown.png

src/interface/resources/opencrystal/20x20

src/interface/resources/opencrystal/20x20/server.png

src/interface/resources/opencrystal/24x24

src/interface/resources/opencrystal/24x24/server.png

files removed:
cppunit.m4

fz_checkversion.m4

libgnutls.m4

pkg.m4

wxwin.m4

files modified:
.pc/01_remove-xdg-check.patch/configure

.pc/01_remove-xdg-check.patch/configure.in

.pc/02_use-decimal-si-by-default.patch/src/interface/Options.cpp

AUTHORS

Makefile.am

Makefile.in

NEWS

aclocal.m4

autogen.sh

configure

configure.in

data/Makefile.in

data/process_running.nsh

debian/changelog

debian/control

debian/patches/02_use-decimal-si-by-default.patch

debian/rules

locales/Makefile.in

locales/ar.po

locales/bg_BG.po

locales/ca.po

locales/ca_ES@valencia.po

locales/cs_CZ.po

locales/da_DK.po

locales/de.po

locales/el.po

locales/es.po

locales/et_EE.po

locales/eu_ES.po

locales/fa_IR.po

locales/fi_FI.po

locales/filezilla.pot

locales/fr.po

locales/fr_CA.po

locales/gl_ES.po

locales/he_IL.po

locales/hr.po

locales/hu_HU.po

locales/id_ID.po

locales/is.po

locales/it.po

locales/ja_JP.po

locales/ka.po

locales/km_KH.po

locales/ko_KR.po

locales/ku.po

locales/lt_LT.po

locales/lv_LV.po

locales/mk_MK.po

locales/nb_NO.po

locales/ne.po

locales/nl.po

locales/nn_NO.po

locales/oc.po

locales/pl_PL.po

locales/pt_BR.po

locales/pt_PT.po

locales/ro_RO.po

locales/ru.po

locales/sk_SK.po

locales/sl_SI.po

locales/sv.po

locales/th_TH.po

locales/tr.po

locales/uk_UA.po

locales/vi_VN.po

locales/zh_CN.po

locales/zh_TW.po

src/Makefile.in

src/dbus/Makefile.in

src/dbus/wxdbusconnection.cpp

src/dbus/wxdbusconnection.h

src/engine/ControlSocket.cpp

src/engine/Makefile.in

src/engine/directorycache.cpp

src/engine/directorycache.h

src/engine/directorylisting.cpp

src/engine/directorylistingparser.cpp

src/engine/directorylistingparser.h

src/engine/engine.vcproj

src/engine/engineprivate.cpp

src/engine/externalipresolver.cpp

src/engine/ftpcontrolsocket.cpp

src/engine/iothread.cpp

src/engine/local_path.cpp

src/engine/sftpcontrolsocket.cpp

src/engine/sizeformatting_base.cpp

src/engine/socket.cpp

src/engine/timeex.cpp

src/engine/tlssocket.cpp

src/engine/transfersocket.cpp

src/fzshellext/Makefile.in

src/include/Makefile.in

src/include/directorylisting.h

src/include/local_path.h

src/include/setup.h

src/include/timeex.h

src/interface/FileZilla.cpp

src/interface/LocalListView.cpp

src/interface/LocalTreeView.cpp

src/interface/Mainfrm.cpp

src/interface/Makefile.am

src/interface/Makefile.in

src/interface/Options.cpp

src/interface/Options.h

src/interface/QueueView.cpp

src/interface/QueueView.h

src/interface/RemoteListView.cpp

src/interface/RemoteListView.h

src/interface/RemoteTreeView.cpp

src/interface/bookmarks_dialog.cpp

src/interface/clearprivatedata.cpp

src/interface/commandqueue.cpp

src/interface/edithandler.cpp

src/interface/fileexistsdlg.cpp

src/interface/filelist_statusbar.cpp

src/interface/filelist_statusbar.h

src/interface/filelistctrl.cpp

src/interface/filelistctrl.h

src/interface/filezillaapp.h

src/interface/filter.cpp

src/interface/filter.h

src/interface/filter_conditions_dialog.cpp

src/interface/filteredit.cpp

src/interface/import.cpp

src/interface/interface.vcproj

src/interface/ipcmutex.cpp

src/interface/listctrlex.cpp

src/interface/listctrlex.h

src/interface/manual_transfer.cpp

src/interface/menu_bar.cpp

src/interface/queue.cpp

src/interface/queue.h

src/interface/queueview_failed.cpp

src/interface/queueview_failed.h

src/interface/queueview_successful.cpp

src/interface/quickconnectbar.cpp

src/interface/recursive_operation.cpp

src/interface/recursive_operation.h

src/interface/resources/16x16/Makefile.in

src/interface/resources/32x32/Makefile.in

src/interface/resources/Makefile.am

src/interface/resources/Makefile.in

src/interface/resources/blukis/Makefile.in

src/interface/resources/cyril/16x16/Makefile.in

src/interface/resources/cyril/Makefile.in

src/interface/resources/dialogs.xrc

src/interface/resources/lone/Makefile.in

src/interface/resources/menus.xrc

src/interface/resources/minimal/Makefile.in

src/interface/resources/opencrystal/Makefile.am

src/interface/resources/opencrystal/Makefile.in

src/interface/resources/windows_manifest.xml

src/interface/search.cpp

src/interface/settings/settingsdialog.cpp

src/interface/sitemanager.cpp

src/interface/state.cpp

src/interface/statusbar.cpp

src/interface/statusbar.h

src/interface/statuslinectrl.cpp

src/interface/systemimagelist.cpp

src/interface/systemimagelist.h

src/interface/themeprovider.cpp

src/interface/themeprovider.h

src/interface/toolbar.cpp

src/interface/updatewizard.cpp

src/interface/verifycertdialog.cpp

src/interface/verifycertdialog.h

src/interface/welcome_dialog.cpp

src/interface/wrapengine.cpp

src/interface/xmlfunctions.cpp

src/putty/Makefile.in

src/putty/fzprintf.c

src/putty/psftp.c

src/putty/ssh.c

src/putty/unix/Makefile.in

src/putty/unix/uxcons.c

src/putty/unix/uxnet.c

src/putty/windows/Makefile.am

src/putty/windows/Makefile.in

src/putty/windows/psftp.rc

src/putty/windows/winnet.c

src/tinyxml/Makefile.in

src/tinyxml/tinyxml.cpp

src/tinyxml/tinyxml.h

src/tinyxml/tinyxml.vcproj

src/tinyxml/tinyxmlerror.cpp

src/tinyxml/tinyxmlparser.cpp

tests/Makefile.in

tests/dirparsertest.cpp

tests/localpathtest.cpp

Show diffs side-by-side

added added

removed removed

.pc/01_remove-xdg-check.patch/configure

.pc/01_remove-xdg-check.patch/configure.in

.pc/02_use-decimal-si-by-default.patch/src/interface/Options.cpp

data/Makefile.in

data/process_running.nsh

debian/.pc/.quilt_patches

debian/.pc/.quilt_series

debian/.pc/.version

debian/changelog

debian/patches/02_use-decimal-si-by-default.patch

fz_checkversion.m4

locales/Makefile.in

locales/bg_BG.po

locales/ca_ES@valencia.po

locales/cs_CZ.po

locales/da_DK.po

locales/et_EE.po

locales/eu_ES.po

locales/fa_IR.po

locales/fi_FI.po

locales/filezilla.pot

locales/fr_CA.po

locales/gl_ES.po

locales/he_IL.po

locales/hu_HU.po

locales/id_ID.po

locales/ja_JP.po

locales/km_KH.po

locales/ko_KR.po

locales/lt_LT.po

locales/lv_LV.po

locales/mk_MK.po

locales/nb_NO.po

locales/nn_NO.po

locales/pl_PL.po

locales/pt_BR.po

locales/pt_PT.po

locales/ro_RO.po

locales/sk_SK.po

locales/sl_SI.po

locales/th_TH.po

locales/uk_UA.po

locales/vi_VN.po

locales/zh_CN.po

locales/zh_TW.po

m4/fz_check_tinyxml.m4

m4/fz_checkversion.m4

m4/libgnutls.m4

src/Makefile.in

src/dbus/Makefile.in

src/dbus/wxdbusconnection.cpp

src/dbus/wxdbusconnection.h

src/engine/ControlSocket.cpp

src/engine/Makefile.in

src/engine/directorycache.cpp

src/engine/directorycache.h

src/engine/directorylisting.cpp

src/engine/directorylistingparser.cpp

src/engine/directorylistingparser.h

src/engine/engine.vcproj

src/engine/engineprivate.cpp

src/engine/externalipresolver.cpp

src/engine/ftpcontrolsocket.cpp

src/engine/iothread.cpp

src/engine/local_path.cpp

src/engine/sftpcontrolsocket.cpp

src/engine/sizeformatting_base.cpp

src/engine/socket.cpp

src/engine/timeex.cpp

src/engine/tlssocket.cpp

src/engine/transfersocket.cpp

src/fzshellext/Makefile.in

src/include/Makefile.in

src/include/directorylisting.h

src/include/local_path.h

src/include/setup.h

src/include/timeex.h

src/interface/FileZilla.cpp

src/interface/LocalListView.cpp

src/interface/LocalTreeView.cpp

src/interface/Mainfrm.cpp

src/interface/Makefile.am

src/interface/Makefile.in

src/interface/Options.cpp

src/interface/Options.h

src/interface/QueueView.cpp

src/interface/QueueView.h

src/interface/RemoteListView.cpp

src/interface/RemoteListView.h

src/interface/RemoteTreeView.cpp

src/interface/bookmarks_dialog.cpp

src/interface/clearprivatedata.cpp

src/interface/commandqueue.cpp

src/interface/edithandler.cpp

src/interface/fileexistsdlg.cpp

src/interface/filelist_statusbar.cpp

src/interface/filelist_statusbar.h

src/interface/filelistctrl.cpp

src/interface/filelistctrl.h

src/interface/filezillaapp.h

src/interface/filter.cpp

src/interface/filter.h

src/interface/filter_conditions_dialog.cpp

src/interface/filteredit.cpp

src/interface/import.cpp

src/interface/interface.vcproj

src/interface/ipcmutex.cpp

src/interface/listctrlex.cpp

src/interface/listctrlex.h

src/interface/manual_transfer.cpp

src/interface/menu_bar.cpp

src/interface/queue.cpp

src/interface/queue.h

src/interface/queueview_failed.cpp

src/interface/queueview_failed.h

src/interface/queueview_successful.cpp

src/interface/quickconnectbar.cpp

src/interface/recursive_operation.cpp

src/interface/recursive_operation.h

src/interface/resources/16x16/Makefile.in

src/interface/resources/20x20/

src/interface/resources/20x20/unknown.png

src/interface/resources/24x24/

src/interface/resources/24x24/unknown.png

src/interface/resources/32x32/Makefile.in

src/interface/resources/Makefile.am

src/interface/resources/Makefile.in

src/interface/resources/blukis/Makefile.in

src/interface/resources/cyril/16x16/Makefile.in

src/interface/resources/cyril/Makefile.in

src/interface/resources/dialogs.xrc

src/interface/resources/lone/Makefile.in

src/interface/resources/menus.xrc

src/interface/resources/minimal/Makefile.in

src/interface/resources/opencrystal/20x20/

src/interface/resources/opencrystal/20x20/server.png

src/interface/resources/opencrystal/24x24/

src/interface/resources/opencrystal/24x24/server.png

src/interface/resources/opencrystal/Makefile.am

src/interface/resources/opencrystal/Makefile.in

src/interface/resources/windows_manifest.xml

src/interface/search.cpp

src/interface/settings/settingsdialog.cpp

src/interface/sitemanager.cpp

src/interface/state.cpp

src/interface/statusbar.cpp

src/interface/statusbar.h

src/interface/statuslinectrl.cpp

src/interface/systemimagelist.cpp

src/interface/systemimagelist.h

src/interface/themeprovider.cpp

src/interface/themeprovider.h

src/interface/updatewizard.cpp

src/interface/verifycertdialog.cpp

src/interface/verifycertdialog.h

src/interface/welcome_dialog.cpp

src/interface/wrapengine.cpp

src/interface/xmlfunctions.cpp

src/putty/Makefile.in

src/putty/fzprintf.c

src/putty/psftp.c

src/putty/ssh.c

src/putty/unix/Makefile.in

src/putty/unix/uxcons.c

src/putty/unix/uxnet.c

src/putty/windows/Makefile.am

src/putty/windows/Makefile.in

src/putty/windows/psftp.rc

src/putty/windows/winnet.c

src/tinyxml/Makefile.in

src/tinyxml/tinyxml.cpp

src/tinyxml/tinyxml.h

src/tinyxml/tinyxml.vcproj

src/tinyxml/tinyxmlerror.cpp

src/tinyxml/tinyxmlparser.cpp

tests/Makefile.in

tests/dirparsertest.cpp

tests/localpathtest.cpp

Older »