[SCM] kmail packaging branch, master, updated. debian/4%17.08.3-1-9-gcb194ff

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kmail.git;a=commitdiff;h=6cba2ef

The following commit has been merged in the master branch:
commit 6cba2ef2c2e04398451b4e463295d0dff159b024
Author: Pino Toscano <pino at debian.org>
Date:   Tue Dec 26 10:03:31 2017 +0100

    simplify local install
---
 debian/changelog     |  3 +++
 debian/kmail.install | 62 ----------------------------------------------------
 debian/rules         |  3 +++
 3 files changed, 6 insertions(+), 62 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b972c7..00d32fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ kmail (4:17.08.3-2) UNRELEASED; urgency=medium
   * Remove the gnupg-agent recommend, as it is an internal implementation of
     gnupg.
   * Simplify watch file, and switch it to https.
+  * Force the local installation to debian/kmail, which is the only real
+    binary; this avoids unnecessary copies of stuff from debian/tmp.
+    - remove kmail.install, no more used now
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Dec 2017 09:58:05 +0100
 
diff --git a/debian/kmail.install b/debian/kmail.install
deleted file mode 100644
index 636a351..0000000
--- a/debian/kmail.install
+++ /dev/null
@@ -1,62 +0,0 @@
-etc/xdg/kmail.categories
-etc/xdg/kmail.renamecategories
-etc/xdg/ktnef.categories
-usr/bin/akonadi_archivemail_agent
-usr/bin/akonadi_followupreminder_agent
-usr/bin/akonadi_mailfilter_agent
-usr/bin/akonadi_sendlater_agent
-usr/bin/kmail
-usr/bin/ktnef
-usr/lib/*/libkmailprivate.so.5*
-usr/lib/*/qt5/plugins/kcm_kmail.so
-usr/lib/*/qt5/plugins/kcm_kmailsummary.so
-usr/lib/*/qt5/plugins/kcm_kontactsummary.so
-usr/lib/*/qt5/plugins/kcm_kpimidentities.so
-usr/lib/*/qt5/plugins/kmailpart.so
-usr/lib/*/qt5/plugins/kontact_kmailplugin.so
-usr/lib/*/qt5/plugins/kontact_summaryplugin.so
-usr/share/akonadi/agents/
-usr/share/applications/kmail_view.desktop
-usr/share/applications/org.kde.kmail2.desktop
-usr/share/applications/org.kde.ktnef.desktop
-usr/share/config.kcfg/
-usr/share/dbus-1/interfaces/org.kde.kmail.kmail*.xml
-usr/share/doc/HTML/*/akonadi_archivemail_agent/
-usr/share/doc/HTML/*/akonadi_followupreminder_agent/
-usr/share/doc/HTML/*/akonadi_sendlater_agent/
-usr/share/doc/HTML/*/kmail2/
-usr/share/doc/HTML/*/ktnef/index.cache.bz2
-usr/share/doc/HTML/*/ktnef/index.docbook
-usr/share/doc/HTML/*/ktnef/mainwindow.png
-usr/share/doc/HTML/*/ktnef/winmail_dat.png
-usr/share/icons/breeze-dark/*/emblems/
-usr/share/icons/hicolor/*/apps/kmail.png
-usr/share/icons/hicolor/16x16/emblems/
-usr/share/icons/hicolor/22x22/actions/ktnef_extract_all_to.png
-usr/share/icons/hicolor/22x22/actions/ktnef_extract_to.png
-usr/share/icons/hicolor/22x22/emblems/
-usr/share/icons/hicolor/48x48/apps/ktnef.png
-usr/share/icons/hicolor/8x8/emblems/
-usr/share/icons/hicolor/scalable/apps/
-usr/share/icons/locolor/16x16/actions/ktnef_extract_all_to.png
-usr/share/icons/locolor/16x16/actions/ktnef_extract_to.png
-usr/share/icons/locolor/16x16/apps/ktnef.png
-usr/share/icons/locolor/32x32/apps/ktnef.png
-usr/share/kconf_update/kmail-15.08-kickoff.sh
-usr/share/kconf_update/kmail.upd
-usr/share/kmail2/pics/pgp-keys.png
-usr/share/knotifications5/akonadi_*.notifyrc
-usr/share/knotifications5/kmail2.notifyrc
-usr/share/kontact/ksettingsdialog/
-usr/share/kservices5/ServiceMenus/kmail_addattachmentservicemenu.desktop
-usr/share/kservices5/kcm_kpimidentities.desktop
-usr/share/kservices5/kcmkmailsummary.desktop
-usr/share/kservices5/kcmkontactsummary.desktop
-usr/share/kservices5/kmail_*.desktop
-usr/share/kservices5/kontact/
-usr/share/kservicetypes5/dbusmail.desktop
-usr/share/kxmlgui5/kmail2/
-usr/share/kxmlgui5/kontactsummary/kontactsummary_part.rc
-usr/share/locale/
-usr/share/messageviewer/about/default/introduction_kmail.html
-usr/share/metainfo/org.kde.kmail2.appdata.xml
diff --git a/debian/rules b/debian/rules
index 8a9ce0a..100b64d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@ override_dh_auto_test:
 	# Disable dh_auto_test at build time
 	:
 
+override_dh_auto_install:
+	$(overridden_command) --destdir=debian/kmail
+
 # Strict local dependencies (there are no external ones anyway)
 override_dh_makeshlibs:
 	$(overridden_command) -V

-- 
kmail packaging