------------------------------------------------------------
revno: 1811 [merge]
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Fri 2010-02-12 02:00:40 +0100
message:
merge
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-02-12 00:55:00 +0000
+++ b/changelog 2010-02-12 01:00:40 +0000
@@ -15,7 +15,9 @@
suggest imagemagick | graphicsmagick-imagemagick-compat instead of
vice-versa (closes: #569124)
- build-depend on libjpeg-dev instead of libjpeg62-dev
-
+ * debian/rules:
+ - wrap KDELIBS_MINVER for KDE4 into ifneq "$(LENNY_BACKPORT)" "y" as it
+ for some reason also gets used for lenny-backports which has KDE3..
* debian/control.ure.in: fix uno-libs3*'s ure replaces
* debian/changelog: mention security fixes in last uploads
=== modified file 'rules'
--- a/rules 2010-02-04 09:49:49 +0000
+++ b/rules 2010-02-12 01:00:40 +0000
@@ -170,7 +170,11 @@
endif
ifeq "$(KDE_VER)" "4"
QT_MINVER= (>= 4.5)
- KDELIBS_MINVER= (>= 4:4.3.4)
+ # somehow lenny-backport picks this up although
+ # KDE is 3...
+ ifneq "$(LENNY_BACKPORT)" "y"
+ KDELIBS_MINVER= (>= 4:4.3.4)
+ endif
endif
BUILD_DBG_PACKAGE=y
USE_SYSTEM_BSH=y
