[SCM] kppp packaging branch, master, updated. debian/15.12.0-2-3-g6852d34

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit b7da8c7e402ca28646edbe54bcc7d6bb5ff7740c
Author: Pino Toscano <pino at debian.org>
Date:   Thu Aug 25 06:18:42 2016 +0200

    simplify local installation
---
 debian/changelog    |  5 +++++
 debian/kppp.install | 13 -------------
 debian/rules        | 12 ++----------
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 62d5298..cc860c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ kppp (4:16.08.0-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Stop forcing the local installation to debian/tmp, letting the package
+    directory as install place.
+    - remove kppp.install, no more used now
+    - move the change of ownership/permissions of /usr/bin/kppp in the
+      dh_fixperms override
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Aug 2016 06:11:53 +0200
 
diff --git a/debian/kppp.install b/debian/kppp.install
deleted file mode 100644
index bd8e00b..0000000
--- a/debian/kppp.install
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/bin/kppp
-usr/bin/kppplogview
-usr/share/applications/kde4/Kppp.desktop
-usr/share/applications/kde4/kppplogview.desktop
-usr/share/dbus-1/interfaces/org.kde.kppp.xml
-usr/share/doc/kde/HTML/en/kppp/
-usr/share/icons/hicolor/128x128/apps/kppp.png
-usr/share/icons/hicolor/16x16/apps/kppp.png
-usr/share/icons/hicolor/22x22/apps/kppp.png
-usr/share/icons/hicolor/32x32/apps/kppp.png
-usr/share/icons/hicolor/48x48/apps/kppp.png
-usr/share/icons/hicolor/64x64/apps/kppp.png
-usr/share/kde4/apps/kppp/
diff --git a/debian/rules b/debian/rules
index 58dfb38..217ea2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,15 +2,7 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
-override_dh_auto_install:
-	$(overridden_command) --destdir=debian/tmp
-
-override_dh_install:
-	$(overridden_command)
-	if [ -d debian/kppp ]; then \
-	    chown root:dialout debian/kppp/usr/bin/kppp && \
-	    chmod 0754 debian/kppp/usr/bin/kppp; \
-	fi
-
 override_dh_fixperms:
 	$(overridden_command) -Xusr/bin/kppp
+	chown root:dialout debian/kppp/usr/bin/kppp
+	chmod 0754 debian/kppp/usr/bin/kppp

-- 
kppp packaging