[SCM] khangman packaging branch, kubuntu_vivid_archive, updated. debian/4.14.1-1-16-g16677fa

Scarlett Clark sgclark-guest at moszumanska.debian.org
Thu Mar 12 18:05:47 UTC 2015


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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 16677fad543de7c5cec1401da185a08ea1924582
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Mar 12 11:05:28 2015 -0700

    Merge of course broke my build..
---
 debian/changelog        | 1 +
 debian/khangman.install | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 62e487b..decea78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ khangman (4:14.12.3-0ubuntu1) UNRELEASED; urgency=medium
   * New upstream release
   * Remove wildcard from not-installed and hard code path. 
   * Manual merge kubuntu_unstable. 
+  * Merge of course broke my build.. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 09 Mar 2015 10:37:25 -0700
 
diff --git a/debian/khangman.install b/debian/khangman.install
index 7990c34..5a28908 100644
--- a/debian/khangman.install
+++ b/debian/khangman.install
@@ -1,5 +1,6 @@
 etc/
 usr/bin/khangman
+usr/lib/*/libkhangmanengine.so.*
 usr/share/appdata/khangman.appdata.xml
 usr/share/applications/org.kde.khangman.desktop
 usr/share/config.kcfg/khangman.kcfg
@@ -11,5 +12,7 @@ usr/share/icons/hicolor/48x48/apps/khangman.png
 usr/share/icons/hicolor/64x64/apps/khangman.png
 usr/share/icons/hicolor/80x80/apps/khangman-harmattan.png
 usr/share/icons/hicolor/scalable/apps/khangman.svgz
-usr/share/khangman/qml
+usr/share/khangman/pics
+usr/share/khangman/sounds
 usr/share/khangman/themes
+usr/share/kxmlgui5/khangman/khangmanui.rc

-- 
khangman packaging



More information about the pkg-kde-commits mailing list