Diodon

Merge lp://staging/~diodon-team/diodon/new-upstream-release-1.2.0 into lp://staging/~diodon-team/diodon/trunk

new-upstream-release-1.2.0
Merge into trunk

Proposed by Oliver Sauder on 2014-08-04

Status:	Superseded
Proposed branch:	lp://staging/~diodon-team/diodon/new-upstream-release-1.2.0
Merge into:	lp://staging/~diodon-team/diodon/trunk
Diff against target:	53480 lines (+52184/-0) (has conflicts) 246 files modified .pc/.quilt_patches (+1/-0) .pc/.quilt_series (+1/-0) .pc/.version (+1/-0) .valencia (+3/-0) AUTHORS (+2/-0) COPYING (+339/-0) INSTALL (+22/-0) configure.in (+2/-0) data/apport/diodon-crashdb.conf (+5/-0) data/apport/source_diodon.py (+21/-0) data/diodon.desktop.in (+14/-0) data/diodon.pc.in (+14/-0) data/icons/hicolor/16x16/apps/diodon-panel.svg (+1024/-0) data/icons/hicolor/16x16/apps/diodon.svg (+1028/-0) data/icons/hicolor/22x22/apps/diodon-panel.svg (+1037/-0) data/icons/hicolor/22x22/apps/diodon.svg (+1037/-0) data/icons/hicolor/24x24/apps/diodon-panel.svg (+1037/-0) data/icons/hicolor/24x24/apps/diodon.svg (+1037/-0) data/icons/hicolor/32x32/apps/diodon.svg (+1036/-0) data/icons/hicolor/48x48/apps/diodon.svg (+1028/-0) data/icons/hicolor/scalable/apps/diodon.svg (+1028/-0) data/icons/ubuntu-mono-dark/status/16/diodon-panel.svg (+69/-0) data/icons/ubuntu-mono-dark/status/22/diodon-panel.svg (+71/-0) data/icons/ubuntu-mono-dark/status/24/diodon-panel.svg (+69/-0) data/icons/ubuntu-mono-light/status/16/diodon-panel.svg (+69/-0) data/icons/ubuntu-mono-light/status/22/diodon-panel.svg (+69/-0) data/icons/ubuntu-mono-light/status/24/diodon-panel.svg (+69/-0) data/net.launchpad.Diodon.gschema.xml.in.in (+54/-0) data/preferences.ui (+310/-0) data/wscript_build (+54/-0) debian/changelog (+38/-0) debian/compat (+1/-0) debian/control (+113/-0) debian/copyright (+120/-0) debian/diodon-dev.install (+6/-0) debian/diodon.install (+10/-0) debian/gir1.2-diodon-1.0.install (+1/-0) debian/libdiodon0.install (+1/-0) debian/rules (+16/-0) debian/source/format (+1/-0) debian/unity-scope-diodon.gsettings-override (+2/-0) debian/unity-scope-diodon.install (+3/-0) debian/watch (+2/-0) diodon/main.vala (+153/-0) diodon/wscript_build (+16/-0) doc/wscript_build (+51/-0) libdiodon/clipboard-configuration.vala (+98/-0) libdiodon/clipboard-item.vala (+157/-0) libdiodon/clipboard-manager.vala (+212/-0) libdiodon/clipboard-menu-item.vala (+83/-0) libdiodon/clipboard-menu.vala (+205/-0) libdiodon/clipboard-type.vala (+154/-0) libdiodon/controller.vala (+600/-0) libdiodon/file-clipboard-item.vala (+354/-0) libdiodon/image-clipboard-item.vala (+263/-0) libdiodon/keybinding-manager.vala (+273/-0) libdiodon/preferences-view.vala (+153/-0) libdiodon/primary-clipboard-manager.vala (+135/-0) libdiodon/text-clipboard-item.vala (+175/-0) libdiodon/utility.vala (+140/-0) libdiodon/wscript_build (+28/-0) libdiodon/zeitgeist-clipboard-storage.vala (+594/-0) plugins/indicator/indicator-plugin.vala (+82/-0) plugins/indicator/indicator.plugin.in (+7/-0) plugins/indicator/wscript_build (+25/-0) plugins/wscript_build (+6/-0) po/LINGUAS (+28/-0) po/POTFILES.in (+10/-0) po/bg.po (+275/-0) po/cs.po (+277/-0) po/de.po (+287/-0) po/diodon.pot (+267/-0) po/en_GB.po (+277/-0) po/es.po (+280/-0) po/et.po (+269/-0) po/fi.po (+276/-0) po/fr.po (+277/-0) po/gl.po (+292/-0) po/hu.po (+289/-0) po/it.po (+277/-0) po/ja.po (+271/-0) po/lt.po (+275/-0) po/nb.po (+275/-0) po/nl.po (+291/-0) po/pl.po (+273/-0) po/pt.po (+290/-0) po/pt_BR.po (+276/-0) po/ro.po (+292/-0) po/ru.po (+275/-0) po/se.po (+269/-0) po/sk.po (+274/-0) po/sv.po (+276/-0) po/tr.po (+281/-0) po/uk.po (+276/-0) po/wscript_build (+7/-0) po/zh_CN.po (+269/-0) tests/fsotest/assert.vala (+179/-0) tests/fsotest/asynchelpers.vala (+237/-0) tests/fsotest/signalwaiter.vala (+129/-0) tests/fsotest/testcase.vala (+151/-0) tests/test-image-clipboard-item.vala (+49/-0) tests/test-keybinding-manager.vala (+48/-0) tests/test-main.vala (+36/-0) tests/test-zeitgeist-clipboard-storage.vala (+266/-0) tests/wscript_build (+16/-0) unity-scope-diodon/clipboard.scope.in.in (+48/-0) unity-scope-diodon/unity-scope-diodon.service.in (+3/-0) unity-scope-diodon/unity-scope-diodon.vala (+238/-0) unity-scope-diodon/wscript_build (+40/-0) vapi/config.vapi (+43/-0) vapi/libpeas-gtk-1.0.vapi (+34/-0) waf (+164/-0) waflib/Build.py (+1293/-0) waflib/ConfigSet.py (+337/-0) waflib/Configure.py (+570/-0) waflib/Context.py (+596/-0) waflib/Errors.py (+70/-0) waflib/Logs.py (+274/-0) waflib/Node.py (+851/-0) waflib/Options.py (+252/-0) waflib/Runner.py (+361/-0) waflib/Scripting.py (+577/-0) waflib/Task.py (+1238/-0) waflib/TaskGen.py (+757/-0) waflib/Tools/__init__.py (+3/-0) waflib/Tools/ar.py (+22/-0) waflib/Tools/asm.py (+74/-0) waflib/Tools/bison.py (+49/-0) waflib/Tools/c.py (+40/-0) waflib/Tools/c_aliases.py (+128/-0) waflib/Tools/c_config.py (+1198/-0) waflib/Tools/c_osx.py (+188/-0) waflib/Tools/c_preproc.py (+1030/-0) waflib/Tools/c_tests.py (+218/-0) waflib/Tools/ccroot.py (+608/-0) waflib/Tools/compiler_c.py (+98/-0) waflib/Tools/compiler_cxx.py (+102/-0) waflib/Tools/compiler_d.py (+59/-0) waflib/Tools/compiler_fc.py (+66/-0) waflib/Tools/cs.py (+178/-0) waflib/Tools/cxx.py (+41/-0) waflib/Tools/d.py (+99/-0) waflib/Tools/d_config.py (+57/-0) waflib/Tools/d_scan.py (+209/-0) waflib/Tools/dbus.py (+70/-0) waflib/Tools/dmd.py (+81/-0) waflib/Tools/errcheck.py (+217/-0) waflib/Tools/fc.py (+205/-0) waflib/Tools/fc_config.py (+462/-0) waflib/Tools/fc_scan.py (+126/-0) waflib/Tools/flex.py (+46/-0) waflib/Tools/g95.py (+65/-0) waflib/Tools/gas.py (+17/-0) waflib/Tools/gcc.py (+153/-0) waflib/Tools/gdc.py (+56/-0) waflib/Tools/gfortran.py (+90/-0) waflib/Tools/glib2.py (+378/-0) waflib/Tools/gnu_dirs.py (+128/-0) waflib/Tools/gxx.py (+153/-0) waflib/Tools/icc.py (+42/-0) waflib/Tools/icpc.py (+41/-0) waflib/Tools/ifort.py (+59/-0) waflib/Tools/intltool.py (+176/-0) waflib/Tools/irixcc.py (+63/-0) waflib/Tools/javaw.py (+431/-0) waflib/Tools/kde4.py (+90/-0) waflib/Tools/lua.py (+38/-0) waflib/Tools/msvc.py (+938/-0) waflib/Tools/nasm.py (+23/-0) waflib/Tools/perl.py (+157/-0) waflib/Tools/python.py (+524/-0) waflib/Tools/qt4.py (+653/-0) waflib/Tools/ruby.py (+193/-0) waflib/Tools/suncc.py (+77/-0) waflib/Tools/suncxx.py (+78/-0) waflib/Tools/tex.py (+403/-0) waflib/Tools/vala.py (+339/-0) waflib/Tools/waf_unit_test.py (+149/-0) waflib/Tools/winres.py (+51/-0) waflib/Tools/xlc.py (+69/-0) waflib/Tools/xlcxx.py (+69/-0) waflib/Utils.py (+602/-0) waflib/__init__.py (+3/-0) waflib/ansiterm.py (+246/-0) waflib/extras/__init__.py (+3/-0) waflib/extras/add_objects.py (+7/-0) waflib/extras/batched_cc.py (+161/-0) waflib/extras/biber.py (+59/-0) waflib/extras/bjam.py (+131/-0) waflib/extras/boo.py (+81/-0) waflib/extras/boost.py (+360/-0) waflib/extras/c_bgxlc.py (+30/-0) waflib/extras/c_dumbpreproc.py (+61/-0) waflib/extras/compat15.py (+298/-0) waflib/extras/cython.py (+120/-0) waflib/extras/dcc.py (+79/-0) waflib/extras/doxygen.py (+159/-0) waflib/extras/dumbpreproc.py (+61/-0) waflib/extras/eclipse.py (+308/-0) waflib/extras/erlang.py (+19/-0) waflib/extras/fc_bgxlf.py (+33/-0) waflib/extras/fc_cray.py (+50/-0) waflib/extras/fc_open64.py (+56/-0) waflib/extras/fc_pgfortran.py (+65/-0) waflib/extras/fc_solstudio.py (+60/-0) waflib/extras/fc_xlf.py (+58/-0) waflib/extras/fluid.py (+30/-0) waflib/extras/freeimage.py (+74/-0) waflib/extras/fsb.py (+31/-0) waflib/extras/fsc.py (+66/-0) waflib/extras/gccdeps.py (+123/-0) waflib/extras/go.py (+262/-0) waflib/extras/gob2.py (+17/-0) waflib/extras/local_rpath.py (+19/-0) waflib/extras/lru_cache.py (+98/-0) waflib/extras/make.py (+142/-0) waflib/extras/md5_tstamp.py (+69/-0) waflib/extras/misc.py (+416/-0) waflib/extras/msvs.py (+1017/-0) waflib/extras/netcache_client.py (+328/-0) waflib/extras/objcopy.py (+54/-0) waflib/extras/ocaml.py (+326/-0) waflib/extras/package.py (+76/-0) waflib/extras/parallel_debug.py (+342/-0) waflib/extras/pep8.py (+106/-0) waflib/extras/pgicc.py (+69/-0) waflib/extras/pgicxx.py (+22/-0) waflib/extras/print_commands.py (+46/-0) waflib/extras/proc.py (+56/-0) waflib/extras/qnxnto.py (+74/-0) waflib/extras/relocation.py (+85/-0) waflib/extras/review.py (+328/-0) waflib/extras/sas.py (+72/-0) waflib/extras/scala.py (+130/-0) waflib/extras/slow_qt4.py (+95/-0) waflib/extras/smart_continue.py (+81/-0) waflib/extras/softlink_libs.py (+74/-0) waflib/extras/subprocess.py (+620/-0) waflib/extras/swig.py (+172/-0) waflib/extras/syms.py (+71/-0) waflib/extras/sync_exec.py (+31/-0) waflib/extras/valadoc.py (+107/-0) waflib/extras/why.py (+73/-0) waflib/extras/xcode.py (+312/-0) waflib/fixpy2.py (+67/-0) wscript (+279/-0) Conflict adding file .valencia. Moved existing file to .valencia.moved. Conflict adding file AUTHORS. Moved existing file to AUTHORS.moved. Conflict adding file COPYING. Moved existing file to COPYING.moved. Conflict adding file INSTALL. Moved existing file to INSTALL.moved. Conflict adding file configure.in. Moved existing file to configure.in.moved. Conflict adding file data. Moved existing file to data.moved. Conflict adding file diodon. Moved existing file to diodon.moved. Conflict adding file doc. Moved existing file to doc.moved. Conflict adding file libdiodon. Moved existing file to libdiodon.moved. Conflict adding file plugins. Moved existing file to plugins.moved. Conflict adding file po. Moved existing file to po.moved. Conflict adding file tests. Moved existing file to tests.moved. Conflict adding file unity-scope-diodon. Moved existing file to unity-scope-diodon.moved. Conflict adding file vapi. Moved existing file to vapi.moved. Conflict adding file waf. Moved existing file to waf.moved. Conflict adding file waflib. Moved existing file to waflib.moved. Conflict adding file wscript. Moved existing file to wscript.moved.
To merge this branch:	bzr merge lp://staging/~diodon-team/diodon/new-upstream-release-1.2.0
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Diodon Team		2014-08-04	Pending
Review via email: mp+229495@code.staging.launchpad.net

Description of the change

Updated Diodon package to the newest upstream release 1.2.0.

lp://staging/~diodon-team/diodon/new-upstream-release-1.2.0 updated on 2014-09-09

5. By Oliver Sauder on 2014-09-09: Fixed merge conflicts

Unmerged revisions

5. By Oliver Sauder on 2014-09-09: Fixed merge conflicts
4. By Oliver Sauder on 2013-07-14: * Deactivate unitylens-plugin (LP: #1189154)
* debian/patches/01_port-to-zeitgeist-2.0.patch
- Port to zeitgeist-2.0 (LP: #1197569)
* Using valac dependency instead of valac-0.16
3. By Oliver Sauder on 2013-02-19: * New upstream release.
* run dh_icons for ubuntu themes for mono icons (LP: #1102708)
2. By Oliver Sauder on 2013-01-04: Initial release (LP: #808464)
1. By Oliver Sauder on 2013-01-04: Import upstream version 1.0.1