[SCM] attica packaging branch, master, updated. debian/5.0.0-1-2-g6770526

Jonathan Riddell jriddell-guest at moszumanska.debian.org
Tue Sep 23 15:48:10 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/attica.git;a=commitdiff;h=6770526

The following commit has been merged in the master branch:
commit 6770526064028476d031bbeac4253ba8d8ecef70
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Sep 23 17:48:07 2014 +0200

    sync to 5.2.0 Kubuntu packaging
---
 debian/changelog             | 24 +++++++++++++++++++++---
 debian/control               | 19 ++++++++-----------
 debian/libkf5attica5.install |  3 ++-
 debian/libkf5attica5.symbols |  8 +-------
 debian/rules                 |  2 +-
 debian/watch                 |  4 +++-
 6 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 62a3bf7..f36eaf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-attica-kf5 (5.0.0-1) unstable; urgency=medium
+attica-kf5 (5.2.0-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 22 Sep 2014 19:51:25 +0200
+
+attica-kf5 (5.1.0-0ubuntu1) utopic; urgency=medium
 
   [ Jonathan Riddell ]
   * Initial stable upstream release
@@ -6,7 +12,20 @@ attica-kf5 (5.0.0-1) unstable; urgency=medium
   [ Scarlett Clark ]
   * Fix install file
   * Update watch file to stable
-  * Update copyright to match upstream 
+  * Update copyright to match upstream
+  * Update extra-cmake-modules depend version
+
+  [ José Manuel Santamaría Lema ]
+  * Update libraries *.install paths so a soname bump doesn't go
+    unnoticed.
+
+  [ Scarlett Clark ]
+  * New upstream release
+  * Patch symbols with batchpatch.
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Tue, 05 Aug 2014 17:26:40 +0200
+
+attica-kf5 (5.0.0-1) unstable; urgency=medium
 
   [ Maximiliano Curia ]
   * Update debhelper versioning in build-dependencies
@@ -26,7 +45,6 @@ attica-kf5 (4.100.0-0ubuntu1) utopic; urgency=medium
 
   [ Scarlett Clark ]
   * Bump depends versions
-  * Bump depends versions
 
   [ Harald Sitter ]
   * Remove useless Pre-Depends fields used for multiarch compat in
diff --git a/debian/control b/debian/control
index cf5e45f..81f196c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,12 @@
 Source: attica-kf5
 Section: libs
 Priority: optional
-Maintainer: Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Jonathan Riddell <jriddell at ubuntu.com>,
-           Maximiliano Curia <maxy at debian.org>
+Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
+XSBC-Original-Maintainer: Jonathan Riddell <jriddell at ubuntu.com>
 Build-Depends: cmake,
-               debhelper (>= 9),
-               extra-cmake-modules (>= 0.0.14),
-               pkg-kde-tools,
+               debhelper (>= 9.0.0),
+               extra-cmake-modules (>= 1.2.0),
+               pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev
 Standards-Version: 3.9.5
 Homepage: https://projects.kde.org/projects/kdesupport/attica
@@ -50,11 +49,9 @@ Multi-Arch: same
 Depends: libkf5attica5 (= ${binary:Version}), ${misc:Depends}
 Description: debug symbols for libattica5
  Attica is a Qt library that implements the Open Collaboration Services
- API version 1.6.
- .
- It grants easy access to the services such as querying information about
+ API version 1.6. It grants easy access to the services such as querying information about
  persons and contents.
  .
- This package is part of KDE Frameworks 5.
- .
  This package contains the debug symbols.
+ .
+ This package is part of KDE Frameworks 5.
diff --git a/debian/libkf5attica5.install b/debian/libkf5attica5.install
index 5f8ca85..3170b4a 100644
--- a/debian/libkf5attica5.install
+++ b/debian/libkf5attica5.install
@@ -1 +1,2 @@
-usr/lib/*/libKF5Attica.so.5*
+usr/lib/*/libKF5Attica.so.5
+usr/lib/*/libKF5Attica.so.5.*
diff --git a/debian/libkf5attica5.symbols b/debian/libkf5attica5.symbols
index de3580a..705afe7 100644
--- a/debian/libkf5attica5.symbols
+++ b/debian/libkf5attica5.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 5.0.0 amd64
+# SymbolsHelper-Confirmed: 5.1.0 amd64
 libKF5Attica.so.5 libkf5attica5 #MINVER#
  (optional=templinst)_ZN6Attica10ItemPutJobINS_11AchievementEE5parseERK7QString at Base 4.96.0
  (optional=templinst)_ZN6Attica10ItemPutJobINS_11AchievementEEC1EPNS_17PlatformDependentERK15QNetworkRequestP9QIODevice at Base 4.96.0
@@ -456,9 +456,6 @@ libKF5Attica.so.5 libkf5attica5 #MINVER#
  _ZN6Attica6GetJob16staticMetaObjectE at Base 4.96.0
  _ZN6Attica6GetJobC1EPNS_17PlatformDependentERK15QNetworkRequest at Base 4.96.0
  _ZN6Attica6GetJobC2EPNS_17PlatformDependentERK15QNetworkRequest at Base 4.96.0
- (optional=gccinternal)_ZN6Attica6GetJobD0Ev at Base 4.96.0
- (optional=gccinternal)_ZN6Attica6GetJobD1Ev at Base 4.96.0
- (optional=gccinternal)_ZN6Attica6GetJobD2Ev at Base 4.96.0
  (optional=templinst)_ZN6Attica6ParserINS_11AchievementEE16parseMetadataXmlER16QXmlStreamReader at Base 4.96.0
  (optional=templinst)_ZN6Attica6ParserINS_11AchievementEE5parseERK7QString at Base 4.96.0
  (optional=templinst)_ZN6Attica6ParserINS_11AchievementEE9parseListERK7QString at Base 4.96.0
@@ -1163,9 +1160,6 @@ libKF5Attica.so.5 libkf5attica5 #MINVER#
  _ZN6Attica9DeleteJob16staticMetaObjectE at Base 4.96.0
  _ZN6Attica9DeleteJobC1EPNS_17PlatformDependentERK15QNetworkRequest at Base 4.96.0
  _ZN6Attica9DeleteJobC2EPNS_17PlatformDependentERK15QNetworkRequest at Base 4.96.0
- (optional=gccinternal)_ZN6Attica9DeleteJobD0Ev at Base 4.96.0
- (optional=gccinternal)_ZN6Attica9DeleteJobD1Ev at Base 4.96.0
- (optional=gccinternal)_ZN6Attica9DeleteJobD2Ev at Base 4.96.0
  _ZN6Attica9Publisher5setIdERK7QString at Base 4.96.0
  _ZN6Attica9Publisher6Parser8parseXmlER16QXmlStreamReader at Base 4.96.0
  _ZN6Attica9Publisher6ParserD0Ev at Base 4.96.0
diff --git a/debian/rules b/debian/rules
index eab1205..422d71b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=libkf5attica5-dbg
diff --git a/debian/watch b/debian/watch
index 82e63a8..52f255c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
 version=3
-http://download.kde.org/stable/frameworks/([\d.]*)/attica-([\d.]*)\.tar\.xz
+http://download.kde.org/unstable/frameworks/([\d\.]*)/attica-(.*)\.tar\.xz
+
+http://download.kde.org/stable/frameworks/([\d\.]*)/attica-(.*)\.tar\.xz
\ No newline at end of file

-- 
attica packaging



More information about the pkg-kde-commits mailing list