[SCM] quassel packaging branch, master, updated. debian/1%0.12.3-1-3-g3a41c14

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/quassel.git;a=commitdiff;h=3a41c14

The following commit has been merged in the master branch:
commit 3a41c14239dc0a2c1b82812036cc13dc7a23485c
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Feb 13 16:33:48 2016 +0100

    Replace bundled inxi script with a symlink to the one provided by pkg:inxi.
    
    Closes: #814278
---
 debian/changelog          | 2 ++
 debian/control            | 1 +
 debian/quassel-data.links | 1 +
 debian/rules              | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8641772..8b941fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ quassel (1:0.12.3-2) UNRELEASED; urgency=medium
   * quassel-core: Add libqt5sql5-psql to Suggests since PostgreSQL is supported
     as an alternative backend. (Closes: #552374)
   * Pass service name to dh_systemd_*. (Closes: #811149)
+  * Replace bundled inxi script with a symlink to the one provided by pkg:inxi.
+    (Closes: #814278)
 
  -- Felix Geyer <fgeyer at debian.org>  Sat, 13 Feb 2016 16:09:33 +0100
 
diff --git a/debian/control b/debian/control
index 2fc374a..407e139 100644
--- a/debian/control
+++ b/debian/control
@@ -74,6 +74,7 @@ Package: quassel-data
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: oxygen-icon-theme
+Suggests: inxi
 Conflicts: quassel-data-kde4
 Description: distributed IRC client - shared data
  Quassel is a modern, cross-platform, distributed IRC client, meaning that
diff --git a/debian/quassel-data.links b/debian/quassel-data.links
new file mode 100644
index 0000000..d743162
--- /dev/null
+++ b/debian/quassel-data.links
@@ -0,0 +1 @@
+/usr/bin/inxi /usr/share/quassel/scripts/inxi
diff --git a/debian/rules b/debian/rules
index 970d0d1..80da198 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@ override_dh_auto_configure:
 
 override_dh_install:
 	dh_install --fail-missing
+	# replace inxi with a symlink
+	rm debian/quassel-data/usr/share/quassel/scripts/inxi
 
 override_dh_installinit:
 	dh_installinit -r --error-handler=exit --name=quasselcore

-- 
quassel packaging