[SCM] analitza packaging branch, kubuntu_stable, updated. debian/15.08.0-1-34-gce6e9fe

Kubuntu CI (Harald Sitter) kubuntu-ci-guest at moszumanska.debian.org
Tue Jan 12 00:22:22 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/analitza.git;a=commitdiff;h=ce6e9fe

The following commit has been merged in the kubuntu_stable branch:
commit ce6e9fe5e831451e4c3ecef9b5497d34f14eb007
Merge: 32cffae1a5d38be20d8c5a2560fc1277ab18fe57 e0cad87db89d6769f7d153fd8a1f5476e813865d
Author: Philip Muškovac <yofel at gmx.net>
Date:   Tue Jan 12 00:43:21 2016 +0100

    Merge remote-tracking branch 'origin/master' into kubuntu_xenial_archive

 debian/.gitattributes          |  1 +
 debian/changelog               | 36 ++++++++++------
 debian/control                 | 18 ++++----
 debian/copyright               | 93 ++++++++++++++++++++++--------------------
 debian/libanalitza-dev.acc.in  | 24 +++++++++++
 debian/libanalitza-dev.install |  2 +-
 debian/libanalitza7.symbols    |  2 +-
 debian/rules                   |  4 +-
 debian/tests/acc               |  8 ++++
 debian/tests/control           |  2 +-
 10 files changed, 122 insertions(+), 68 deletions(-)

diff --cc debian/changelog
index bd6890f,491101e..8c2ef45
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,61 -1,13 +1,63 @@@
 +analitza (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
++  [ Clive Johnston ]
 +  * New upstream release
 +
++  [ Philip Muškovac ]
++  * Merge with debian git master
++
 + -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:22:46 +0000
 +
 +analitza (4:15.08.2-0ubuntu2) xenial; urgency=medium
 +
 +  * Fix autopackagetests by adding allow-stderr to the requirements.
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Tue, 03 Nov 2015 15:34:27 +0100
 +
 +analitza (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * Vivid backport
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 11:45:59 +0100
 +
 +analitza (4:15.08.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 16:03:09 +0100
 +
+ analitza (4:15.08.0-1) experimental; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * Update symbols files.
+   * New upstream release (15.08.0).
+   * Update symbols files.
+   * Update copyright file.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 07 Sep 2015 18:05:12 +0200
+ 
 +analitza (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 26 Aug 2015 16:53:44 +0100
 +
 +analitza (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Update symbols files:
 +    - Mark as optional the symbols gone after building witth GCC 5
 +    - Keep an optional symbol gone after building wih GCC 4
 +
 +  [ Jonathan Riddell ]
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 08:54:52 +0100
 +
- analitza (4:15.04.2-0ubuntu1) wily; urgency=medium
- 
-   [ Scarlett Clark ]
-   * New upstream release
-   * New upstream release
-   * Vivid backport
- 
-   [ Jonathan Riddell ]
-   * New upstream release
- 
-  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 18:19:01 +0200
- 
  analitza (4:14.12.3-0ubuntu2) vivid; urgency=medium
  
     * Fix tests. Calling kdeinit4 in kf5 builds are not going to
diff --cc debian/control
index a8ecf1a,7077f05..774d0f4
--- a/debian/control
+++ b/debian/control
@@@ -3,22 -3,23 +3,25 @@@ Section: lib
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Sune Vuorela <sune at debian.org>, Maximiliano Curia <maxy at debian.org>
- Build-Depends: cmake,
+ Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
-                extra-cmake-modules,
+                extra-cmake-modules (>= 1.7.0~),
                 libeigen3-dev,
+                libglew-dev,
                 libncurses5-dev,
-                libqt5opengl5-dev,
-                libqt5svg5-dev,
+                libqt5opengl5-dev (>= 5.4),
+                libqt5svg5-dev (>= 5.4),
                 libreadline-dev,
                 pkg-config,
 +               pkg-kde-tools (>= 0.12),
-                qtdeclarative5-dev
+                pkg-kde-tools (>> 0.15.15),
+                qtbase5-dev (>= 5.4),
+                qtdeclarative5-dev (>= 5.4)
  Standards-Version: 3.9.6
 +XS-Testsuite: autopkgtest
  Homepage: http://edu.kde.org/
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/analitza.git/
- Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/analitza.git
+ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/analitza.git
+ Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/analitza.git
  
  Package: analitza-common
  Architecture: all
@@@ -36,11 -37,12 +39,12 @@@ Package: libanalitza-de
  Architecture: any
  Section: libdevel
  Conflicts: kalgebra-dev
 -Depends: libanalitza6 (= ${binary:Version}),
 -         libanalitzagui6 (= ${binary:Version}),
 -         libanalitzaplot6 (= ${binary:Version}),
 -         libanalitzawidgets6 (= ${binary:Version}),
 +Depends: libanalitza7 (= ${binary:Version}),
 +         libanalitzagui7 (= ${binary:Version}),
 +         libanalitzaplot7 (= ${binary:Version}),
 +         libanalitzawidgets7 (= ${binary:Version}),
           qml-module-org-kde-analitza (= ${binary:Version}),
+          qtbase5-dev (>= 5.4),
           ${misc:Depends}
  Description: development files for Analitza
   Analitza is a library to parse and work with mathematical expressions. This

-- 
analitza packaging



More information about the pkg-kde-commits mailing list