[Merge] lp:~diodon-team/diodon/new-upstream-release-1.2.0 into lp:ubuntu/diodon

[Daniel Holbach]

Review: Needs Fixing

Upon trying to merge, I get the following issues:

Unapplying quilt patches to prevent spurious conflicts                                                                                                
+N  debian/unity-scope-diodon.gsettings-override                                                                                                      
+N  libdiodon/clipboard-configuration.vala
+N  libdiodon/zeitgeist-clipboard-storage.vala
+N  po/gl.po
+N  po/hu.po
+N  po/ja.po
+N  po/nl.po
+N  po/pl.po
+N  po/pt.po
+N  po/ro.po
+N  tests/data/
+N  tests/data/Diodon-64x64.png
+N  tests/fsotest/
+N  tests/fsotest/assert.vala
+N  tests/fsotest/asynchelpers.vala
+N  tests/fsotest/signalwaiter.vala
+N  tests/fsotest/testcase.vala
+N  tests/test-image-clipboard-item.vala
+N  tests/test-keybinding-manager.vala
+N  tests/test-zeitgeist-clipboard-storage.vala
+N  unity-scope-diodon/
+N  unity-scope-diodon/clipboard.scope.in.in
+N  unity-scope-diodon/unity-scope-diodon.service.in
+N  unity-scope-diodon/unity-scope-diodon.vala
+N  unity-scope-diodon/wscript_build
 M  INSTALL
-D  data/.intlcache
 M  data/apport/source_diodon.py
 M  data/diodon.1.gz
 M  data/diodon.desktop.in
 M  data/net.launchpad.Diodon.gschema.xml.in.in
 M  data/preferences.ui
 M  debian/changelog
 M  debian/control
 M  debian/copyright
RM  debian/diodon-plugins.install => debian/unity-scope-diodon.install
-D  debian/patches/01_port-to-zeitgeist-2.0.patch
 M  debian/patches/series
 M  debian/rules
 M  diodon/main.vala
 M  diodon/wscript_build
 M  doc/wscript_build
 M  libdiodon/clipboard-item.vala
 M  libdiodon/clipboard-manager.vala
 M  libdiodon/clipboard-menu-item.vala
 M  libdiodon/clipboard-menu.vala
-D  libdiodon/clipboard-model.vala
-D  libdiodon/clipboard-storage.vala
 M  libdiodon/clipboard-type.vala
-D  libdiodon/configuration-model.vala
 M  libdiodon/controller.vala
 M  libdiodon/file-clipboard-item.vala
 M  libdiodon/image-clipboard-item.vala
 M  libdiodon/keybinding-manager.vala
 M  libdiodon/preferences-view.vala
 M  libdiodon/primary-clipboard-manager.vala
 M  libdiodon/text-clipboard-item.vala
 M  libdiodon/utility.vala
 M  libdiodon/wscript_build
-D  libdiodon/xml-clipboard-storage.vala
 M  plugins/indicator/indicator-plugin.vala
-D  plugins/unitylens/
-D  plugins/unitylens/diodon.lens.in.in
-D  plugins/unitylens/unity-lens-plugin.vala
-D  plugins/unitylens/unity-lens-schemas.vala
-D  plugins/unitylens/unitylens.plugin.in
-D  plugins/unitylens/wscript_build
 M  plugins/wscript_build
RM  plugins/zeitgeist/wscript_build => plugins/zeitgeist/wscript_build.THIS
RM  plugins/zeitgeist/zeitgeist-plugin.vala => plugins/zeitgeist/zeitgeist-plugin.vala.THIS
-D  plugins/zeitgeist/zeitgeist.plugin.in
-D  po/.intlcache
 M  po/LINGUAS
 M  po/POTFILES.in
 M  po/bg.po
 M  po/cs.po
 M  po/de.po
 M  po/diodon.pot
 M  po/en_GB.po
 M  po/es.po
 M  po/et.po
 M  po/fi.po
 M  po/fr.po
 M  po/it.po
 M  po/lt.po
 M  po/nb.po
 M  po/pt_BR.po
 M  po/ru.po
 M  po/se.po
 M  po/sk.po
 M  po/sv.po
 M  po/tr.po
 M  po/uk.po
 M  po/zh_CN.po
-D  tests/test-case.vala
 M  tests/test-main.vala
-D  tests/test-text-clipboard-item.vala
 M  tests/wscript_build
 M  vapi/config.vapi
-D  vapi/libpeas-1.0.vapi
-D  vapi/unique-3.0.vapi
 M  waflib/Node.py
 M  wscript
Conflict: can't delete plugins/zeitgeist because it is not empty.  Not deleting.
Conflict because plugins/zeitgeist is not versioned, but has versioned children.  Versioned directory.
Contents conflict in plugins/zeitgeist/wscript_build
Contents conflict in plugins/zeitgeist/zeitgeist-plugin.vala
Text conflict in wscript



-- 
https://code.launchpad.net/~diodon-team/diodon/new-upstream-release-1.2.0/+merge/229496
Your team Ubuntu branches is subscribed to branch lp:ubuntu/diodon.