[SCM] ksirk packaging branch, master, updated. debian/16.04.0-1.1-8-gec55f19

Pino Toscano pino at moszumanska.debian.org
Sun Dec 31 17:29:06 UTC 2017


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

The following commit has been merged in the master branch:
commit 0dd1105ea7742ec4eb8892a61c03a0ad036ba75b
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 31 18:20:45 2017 +0100

    simplify local install
---
 debian/changelog     |  5 +++++
 debian/ksirk.install | 42 ------------------------------------------
 debian/not-installed |  2 --
 debian/rules         |  5 ++++-
 4 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7d24bdb..8912463 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ ksirk (4:17.08.3-0r1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Standards-Version to 4.1.3, no changes required.
   * Simplify watch file, and switch it to https.
+  * Stop forcing debian/tmp as local installation directory, installing
+    everything to the final location
+    - drop ksirk.install, no more useful now
+    - make sure to not ship development .so symlinks, and static libraries
+    - drop not-installed, no more needed now
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 31 Oct 2017 18:02:49 +0100
 
diff --git a/debian/ksirk.install b/debian/ksirk.install
deleted file mode 100644
index 0621e8d..0000000
--- a/debian/ksirk.install
+++ /dev/null
@@ -1,42 +0,0 @@
-usr/games/ksirk
-usr/games/ksirkskineditor
-usr/lib/libiris_ksirk.so.2
-usr/lib/libiris_ksirk.so.2.*
-usr/share/applications/kde4/ksirk.desktop
-usr/share/applications/kde4/ksirkskineditor.desktop
-usr/share/doc/kde/HTML/en/ksirk/
-usr/share/doc/kde/HTML/en/ksirkskineditor/alaska.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/attackOne.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/attackThree.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/attackTwo.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/bluedices.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/cannon.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/cavalry.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/common
-usr/share/doc/kde/HTML/en/ksirkskineditor/defendOne.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/defendTwo.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/exploding.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/firing.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/index.cache.bz2
-usr/share/doc/kde/HTML/en/ksirkskineditor/index.docbook
-usr/share/doc/kde/HTML/en/ksirkskineditor/infantry.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/italy.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/load.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/main-snapshot.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/map-mask.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/map.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/mark1.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/moveArmies.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/newNetGame.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/nextPlayer.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/recycling.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/recyclingFinished.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/reddices.png
-usr/share/doc/kde/HTML/en/ksirkskineditor/save.png
-usr/share/icons/hicolor/*/apps/ksirk.png
-usr/share/icons/locolor/*/apps/ksirk.png
-usr/share/kde4/apps/ksirk/
-usr/share/kde4/apps/ksirkskineditor/
-usr/share/kde4/config.kcfg/ksirksettings.kcfg
-usr/share/kde4/config.kcfg/ksirkskineditorsettings.kcfg
-usr/share/kde4/config/ksirk.knsrc
diff --git a/debian/not-installed b/debian/not-installed
deleted file mode 100644
index 6121bfe..0000000
--- a/debian/not-installed
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libiris_ksirk.a
-usr/lib/libiris_ksirk.so
diff --git a/debian/rules b/debian/rules
index af1bd9b..97a7d65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,4 +6,7 @@ override_dh_auto_configure:
 	$(overridden_command) -- -DBIN_INSTALL_DIR=/usr/games
 
 override_dh_auto_install:
-	$(overridden_command) --destdir=debian/tmp
+	$(overridden_command)
+	# do not ship development stuff
+	find debian/ksirk -name '*.so' -type l -delete
+	find debian/ksirk -name '*.a' -delete

-- 
ksirk packaging



More information about the pkg-kde-commits mailing list