[SCM] kactivities packaging branch, master, updated. debian/4.13.1-1-128-gfafc380

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kactivities.git;a=commitdiff;h=f674163

The following commit has been merged in the master branch:
commit f67416385fa43efaca214cdb539844655ddd5c3c
Author: Philip Muskovac <yofel at gmx.net>
Date:   Mon May 21 08:37:20 2012 +0200

    * Merge with debian git, remaining changes:
      - keep own symbol file
    * Remove obsolete libkactivities.install
    * New upstream beta release
      TODO
---
 debian/changelog                  | 21 +++++++++++++++++++++
 debian/control                    | 36 +++++++++++++++++++++---------------
 debian/libkactivities-dev.install |  4 ++--
 debian/libkactivities.install     |  4 ----
 debian/libkactivities6.install    |  3 +--
 debian/source/local-options       |  1 +
 6 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e799355..7a0e642 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kactivities (4:4.8.80-0ubuntu1) UNRELEASED; urgency=low
+
+  * Merge with debian git, remaining changes: 
+    - keep symbol file
+  * New upstream beta release
+    TODO
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Mon, 21 May 2012 08:24:10 +0200
+
 kactivities (4:4.8.3-0ubuntu1) quantal; urgency=low
 
   * New upstream release
@@ -5,6 +14,17 @@ kactivities (4:4.8.3-0ubuntu1) quantal; urgency=low
 
  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 13 May 2012 19:02:42 +0200
 
+kactivities (4:4.8.3-0r1) UNRELEASED; urgency=low
+
+  [ Eshat Cakar ]
+  * New upstream release, start from kubuntu packaging, thanks!
+  * Bump kdelibs5-dev depends to 4.8.
+
+  [ José Manuel Santamaría Lema ]
+  * Bump kde-sc-dev-latest build dependency to 4:4.8.3.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 Mar 2012 21:11:33 +0100
+
 kactivities (4:4.8.2-0ubuntu2) precise-proposed; urgency=low
 
   * Rebuild for .pot generation
@@ -51,3 +71,4 @@ kactivities (4:4.7.90-0ubuntu1) precise; urgency=low
   * New upstream beta release
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 13 Dec 2011 11:53:27 +0000
+
diff --git a/debian/control b/debian/control
index 54822c7..45c22ff 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,14 @@ Source: kactivities
 Section: kde
 Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-XSBC-Original-Maintainer: Jonathan Riddell <jriddell at ubuntu.com>
-Build-Depends: kde-sc-dev-latest (>= 4:4.8.3),
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Eshat Cakar <info at eshat.de>
+Build-Depends: kde-sc-dev-latest (>= 4:4.8.80),
  cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.8.1), libsoprano-dev, shared-desktop-ontologies
-Standards-Version: 3.9.2
+ kdelibs5-dev (>= 4:4.8),
+ libsoprano-dev,
+ shared-desktop-ontologies (>= 0.8.1)
+Standards-Version: 3.9.3
 Homepage: http://www.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kactivities
 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kactivities
@@ -14,18 +17,21 @@ Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kactivi
 Package: libkactivities-bin
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: kde-runtime (<< 4:4.8.0), kde-runtime-data (<< 4:4.8.0)
-Replaces: kde-runtime (<< 4:4.8.0), kde-runtime-data (<< 4:4.8.0)
+Breaks: kde-runtime (<< 4:4.8), kde-runtime-data (<< 4:4.8),
+ kdebase-runtime (<< 4:4.8), kdebase-runtime-data (<< 4:4.8)
+Replaces: kde-runtime (<< 4:4.8), kde-runtime-data (<< 4:4.8),
+ kdebase-runtime (<< 4:4.8), kdebase-runtime-data (<< 4:4.8)
 Description: executables for the KDE Activities
  This package contains binary files shipped with the KDE Activities library.
  .
  This package is part of the Plasma Contour Active Platform.
 
 Package: libkactivities6
+Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libkactivities-bin (= ${binary:Version})
 Description: Activities library
- This library provides functionality for managing Activities.
+ This library provides functionality for managing activities.
  .
  This package is part of the KDE Development Platform libraries module.
 
@@ -35,9 +41,8 @@ Architecture: any
 Depends: libkactivities6 (= ${binary:Version}), ${misc:Depends},
  ${sameVersionDep:kdelibs5-dev:libkactivities6}
 Description: development files for the KDE Activities libraries
- This library provides functionality for managing Activities.
- .
- This package contains developer files for the library.
+ This package contains the development files for developing with the
+ kactivities library.
  .
  This package is part of the KDE Development Platform libraries module.
 
@@ -46,10 +51,11 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: ${misc:Depends}, libkactivities6 (= ${binary:Version})
-Breaks: kde-runtime-dbg (<< 4:4.8.0)
-Replaces: kde-runtime-dbg (<< 4:4.8.0)
-Description: debugging symbols for libkactivities5
- This library provides functionality for managing Activities.
+Breaks: kde-runtime-dbg (<< 4:4.8), kdebase-runtime-dbg (<< 4:4.8)
+Replaces: kde-runtime-dbg (<< 4:4.8), kdebase-runtime-dbg (<< 4:4.8)
+Suggests: libkactivities-bin (= ${binary:Version})
+Description: debugging symbols for libkactivities
+ This library provides functionality for managing activities.
  .
  This package contains the debugging files used to investigate problems with
- the libkactivities5 library.
+ the libkactivities library.
diff --git a/debian/libkactivities-dev.install b/debian/libkactivities-dev.install
index 741cd18..012cc85 100644
--- a/debian/libkactivities-dev.install
+++ b/debian/libkactivities-dev.install
@@ -1,8 +1,8 @@
-usr/lib/libkactivities.so
 usr/include/kactivities
 usr/include/KDE/KActivities
 usr/lib/cmake/KActivities/KActivitiesConfig.cmake
 usr/lib/cmake/KActivities/KActivitiesConfigVersion.cmake
-usr/lib/cmake/KActivities/KActivitiesLibraryTargets-debian.cmake
 usr/lib/cmake/KActivities/KActivitiesLibraryTargets.cmake
+usr/lib/cmake/KActivities/KActivitiesLibraryTargets-debian.cmake
+usr/lib/libkactivities.so
 usr/lib/pkgconfig/libkactivities.pc
diff --git a/debian/libkactivities.install b/debian/libkactivities.install
deleted file mode 100644
index 5cac3a8..0000000
--- a/debian/libkactivities.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libkactivities.so.6.0.0
-usr/lib/libkactivities.so.6
-
-
diff --git a/debian/libkactivities6.install b/debian/libkactivities6.install
index 1df0d6d..1ef36f5 100644
--- a/debian/libkactivities6.install
+++ b/debian/libkactivities6.install
@@ -1,3 +1,2 @@
-usr/lib/libkactivities.so.6.0.0
 usr/lib/libkactivities.so.6
-
+usr/lib/libkactivities.so.6.0.0
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes

-- 
kactivities packaging