------------------------------------------------------------
revno: 1608 [merge]
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Tue 2009-06-30 04:25:29 +0200
message:
merge
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-06-23 08:38:36 +0000
+++ b/changelog 2009-06-30 02:25:29 +0000
@@ -8,6 +8,7 @@
* debian/rules:
- fix typo in kde-icons-oxygen Suggests (closes: #534261)
+ - stop running dh_desktop on sid, thanks lintian
-- Rene Engelhard <[email protected]> Sat, 20 Jun 2009 14:08:52 +0200
=== modified file 'rules'
--- a/rules 2009-06-19 21:12:56 +0000
+++ b/rules 2009-06-30 02:25:29 +0000
@@ -3030,7 +3030,9 @@
else
dh_strip -s
endif
+ifneq "$(LENNY_BACKPORT)" "y"
dh_desktop -s
+endif
dh_icons -s
ifeq "$(ENABLE_MONO)" "y"
dh_installcligac -s
@@ -3218,7 +3220,9 @@
dh_lintian -i
dh_link -i
dh_fixperms -i
+ifneq "$(LENNY_BACKPORT)" "y"
dh_desktop -i
+endif
dh_icons -i
dh_installxmlcatalogs -i
ifeq "$(ENABLE_MONO)" "y"
