[SCM] ktp-common-internals packaging branch, experimental, created. debian/0.6.3-1-6-gfc90e11
Diane Trout
diane-guest at alioth.debian.org
Thu Oct 3 16:34:12 UTC 2013
The branch, experimental has been created
at fc90e11adceaf54ef7c9becf5adcb9b437e6a317 (commit)
- Shortlog ------------------------------------------------------------
commit fc90e11adceaf54ef7c9becf5adcb9b437e6a317
Author: Diane Trout <diane at ghic.org>
Date: Thu Oct 3 09:32:09 2013 -0700
Add desktop and service files for new plugins
commit 12fa84c7b705a2fcbcb4dbec46da37b163a8cbc4
Author: Diane Trout <diane at ghic.org>
Date: Thu Oct 3 09:29:19 2013 -0700
Ship new libraries libktploggerprivate.
* Ship new libraries libktploggerprivate.
* Ship plugins imdetailswidgetplugin, im_persons_data_source_plugin,
ktploggerplugin, ktp_kpeople_plugin, nepomuktelepathyservice
* Bump libktpcommoninternalsprivate SONAME to 6
commit 44c688248d3d4b2da1cabaf26dbe2164ae29960f
Author: Diane Trout <diane at ghic.org>
Date: Tue Sep 24 21:27:41 2013 -0700
Imported upstream 0.6.80
commit 2c350fe6d449083a4c6d2a1a2d41de45da439123
Merge: 9ffb303 7d3a746
Author: Diane Trout <diane at ghic.org>
Date: Tue Sep 24 21:24:16 2013 -0700
Merge tag 'upstream/0.6.80'
Upstream version 0.6.80
No I don't know why there were conflicts, I think its because the release
didn't use gbp correctly.
Conflicts:
CMakeLists.txt
po/bs/ktp-common-internals.po
po/ca/ktp-common-internals.po
po/ca at valencia/ktp-common-internals.po
po/cs/ktp-common-internals.po
po/da/ktp-common-internals.po
po/de/ktp-common-internals.po
po/el/ktp-common-internals.po
po/es/ktp-common-internals.po
po/et/ktp-common-internals.po
po/fi/ktp-common-internals.po
po/fr/ktp-common-internals.po
po/ga/ktp-common-internals.po
po/gl/ktp-common-internals.po
po/hu/ktp-common-internals.po
po/ia/ktp-common-internals.po
po/it/ktp-common-internals.po
po/ja/ktp-common-internals.po
po/kk/ktp-common-internals.po
po/lt/ktp-common-internals.po
po/mr/ktp-common-internals.po
po/nb/ktp-common-internals.po
po/nds/ktp-common-internals.po
po/nl/ktp-common-internals.po
po/pl/ktp-common-internals.po
po/pt/ktp-common-internals.po
po/pt_BR/ktp-common-internals.po
po/ro/ktp-common-internals.po
po/ru/ktp-common-internals.po
po/sk/ktp-common-internals.po
po/sl/ktp-common-internals.po
po/sr/ktp-common-internals.po
po/sr at ijekavian/ktp-common-internals.po
po/sr at ijekavianlatin/ktp-common-internals.po
po/sr at latin/ktp-common-internals.po
po/sv/ktp-common-internals.po
po/uk/ktp-common-internals.po
po/zh_CN/ktp-common-internals.po
po/zh_TW/ktp-common-internals.po
commit 7d3a746592228c73bd2f82be3867b455ac3070cc
Author: Diane Trout <diane at ghic.org>
Date: Tue Sep 24 20:31:39 2013 -0700
Imported Upstream version 0.6.80
commit b221ae9256df9e6b9a59c1329fa908920e98269d
Author: Diane Trout <diane at ghic.org>
Date: Tue Sep 24 20:31:10 2013 -0700
Imported Upstream version 0.6.80
-----------------------------------------------------------------------
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list