[Pkg-kde-commits] rev 538 - in branches/kde-3.4.0: cdbs packages/kdelibs/debian

[Adeodato Simó]

Author: dato-guest
Date: 2005-02-28 03:41:10 +0100 (Mon, 28 Feb 2005)
New Revision: 538

Modified:
   branches/kde-3.4.0/cdbs/kde.mk
   branches/kde-3.4.0/packages/kdelibs/debian/changelog
Log:
cdbs/kde.mk:
  - Use escaped variables in the definitions of kde_htmldir and
    the like instead of absolute paths, so that /usr/bin/kde-config doesn't
    output them expanded even when --expandvars is not used. (Closes: #287822)


Modified: branches/kde-3.4.0/cdbs/kde.mk
===================================================================
--- branches/kde-3.4.0/cdbs/kde.mk	2005-02-28 01:31:37 UTC (rev 537)
+++ branches/kde-3.4.0/cdbs/kde.mk	2005-02-28 02:41:10 UTC (rev 538)
@@ -41,9 +41,9 @@
 
 include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
-export kde_cgidir = /usr/lib/cgi-bin
-export kde_confdir = /etc/kde3
-export kde_htmldir = /usr/share/doc/kde/HTML
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/kde3
+export kde_htmldir = \$${datadir}/doc/kde/HTML
 
 ifeq (,$(findstring nofinal,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)

Modified: branches/kde-3.4.0/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-02-28 01:31:37 UTC (rev 537)
+++ branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-02-28 02:41:10 UTC (rev 538)
@@ -1,3 +1,13 @@
+kdelibs (4:3.4.0~rc1-2) experimental; urgency=low
+
+  +++ Changes by Adeodato Simó:
+
+  * [cdbs/kde.mk] Use escaped variables in the definitions of kde_htmldir and
+    the like instead of absolute paths, so that /usr/bin/kde-config doesn't
+    output them expanded even when --expandvars is not used. (Closes: #287822)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Date
+
 kdelibs (4:3.4.0~rc1-1) experimental; urgency=low
 
   * First release candidate for the upcoming KDE 3.4 release.