[SCM] blinken packaging branch, master, updated. debian/16.04.1-2-4-g3767523

Pino Toscano pino at moszumanska.debian.org
Mon Aug 29 18:18:53 UTC 2016


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

The following commit has been merged in the master branch:
commit 718dcbfec3b5acf73d459ba1935362f37c906ecc
Author: Pino Toscano <pino at debian.org>
Date:   Mon Aug 29 19:56:55 2016 +0200

    simplify local installation
---
 debian/blinken.install | 7 -------
 debian/changelog       | 6 ++++++
 debian/not-installed   | 5 -----
 debian/rules           | 7 +++++--
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/debian/blinken.install b/debian/blinken.install
deleted file mode 100644
index 3d75534..0000000
--- a/debian/blinken.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/games/blinken
-usr/share/appdata/blinken.appdata.xml
-usr/share/applications/org.kde.blinken.desktop
-usr/share/blinken/
-usr/share/config.kcfg/blinken.kcfg
-usr/share/doc/HTML/*/blinken/
-usr/share/icons/hicolor/*/apps/blinken.*
diff --git a/debian/changelog b/debian/changelog
index 2ae6748..43f7755 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,12 @@ blinken (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.
+    - manually remove only the files (i.e. the fonts and the README) that are
+      not needed
+    - remove blinken.install, no more used now
+    - remove not-installed file, no more useful now
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Aug 2016 19:52:05 +0200
 
diff --git a/debian/not-installed b/debian/not-installed
deleted file mode 100644
index 34f1624..0000000
--- a/debian/not-installed
+++ /dev/null
@@ -1,5 +0,0 @@
-# Shipped in ttf-sjfonts
-./usr/share/blinken/fonts/steve.ttf
-
-# Describing the handling of the "steve" font
-./usr/share/blinken/README.packagers
diff --git a/debian/rules b/debian/rules
index bfaa7c0..1360efa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,5 +6,8 @@ override_dh_auto_configure:
 	$(overridden_command) -- -DBIN_INSTALL_DIR=/usr/games
 
 override_dh_auto_install:
-	$(overridden_command) --destdir=debian/tmp
-	-rm -rf debian/tmp/usr/share/blinken/fonts/
+	$(overridden_command)
+	# Shipped in ttf-sjfonts
+	rm -rv debian/blinken/usr/share/blinken/fonts/
+	# Describing the handling of the "steve" font
+	rm -v debian/blinken/usr/share/blinken/README.packagers

-- 
blinken packaging



More information about the pkg-kde-commits mailing list