[SCM] KDE Games module packaging branch, master, updated. debian/4.4.5-1-32-g4a8f100

Modestas Vainius modax at alioth.debian.org
Thu Mar 31 23:41:01 UTC 2011


The following commit has been merged in the master branch:
commit 6bd5788b7f109dddeb858853e5bd1e9456b68dcf
Author: Modestas Vainius <modax at debian.org>
Date:   Fri Apr 1 02:18:29 2011 +0300

    Do not install upstream changelog if its size is 0 (affects kgoldrunner).
---
 debian/changelog |    1 +
 debian/rules     |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b376ab..343eec1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ kdegames (4:4.6.1-0r1) UNRELEASED; urgency=low
   * Add ${misc:Depends} to Depends of packages where it was missing.
   * Move kdegames-dbg package to the bottom of the debian/control.
   * Add ${perl:Depends} to katomic and klickety Depends.
+  * Do not install upstream changelog if its size is 0 (affects kgoldrunner).
 
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.6.1.
diff --git a/debian/rules b/debian/rules
index 4c57334..aa9642c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ upstream_changelogs = $(strip $(wildcard */ChangeLog) $(wildcard */CHANGELOG) $(
 ifneq (,$(upstream_changelogs))
 $(upstream_changelogs):
 	$(and $(filter $(firstword $(subst /, ,$@)),$(all_packages)),\
-        dh_installchangelogs $(DHMK_OPTIONS) -p$(firstword $(subst /, ,$@) $@) $@)
+        if [ -s $@ ]; then dh_installchangelogs $(DHMK_OPTIONS) -p$(firstword $(subst /, ,$@) $@) $@; fi)
 .PHONY: $(upstream_changelogs)
 endif
 

-- 
KDE Games module packaging



More information about the pkg-kde-commits mailing list