[SCM] KDE SDK module packaging branch, master, updated. debian/4.4.5-1-27-g3920979

Pino Toscano pino-guest at alioth.debian.org
Fri Feb 25 12:56:09 UTC 2011


The following commit has been merged in the master branch:
commit 3920979e5ea7ffca57c6c8be9712a06085895808
Author: Pino Toscano <pino at kde.org>
Date:   Fri Feb 25 13:54:39 2011 +0100

    Do not ship kdesrc-build with kdesdk-scripts.
    
    It is releated separately (and will be packaged as such), and won't be released with kdedk 4.7 anymore.
    Given there is no kdesrc-build in archive yet, this way we can avoid conflicts/replaces later.
---
 debian/changelog              |    2 ++
 debian/kdesdk-scripts.install |    6 ------
 debian/not-installed          |    8 ++++++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 625c9d8..c5edde8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ kdesdk (4:4.6.0-0r1) UNRELEASED; urgency=low
   
   [ Pino Toscano ]
   * Add build dependency on libqca2-dev.
+  * Do not ship kdesrc-build with kdesdk-scripts, it will be packaged
+    separately.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 04 Sep 2010 12:56:39 +0300
 
diff --git a/debian/kdesdk-scripts.install b/debian/kdesdk-scripts.install
index 40d99ec..9c5b600 100644
--- a/debian/kdesdk-scripts.install
+++ b/debian/kdesdk-scripts.install
@@ -32,7 +32,6 @@ usr/bin/kdedoc
 usr/bin/kdekillall
 usr/bin/kdelnk2desktop.py
 usr/bin/kdemangen.pl
-usr/bin/kdesrc-build
 usr/bin/krazy-licensecheck
 usr/bin/makeobj
 usr/bin/noncvslist
@@ -54,11 +53,6 @@ usr/bin/svnrevertlast
 usr/bin/svnversions
 usr/bin/wcgrep
 usr/bin/zonetab2pot.py
-usr/share/applications/kde4/kdesrc-build.desktop
-usr/share/doc/kde/HTML/en/kdesrc-build/common
-usr/share/doc/kde/HTML/en/kdesrc-build/index.cache.bz2
-usr/share/doc/kde/HTML/en/kdesrc-build/index.docbook
-usr/share/kde4/apps/katepart/syntax/kdesrc-buildrc.xml
 usr/share/man/man1/adddebug.1
 usr/share/man/man1/cheatmake.1
 usr/share/man/man1/create_cvsignore.1
diff --git a/debian/not-installed b/debian/not-installed
index 0f0b882..9de7c91 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -767,6 +767,14 @@
 ./usr/lib/liboktetakastencore.so
 ./usr/lib/liboktetakastengui.so
 
+# kdesrc-build, packaged separately
+./usr/bin/kdesrc-build
+./usr/share/applications/kde4/kdesrc-build.desktop
+./usr/share/doc/kde/HTML/en/kdesrc-build/common
+./usr/share/doc/kde/HTML/en/kdesrc-build/index.cache.bz2
+./usr/share/doc/kde/HTML/en/kdesrc-build/index.docbook
+./usr/share/kde4/apps/katepart/syntax/kdesrc-buildrc.xml
+
 #other devstuff
 ./usr/include/kate/application.h
 ./usr/include/kate/documentmanager.h

-- 
KDE SDK module packaging



More information about the pkg-kde-commits mailing list