lp:~ubuntu-branches/ubuntu/oneiric/tomboy/oneiric-201107271207

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/oneiric/tomboy

Ubuntu branches: Pending requested 2011-08-17

Diff: 1344 lines (+12/-1144) (has conflicts)

21 files modified

.pc/01_dllmaps.patch/Tomboy/Tomboy.exe.config.in (+0/-7)
.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Api/Tests/NoteInfoTests.cs (+0/-83)
.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Api/Tests/ResourceReferenceTests.cs (+0/-111)
.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Api/Tests/UserInfoTests.cs (+0/-37)
.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/DeserializerTests.cs (+0/-102)
.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/SerializerTests.cs (+0/-166)
.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/TokenizerTests.cs (+0/-208)
.pc/10_disable_unit_tests/Tomboy/Addins/WebSyncService/Tests/NoteConvertTests.cs (+0/-306)
.pc/20_remove_pcfile_requires/data/tomboy-addins.pc.in (+0/-10)
.pc/30_fix_manpage_syntax/data/tomboy.1 (+0/-105)
Tomboy/Addins/WebSyncService/Api/Tests/NoteInfoTests.cs (+1/-1)
Tomboy/Addins/WebSyncService/Api/Tests/ResourceReferenceTests.cs (+1/-1)
Tomboy/Addins/WebSyncService/Api/Tests/UserInfoTests.cs (+1/-1)
Tomboy/Addins/WebSyncService/Hyena.Json/Tests/DeserializerTests.cs (+1/-1)
Tomboy/Addins/WebSyncService/Hyena.Json/Tests/SerializerTests.cs (+1/-1)
Tomboy/Addins/WebSyncService/Hyena.Json/Tests/TokenizerTests.cs (+1/-1)
Tomboy/Addins/WebSyncService/Tests/NoteConvertTests.cs (+1/-1)
Tomboy/Tomboy.exe.config.in (+2/-2)
data/tomboy-addins.pc.in (+1/-0)
data/tomboy.1 (+1/-0)
debian/source/local-options (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

83. By Iain Lane on 2011-07-27

Run dh_autoreconf with --as-needed to enable support in ltmain.sh

82. By Iain Lane on 2011-07-27

* Merge with Debian experimental, remaning changes:
  + Use dh-translations instead of manually stripping schema
  + Ubuntu patches:
    - Add Launchpad integration
    - Use Ubuntu One SSO
    - Add app indicator support
    - Use Ubuntu One as default sync server
    - Add initial note about Ubuntu One
  + autoreconf for some of the above changes
* Refresh patches that don't apply cleanly
* [6a8551d] Imported Upstream version 1.7.2
  + New addin for advanced preferences
  + Remove minumum size on Search All Notes window
  + Fix note title matching in TrieTree
  + Enforce minimum size on Name column in Search All Notes window

81. By Iain Lane on 2011-07-27

Merging shared upstream rev into target branch.

80. By Iain Lane on 2011-07-27

Use unapply-patches to satisfy bzr merge-package

79. By Iain Lane on 2011-07-06

* Merge with Debian experimental, remaning changes:
  + Use dh-translations instead of manually stripping schema
  + Ubuntu patches:
    - Add Launchpad integration
    - Use Ubuntu One SSO
    - Add app indicator support
    - Use Ubuntu One as default sync server
    - Add initial note about Ubuntu One
  + autoreconf for some of the above changes

78. By Iain Lane on 2011-06-26

* Rebuild against CLR 4.0
* 01_dllmaps.patch: Fix glib DLLMap to resolve correctly and not bail with
  stricter dh_clideps
* Add Build-Dep on libsyncdaemon-1.0-dev so that the DLLMap can be resolved

77. By Sebastien Bacher on 2011-05-27

rules: don't install an old ltmain.sh breaking the build (lp: #788588)

76. By Sebastien Bacher on 2011-05-26

debian/control: don't build-depends on cdbs since dh_translations is used

75. By Michael Terry on 2011-05-19

* debian/control, debian/rules:
  - Use dh-translations instead of manually stripping schema and
    adjusting desktop file.

74. By Sebastien Bacher on 2011-05-19

New upstream version.