Viewing all changes in revision 7.
- Committer: Bazaar Package Importer
- Date: 2011-01-23 17:45:12 UTC
- mfrom: (4.1.2 sid)
- Revision ID: james.westby@ubuntu.com-20110123174512-jgvbvbcberl5m4ql
* Merge from debian unstable. (LP: #697087)
* Drop debian/patches/01_fix_duplicated_symbols.patch: Fixed upstream
* debian/patches/0004-fix-linking-as-needed.patch: Fix linking with
--as-needed, not sure it was the best way though.
* Drop debian/patches/01_fix_duplicated_symbols.patch: Fixed upstream
* debian/patches/0004-fix-linking-as-needed.patch: Fix linking with
--as-needed, not sure it was the best way though.
- files added:
- .pc/0001-patch-from-Patrick-Ohly-convert-explicitly-between-s.patch
- .pc/0001-patch-from-Patrick-Ohly-convert-explicitly-between-s.patch/src
- .pc/0001-patch-from-Patrick-Ohly-convert-explicitly-between-s.patch/src/syncevo
- .pc/0002-Have-realpath-allocate-its-own-buffer.patch
- .pc/0002-Have-realpath-allocate-its-own-buffer.patch/src
- .pc/0002-Have-realpath-allocate-its-own-buffer.patch/src/syncevo
- .pc/0003-Second-patch-to-convert-between-sysync-memSize-and-s.patch
- .pc/0003-Second-patch-to-convert-between-sysync-memSize-and-s.patch/src
- .pc/0003-Second-patch-to-convert-between-sysync-memSize-and-s.patch/src/syncevo
- .pc/0004-fix-linking-as-needed.patch
- .pc/0004-fix-linking-as-needed.patch/src
- .pc/0004-fix-linking-as-needed.patch/src/syncevo
- src/backends/kcalextended
- src/backends/qtcontacts
- src/dbus/qt
- src/synthesis-includes
- test/testcases/templates
- test/testcases/templates/clients
- test/testcases/templates/clients/phone
- test/testcases/templates/clients/phone/nokia
- test/testcases/templates/clients/phone/nokia/S40
- files removed:
- .pc/01_fix_duplicated_symbols.patch
- .pc/01_fix_duplicated_symbols.patch/po
- .pc/01_fix_duplicated_symbols.patch/src
- .pc/01_fix_duplicated_symbols.patch/src/gdbus
- .pc/01_fix_duplicated_symbols.patch/src/gtk-ui
- src/templates/clients/SyncEvolution
- src/templates/clients/SyncEvolution/sources
- src/templates/clients/SyncEvolution/sources/addressbook
- src/templates/clients/SyncEvolution/sources/calendar
- src/templates/clients/SyncEvolution/sources/memo
- src/templates/clients/SyncEvolution/sources/todo
- src/templates/clients/default
- src/templates/clients/phone/nokia
- src/templates/clients/phone/nokia/S40
- src/templates/clients/phone/nokia/S40/7210c
- src/templates/clients/phone/nokia/S40/7210c/sources
- src/templates/clients/phone/nokia/S40/7210c/sources/addressbook
- src/templates/clients/phone/nokia/S40/7210c/sources/calendar
- src/templates/clients/phone/nokia/S40/7210c/sources/calendar+todo
- src/templates/clients/phone/nokia/S40/7210c/sources/memo
- src/templates/clients/phone/nokia/S40/7210c/sources/todo
- src/templates/servers/Funambol
- src/templates/servers/Funambol/sources
- src/templates/servers/Funambol/sources/addressbook
- src/templates/servers/Funambol/sources/calendar
- src/templates/servers/Funambol/sources/memo
- src/templates/servers/Funambol/sources/todo
- src/templates/servers/ScheduleWorld
- src/templates/servers/ScheduleWorld/sources
- src/templates/servers/ScheduleWorld/sources/addressbook
- src/templates/servers/ScheduleWorld/sources/calendar
- src/templates/servers/ScheduleWorld/sources/memo
- src/templates/servers/ScheduleWorld/sources/todo
- files modified:
- .gitignore
expand all
collapse all
added
removed
src/gtk-ui/close.png
src/gtk-ui/close_hover.png
src/gtk-ui/settings.png
src/gtk-ui/settings_hover.png
