[rkward-cvs] SF.net SVN: rkward:[2592] trunk/rkward/debian/rules

[tfry at users.sourceforge.net]

Revision: 2592
          http://rkward.svn.sourceforge.net/rkward/?rev=2592&view=rev
Author:   tfry
Date:     2009-08-04 14:44:28 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
Attempt to detect the need for hardy patch without depending on lsb_release (Meik: Does this work for you?)

Modified Paths:
--------------
    trunk/rkward/debian/rules

Modified: trunk/rkward/debian/rules
===================================================================
--- trunk/rkward/debian/rules	2009-08-04 11:31:24 UTC (rev 2591)
+++ trunk/rkward/debian/rules	2009-08-04 14:44:28 UTC (rev 2592)
@@ -5,19 +5,16 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Determine the installed distribution and release number
-# Will be used to determine if certain tweaks are needed, see below
-DISTRO = $(shell lsb_release -s -i -r)
-
-# Ubuntu 8.04 uses a different PATH for KDE 4 apps and needs some patching
-ifeq ("$(DISTRO)","Ubuntu 8.04")
-export PATH := $(PATH):/usr/lib/kde4/bin
-# If the following variables are set, patches are applied
-PATCHTARGET = patch-ubuntu804
-UNPATCHTARGET = unpatch
+# kdelibs 4:4.0.x (still around in Ubuntu 8.04) uses a different PATH for KDE 4 apps and needs some patching
+KDELIBSVERSION = $(shell dpkg-query -W --showformat='$${Version}' kdelibs5-dev)
+KDELIBS4DOT0 = $(shell dpkg --compare-versions "$(KDEBLIBSVERSION)" lt "4:4.1.0" || echo -n "1")
+ifneq (,$(KDELIBS4DOT0))
+	export PATH := $(PATH):/usr/lib/kde4/bin
+	# If the following variables are set, patches are applied
+	PATCHTARGET = patch-ubuntu804
+	UNPATCHTARGET = unpatch
 endif
 
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.