[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.8.0-7-ge860948

Modestas Vainius modax at alioth.debian.org
Fri May 28 18:43:24 UTC 2010


The following commit has been merged in the master branch:
commit 9301d424fff959e76c043e0713a8c53a748bbf1b
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri May 28 21:32:21 2010 +0300

    Switch HTML_INSTALL_DIR from /usr/share/doc/kde4/HTML to /usr/share/doc/kde/HTML.
    
    Also add NEWS entry about this important change which may trigger FTBFSes in
    the third party packages.
---
 datalib/kde4_flags |    2 +-
 debian/NEWS        |    8 ++++++++
 debian/changelog   |    3 +++
 3 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/datalib/kde4_flags b/datalib/kde4_flags
index 3d2f65f..93f1b24 100644
--- a/datalib/kde4_flags
+++ b/datalib/kde4_flags
@@ -5,7 +5,7 @@
 -DKDE4_USE_ALWAYS_FULL_RPATH=false
 -DCONFIG_INSTALL_DIR=/usr/share/kde4/config
 -DDATA_INSTALL_DIR=/usr/share/kde4/apps
--DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML
+-DHTML_INSTALL_DIR=/usr/share/doc/kde/HTML
 -DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg
 -DLIB_INSTALL_DIR=/usr/lib
 -DSYSCONF_INSTALL_DIR=/etc
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..36145ea
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,8 @@
+pkg-kde-tools (0.9.0) unstable; urgency=low
+
+  HTML_INSTALL_DIR path has been switched from /usr/share/doc/kde4/HTML to
+  /usr/share/doc/kde/HTML. If you refer to usr/share/doc/kde4/ anywhere in the
+  packaging (esp. debian/*.install or debian/rules files), replace it with
+  /usr/share/doc/kde/ and bump pkg-kde-tools build dependency to (>= 0.9).
+
+ -- Modestas Vainius <modax at debian.org>  Fri, 28 May 2010 21:22:19 +0300
diff --git a/debian/changelog b/debian/changelog
index 290ac81..41335f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ pkg-kde-tools (0.9.0~pre1) UNRELEASED; urgency=low
     cdbs/symbolshelper.mk.
   * qt-kde-team/1/debian-qt-kde.mk: enable quilt patchsystem only if 
     quilt is in Build-Depends. This adds support for 3.0 (quilt) source format.
+  * Switch HTML_INSTALL_DIR from /usr/share/doc/kde4/HTML to
+    /usr/share/doc/kde/HTML, add NEWS entry about this important change which
+    may trigger FTBFSes in the third party packages.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 25 May 2010 17:31:29 +0300
 

-- 
Debian Qt/KDE packaging tools



More information about the pkg-kde-commits mailing list