[SCM] ki18n packaging branch, master, updated. debian/5.37.0-2-84-g4be052e

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jan 2 18:42:45 UTC 2018


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

The following commit has been merged in the master branch:
commit 6c74451dc0443332dec0c520558c6b0bcfd1836b
Merge: 7635011ad3f76efc9c89c023a844fa7168af4a93 504f730c48f40cb8168914afbe2fbb5ee5f2dd0d
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 3 12:29:55 2016 +0200

    Merging master into Neon/unstable

 debian/changelog           | 15 +++++++++++
 debian/control             | 31 +++++-----------------
 debian/libkf5i18n5.symbols | 64 +++++++++++++++++++++++-----------------------
 debian/rules               |  2 +-
 debian/tests/acc           |  7 +++++
 debian/upstream/metadata   |  7 +++++
 debian/watch               |  1 -
 7 files changed, 68 insertions(+), 59 deletions(-)

diff --cc debian/changelog
index 11cc0e8,85e4230..802eb79
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,18 +1,40 @@@
 +ki18n (5.21.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 11 Apr 2016 09:22:17 +0000
 +
 +ki18n (5.20.0-0neon) wily; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Fri, 01 Apr 2016 11:06:22 +0000
 +
+ ki18n (5.19.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.19.0).
+   * Update symbols files from buildds logs (5.18.0-1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 13 Feb 2016 15:15:43 +0100
+ 
+ ki18n (5.18.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.17.0).
+   * Update symbols files.
+   * New upstream release (5.18.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 13:33:08 +0100
+ 
 +ki18n (5.18.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release Xenial
 +
 +  [ Philip Muškovac ]
 +  * New upstream release
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Wed, 06 Jan 2016 15:02:23 +0100
 +
  ki18n (5.16.0-1) unstable; urgency=medium
  
    * New upstream release (5.16.0).
diff --cc debian/control
index 968c426,936d3db..865822a
--- a/debian/control
+++ b/debian/control
@@@ -5,17 -5,16 +5,17 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
-                extra-cmake-modules (>= 5.18.0~),
+                extra-cmake-modules (>= 5.19.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
-                python-all,
+                python,
                 qtbase5-dev (>= 5.4),
-                qtdeclarative5-dev,
+                qtdeclarative5-dev (>= 5.3.0~),
                 qtscript5-dev (>= 5.4)
  Standards-Version: 3.9.6
 +XS-Testsuite: autopkgtest
  Homepage: https://projects.kde.org/projects/frameworks/ki18n
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/frameworks/ki18n.git
- Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/ki18n.git
+ Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/frameworks/ki18n.git
+ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/frameworks/ki18n.git
  
  Package: libkf5i18n-dev
  Section: libdevel
diff --cc debian/rules
index 4d7b442,7d3634c..7e1edad
--- a/debian/rules
+++ b/debian/rules
@@@ -4,6 -4,9 +4,6 @@@
  include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
  
  override_dh_strip:
- 	$(overridden_command) --dbg-package=libkf5i18n5-dbg
+ 	$(overridden_command) --dbgsym-migration='libkf5i18n5-dbg (<= 5.19.0-1~~)'
  
 -override_dh_auto_test:
 -	[ -e $(CURDIR)/debian/tests.home ] || mkdir $(CURDIR)/debian/tests.home
 -	HOME=$(CURDIR)/debian/tests.home $(overridden_command)
 -	rm -rf $(CURDIR)/debian/tests.home
 +.PHONY: override_dh_auto_test

-- 
ki18n packaging



More information about the pkg-kde-commits mailing list