[SCM] ktp-text-ui packaging branch, master, updated. debian/0.7.0-1-106-g6b3ee9d
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jan 27 19:54:09 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=3aceb17
The following commit has been merged in the master branch:
commit 3aceb17654c48880a481a23b694ce95e52a10ab3
Merge: fdb1ab1e1416a3597cc29724c696c7d921cc513d 4d209e3188b1cdcc497d0c24647189afb6aacf6b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Jan 26 10:04:30 2016 +0100
Merge remote-tracking branch 'kde-extras/master'
.gitignore | 8 +
.reviewboardrc | 2 +
CMakeLists.txt | 51 +
LICENSE | 9 +
adiumxtra-protocol-handler/CMakeLists.txt | 24 +
.../adiumxtra-protocol-handler.cpp | 159 +
.../adiumxtra-protocol-handler.h | 45 +
adiumxtra-protocol-handler/adiumxtra.protocol.in | 14 +
adiumxtra-protocol-handler/bundle-installer.cpp | 23 +
.../chat-style-installer.cpp | 150 +
adiumxtra-protocol-handler/chat-style-installer.h | 50 +
.../emoticon-set-installer.cpp | 129 +
.../emoticon-set-installer.h | 49 +
adiumxtra-protocol-handler/main.cpp | 60 +
app/CMakeLists.txt | 52 +
app/chat-tab.cpp | 113 +
app/chat-tab.h | 66 +
app/chat-window.cpp | 1367 +++
app/chat-window.h | 230 +
app/emoticon-text-edit-action.cpp | 64 +
app/emoticon-text-edit-action.h | 42 +
app/emoticon-text-edit-selector.cpp | 132 +
app/emoticon-text-edit-selector.h | 64 +
app/invite-contact-dialog.cpp | 113 +
app/invite-contact-dialog.h | 65 +
app/main.cpp | 72 +
...edesktop.Telepathy.Client.KTp.TextUi.service.in | 3 +
app/telepathy-chat-ui.cpp | 359 +
app/telepathy-chat-ui.h | 84 +
config/CMakeLists.txt | 7 +
config/appearance/CMakeLists.txt | 24 +
config/appearance/Messages.sh | 4 +
config/appearance/appearance-config-tab.cpp | 345 +
config/appearance/appearance-config-tab.h | 77 +
config/appearance/appearance-config.cpp | 89 +
config/appearance/appearance-config.h | 51 +
config/appearance/appearance-config.ui | 233 +
config/appearance/kcm_ktp_chat_appearance.desktop | 104 +
config/behavior/CMakeLists.txt | 23 +
config/behavior/Messages.sh | 4 +
config/behavior/behavior-config.cpp | 170 +
config/behavior/behavior-config.h | 70 +
config/behavior/behavior-config.ui | 241 +
config/behavior/kcm_ktp_chat_behavior.desktop | 58 +
config/messages/CMakeLists.txt | 20 +
config/messages/Messages.sh | 2 +
config/messages/kcm_ktp_chat_messages.desktop | 104 +
config/messages/messages-config.cpp | 56 +
config/messages/messages-config.h | 37 +
config/otr/CMakeLists.txt | 24 +
config/otr/Messages.sh | 4 +
config/otr/kcm_ktp_chat_otr.desktop | 89 +
config/otr/otr-config.cpp | 275 +
config/otr/otr-config.h | 83 +
config/otr/otr-config.ui | 439 +
data/CMakeLists.txt | 8 +
.../Contents/Resources/Footer.html | 49 +
.../Contents/Resources/Incoming/Content.html | 16 +
.../Contents/Resources/Incoming/NextContent.html | 4 +
.../Contents/Resources/Outgoing/Content.html | 16 +
.../Contents/Resources/Outgoing/NextContent.html | 4 +
.../Contents/Resources/lib/jquery.js | 9266 ++++++++++++++++++++
.../Contents/Resources/main.css | 455 +
debian/changelog | 69 +-
debian/control | 22 +-
debian/copyright | 130 +-
debian/kde-telepathy-text-ui.install | 42 +-
debian/kde-telepathy-text-ui.links | 2 -
debian/kde-telepathy-text-ui.linktrees | 1 +
debian/kde-telepathy-text-ui.lintian-overrides | 7 +-
debian/patches/01_no_useless_dependencies.diff | 29 -
debian/patches/02_ktpchat_soversion.diff | 15 -
debian/patches/03_no_redundant_glib_calls.diff | 42 -
debian/patches/drop-tests.patch | 12 -
debian/patches/series | 2 -
debian/rules | 15 +-
filters/CMakeLists.txt | 19 +
filters/bugzilla/CMakeLists.txt | 22 +
filters/bugzilla/bugzilla-filter.cpp | 146 +
filters/bugzilla/bugzilla-filter.h | 43 +
...ktptextui_message_filter_bugzilla.desktop.cmake | 97 +
filters/emoticons/CMakeLists.txt | 41 +
filters/emoticons/emoticon-config.cpp | 247 +
filters/emoticons/emoticon-config.h | 54 +
filters/emoticons/emoticon-config.ui | 73 +
filters/emoticons/emoticon-filter.cpp | 42 +
filters/emoticons/emoticon-filter.h | 35 +
.../kcm_ktptextui_message_filter_emoticons.desktop | 56 +
...tptextui_message_filter_emoticons.desktop.cmake | 104 +
filters/formatting/CMakeLists.txt | 19 +
filters/formatting/format-filter.cpp | 117 +
...ptextui_message_filter_formatting.desktop.cmake | 98 +
filters/highlight/CMakeLists.txt | 21 +
filters/highlight/highlight-filter.cpp | 61 +
...tptextui_message_filter_highlight.desktop.cmake | 103 +
filters/images/CMakeLists.txt | 23 +
filters/images/images-filter.cpp | 70 +
.../ktptextui_message_filter_images.desktop.cmake | 101 +
filters/latex/CMakeLists.txt | 42 +
.../kcm_ktptextui_message_filter_latex.desktop | 52 +
.../ktptextui_message_filter_latex.desktop.cmake | 98 +
filters/latex/latex-config.cpp | 39 +
filters/latex/latex-config.ui | 55 +
filters/latex/latex-filter.cpp | 185 +
filters/latex/latex-filter.h | 39 +
filters/otr/CMakeLists.txt | 22 +
.../otr/ktptextui_message_filter_otr.desktop.cmake | 88 +
filters/otr/otr-filter.cpp | 40 +
filters/searchexpansion/CMakeLists.txt | 22 +
...ui_message_filter_searchexpansion.desktop.cmake | 103 +
filters/searchexpansion/searchexpansion-filter.cpp | 58 +
filters/texttospeech/CMakeLists.txt | 22 +
.../ktptextui_message_filter_tts.desktop.cmake | 100 +
filters/texttospeech/tts-filter.cpp | 69 +
filters/urlexpansion/CMakeLists.txt | 23 +
...extui_message_filter_urlexpansion.desktop.cmake | 95 +
filters/urlexpansion/urlexpansion-filter.cpp | 98 +
filters/urlexpansion/urlexpansion-filter.h | 44 +
filters/youtube/CMakeLists.txt | 20 +
.../ktptextui_message_filter_youtube.desktop.cmake | 99 +
filters/youtube/youtube-filter.cpp | 77 +
image-sharer/CMakeLists.txt | 17 +
image-sharer/abstractsharer.cpp | 52 +
image-sharer/abstractsharer.h | 91 +
image-sharer/imagebinsharer.cpp | 54 +
image-sharer/imagebinsharer.h | 35 +
image-sharer/imagesharer_export.h | 37 +
image-sharer/imgursharer.cpp | 71 +
image-sharer/imgursharer.h | 35 +
image-sharer/mpform.cpp | 203 +
image-sharer/mpform.h | 58 +
image-sharer/shareprovider.cpp | 219 +
image-sharer/simplestimagehostingsharer.cpp | 52 +
image-sharer/simplestimagehostingsharer.h | 36 +
lib/CMakeLists.txt | 67 +
lib/adium-theme-view.cpp | 843 ++
lib/adium-theme-view.h | 168 +
lib/authenticationwizard.cpp | 448 +
lib/authenticationwizard.h | 106 +
lib/channel-contact-model.cpp | 225 +
lib/chat-search-bar.cpp | 187 +
lib/chat-search-bar.h | 96 +
lib/chat-text-edit.cpp | 381 +
lib/chat-text-edit.h | 92 +
lib/chat-widget.cpp | 1559 ++++
lib/chat-widget.h | 269 +
lib/chat-window-style-manager.cpp | 382 +
lib/chat-window-style.cpp | 535 ++
lib/chat-window-style.h | 239 +
lib/contact-delegate.cpp | 139 +
lib/emoticons-manager.cpp | 59 +
lib/emoticons-manager.h | 35 +
lib/ktp-debug.cpp | 21 +
lib/ktp-debug.h | 26 +
lib/ktpchat_export.h | 37 +
lib/notify-filter.cpp | 93 +
lib/otr-notifications.cpp | 141 +
lib/proxy-service.cpp | 254 +
lib/text-chat-config.cpp | 246 +
lib/text-chat-config.h | 78 +
logviewer/CMakeLists.txt | 40 +
logviewer/config/CMakeLists.txt | 23 +
logviewer/config/behavior-config.cpp | 86 +
logviewer/config/behavior-config.h | 56 +
.../config/kcm_ktp_logviewer_behavior.desktop | 53 +
logviewer/dates-model.cpp | 467 +
logviewer/dates-view-delegate.cpp | 190 +
logviewer/dates-view-delegate.h | 44 +
logviewer/debug.h | 27 +
logviewer/entity-filter-model.cpp | 125 +
logviewer/entity-model.cpp | 155 +
logviewer/entity-view-delegate.cpp | 218 +
logviewer/entity-view-delegate.h | 51 +
logviewer/entity-view.cpp | 98 +
logviewer/log-viewer.cpp | 532 ++
logviewer/log-viewer.h | 103 +
logviewer/log-viewer.ui | 94 +
logviewer/logs-import-dialog.cpp | 142 +
logviewer/logs-import-dialog.h | 63 +
logviewer/main.cpp | 96 +
logviewer/message-view.cpp | 244 +
logviewer/org.kde.ktplogviewer.desktop | 147 +
logviewer/person-entity-merge-model.cpp | 478 +
183 files changed, 30472 insertions(+), 266 deletions(-)
diff --cc debian/changelog
index a4e6d07,c72f968..f5b4534
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,46 +1,56 @@@
+ktp-text-ui (15.12.0-1~) UNRELEASED; urgency=medium
+
++ [ Maximiliano Curia ]
++ * Update watch file.
++ * Bump Standards-Version to 3.9.6.
++ * New upstream release (15.12.0).
++
++ -- Maximiliano Curia <maxy at debian.org> Wed, 16 Dec 2015 16:13:13 +0100
++
+ ktp-text-ui (15.08.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Use version of libkf5emoticons that forces emoticons-bin dependency
+ (Closes: #805453)
+
+ -- Diane Trout <diane at ghic.org> Sat, 05 Dec 2015 11:08:11 -0800
+
+ ktp-text-ui (15.08.2-1) unstable; urgency=medium
+
+ * Update watch file for KTp's move to Applications
+ * New upstream release. (Closes: #784489)
+ * Update build-depends for KF5 and rename of
+ libktpcommoninternalsprivate-dev to libktp-dev
+ * Update copyright file
+ - Remove Files-Excluded, upstream fixed
+ - Remove cmake/* as it was removed
+ - Remove all of the po/* blocks
+ * Use dhmk from pkg-kde-tools to build ktp.
+ - Change maintainer to debian-qt-kde
+ - Update debian/rules
+ * Remove kde-telepathy-text-ui.links scriptaculous was removed and
+ jquery is being handled by kde-telepathy-text-ui.linktree
+ * Update install paths for KF5 locations.
+ * Don't apply 02_ktpchat_soversion.diff
+ Remove diffs no longer being applied.
+ * Add KDE's unstable download url to watch file
+ * Use dh-linktree to use to replace jquery.js files.
+ * Add dependency on libjs-jquery to provide replacement jquery.js
+ * Update lintian-overrides for move to multiarch.
+ * Update Build-Depends to use telepathy-qt5-dev
+
+ -- Diane Trout <diane at ghic.org> Sat, 07 Nov 2015 11:02:45 -0800
+
+ ktp-text-ui (0.9.0+dfsg-1) unstable; urgency=medium
+
+ [ Diane Trout ]
* New upstream release.
* Update libtelepathy-qt build-dep to 0.9.5
- * Update libktpcommoninternalsprivate-dev build-dep to 0.8.80
+ * Update libktpcommoninternalsprivate-dev build-dep to 0.9.0
* Update libtelepathy-logger-qt build-dep to 0.8.0
- * Change kde-telepathy-data dependency to source:Upstream-Version
+ * Add libkpeople-dev 0.3 build-dep
* Change to using .install file and default dh_auto_install behavior
- - this maeks dh_install --list-missing more reliable.
+ - this makes dh_install --list-missing more reliable.
* Update version number in lintian-override
* Update copyright file
* Prevent another license file from being installed into usr/lib
@@@ -68,7 -93,7 +103,7 @@@ ktp-text-ui (0.6.3-1) unstable; urgency
* Merge libktpchat0 into ktp-telepathy-text-ui.
* Override lintian warnings about the libktpchat0 library.
-- [ Mark Purcell ]
++ [ Mark Purcell ]
* Imported Upstream version 0.6.3
* Add myself to Uploaders
* Update Build-Depends: libktpcommoninternalsprivate-dev (>= 0.6.3)
diff --cc debian/control
index 9b07f61,cce653b..c60a4d1
--- a/debian/control
+++ b/debian/control
@@@ -1,40 -1,37 +1,44 @@@
Source: ktp-text-ui
Section: kde
Priority: optional
- Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Diane Trout <diane at ghic.org>, Michał Zając <quintasan at kubuntu.org>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 9), dh-linktree,
- pkg-kde-tools (>= 0.9),
- libjs-jquery,
- libtelepathy-qt5-dev (>= 0.9.5),
- libtelepathy-logger-qt-dev,
- cmake (>= 2.8.12~),
- extra-cmake-modules (>= 1.3.0),
- libqt5webkit5-dev,
- kio-dev,
- libktp-dev (>= 15.04),
- libkf5archive-dev,
- libkf5dbusaddons-dev,
- libkf5emoticons-dev (>= 5.16-2),
- libkf5i18n-dev,
- libkf5iconthemes-dev,
- libkf5itemviews-dev,
- libkf5kcmutils-dev,
- libkf5notifications-dev,
- libkf5notifyconfig-dev,
- libkf5people-dev,
- libkf5service-dev,
- libkf5sonnet-dev,
- libkf5textwidgets-dev,
- libkf5wallet-dev,
- libkf5webkit-dev,
- libkf5widgetsaddons-dev,
- libkf5windowsystem-dev,
- libkf5xmlgui-dev,
- libqjson-dev
+Uploaders: Diane Trout <diane at ghic.org>,
+ Michał Zając <quintasan at kubuntu.org>,
+ Mark Purcell <msp at debian.org>
+Build-Depends: cmake (>= 2.8.12~),
+ debhelper (>= 9),
++ dh-linktree,
+ extra-cmake-modules (>= 1.3.0~),
+ kio-dev,
++ libjs-jquery,
+ libkf5archive-dev,
+ libkf5dbusaddons-dev,
- libkf5emoticons-dev,
++ libkf5emoticons-dev (>= 5.16-2),
+ libkf5i18n-dev,
+ libkf5iconthemes-dev,
+ libkf5itemviews-dev,
+ libkf5kcmutils-dev,
+ libkf5notifications-dev,
+ libkf5notifyconfig-dev,
++ libkf5people-dev,
+ libkf5service-dev,
+ libkf5sonnet-dev,
+ libkf5textwidgets-dev,
++ libkf5wallet-dev,
+ libkf5webkit-dev,
+ libkf5widgetsaddons-dev,
+ libkf5windowsystem-dev,
+ libkf5xmlgui-dev,
- libktp-dev,
++ libktp-dev (>= 15.04),
+ libktpcommoninternalsprivate-dev (>= 0.8.80),
+ libqjson-dev,
+ libqt5webkit5-dev (>= 5.4),
+ libqtwebkit-dev,
+ libtelepathy-logger-dev,
- libtelepathy-logger-qt4-dev (>= 0.8.0),
- libtelepathy-qt4-dev (>= 0.9.5),
++ libtelepathy-logger-qt-dev (>= 0.8.0),
++ libtelepathy-qt5-dev (>= 0.9.5),
+ pkg-kde-tools (>= 0.9),
+ qtbase5-dev
Standards-Version: 3.9.6
Homepage: https://projects.kde.org/projects/extragear/network/telepathy/ktp-text-ui
Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-text-ui.git
diff --cc debian/rules
index c3d7639,8423c11..c8bbd32
--- a/debian/rules
+++ b/debian/rules
@@@ -1,13 -1,13 +1,10 @@@
#!/usr/bin/make -f
- %:
- dh $@ --parallel --with kde --dbg-package=kde-telepathy-text-ui-dbg
+ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+
+ override_dh_strip:
+ $(overridden_command) --dbg-package=kde-telepathy-text-ui-dbg
override_dh_install:
- rm "debian/tmp/usr/share/kde4/apps/ktelepathy/styles/renkoo.AdiumMessageStyle/Contents/Resources/Renkoo LICENSE.txt"
- rm "debian/tmp/usr/share/kde4/apps/ktelepathy/styles/SimKete.AdiumMessageStyle/Contents/README"
- rm "debian/tmp/usr/share/kde4/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/LICENSE"
- rm "debian/tmp/usr/share/kde4/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/lib/jquery.min.js"
- rm "debian/tmp/usr/share/kde4/apps/ktelepathy/styles/WoshiChat.AdiumMessageStyle/Contents/Resources/lib/scriptaculous183.js"
- rm "debian/tmp/usr/lib/libktpchat.so"
- dh_install --list-missing
+ $(overridden_command) --fail-missing
+ dh_linktree
-
-get-orig-source:
- uscan --verbose --force-download --repack --compression xz
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list