[SCM] kalgebra packaging branch, master, updated. debian/4.13.1-1-141-g7e86982
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jul 29 10:17:59 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kalgebra.git;a=commitdiff;h=28abe03
The following commit has been merged in the master branch:
commit 28abe031acbe9a5eb1f261a6a7812f009c3a8a8a
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date: Tue May 28 13:32:40 2013 +0000
merge
---
debian/changelog | 76 ++++++++++++++++++++++
debian/control | 27 +++-----
debian/copyright | 36 ++--------
debian/kalgebra-common.install | 6 --
debian/kalgebra.install | 2 -
debian/kalgebramobile.install | 28 ++++++++
debian/not-installed | 1 -
.../kubuntu_remove_ncurses_requirement.diff | 30 ---------
debian/patches/series | 1 -
debian/rules | 3 +-
debian/watch | 2 +
11 files changed, 124 insertions(+), 88 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 29bb9d4..9773f06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+kalgebra (4:4.10.3-0ubuntu1) saucy; urgency=low
+
+ * New upstream release
+ * Merge with Debian, no changes
+ * Drop kubuntu_remove_ncurses_requirement.diff now implemented upstream
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 23 May 2013 11:04:26 +0000
+
+kalgebra (4:4.10.2-1) experimental; urgency=low
+
+ * New upstream release.
+ * Bump stuff to 4.10
+ * Update uploaders
+ * Update install-files
+
+ -- Sune Vuorela <sune at debian.org> Sat, 06 Apr 2013 10:41:43 +0000
+
kalgebra (4:4.10.2-0ubuntu1) raring; urgency=low
* New upstream bugfix release
@@ -92,6 +109,35 @@ kalgebra (4:4.8.80-0ubuntu1) quantal; urgency=low
-- Jonathan Riddell <jriddell at ubuntu.com> Wed, 06 Jun 2012 13:38:31 +0100
+kalgebra (4:4.8.4-1) unstable; urgency=low
+
+ * New upstream release.
+
+ [ José Manuel Santamaría Lema ]
+ * Split analitza out of kalgebra:
+ - drop enable_debianabimanager.diff, no longer needed since kalgebra doesn't
+ provide any dynamic library now.
+ - remove libanalitza4, libanalitzagui4 and kalgebra-dev binary packages.
+ - build depend on libanalitza-dev.
+ - don't pass -DINSTALL_ANALITZA_HEADERS=TRUE to cmake.
+ - don't pass -c0 to dh_shlibdeps.
+ - remove override_dh_shlibdeps, no longer needed.
+ - remove calgebra from kalgebra-common, now provided by src:analitza.
+ - drop libreadline-dev and libncurses-dev, only used by analitza.
+ * Bump build dependencies for KDE SC 4.8.4:
+ - kde-sc-dev-latest to 4:4.8.4.
+ - kdelibs5-dev to 4:4.8.
+ - libkdeedu-dev to 4:4.8.
+ * Update installed files.
+ * Bump Standards-Version to 3.9.3, no changes needed.
+ * Add watch file.
+ * Update copyright file.
+
+ [ Sune Vuorela ]
+ * Update descriptions
+
+ -- Sune Vuorela <sune at debian.org> Fri, 22 Jun 2012 09:43:31 +0200
+
kalgebra (4:4.8.3-0ubuntu1) quantal; urgency=low
* New upstream release
@@ -144,6 +190,28 @@ kalgebra (4:4.7.90-0ubuntu3) precise; urgency=low
-- Jonathan Riddell <jriddell at ubuntu.com> Thu, 15 Dec 2011 14:17:54 +0000
+kalgebra (4:4.7.4-2) unstable; urgency=low
+
+ * Team upload. Upload to unstable.
+
+ [ José Manuel Santamaría Lema ]
+ * Confirm symbols files on all architectures.
+
+ -- Pino Toscano <pino at debian.org> Wed, 07 Mar 2012 10:20:49 +0100
+
+kalgebra (4:4.7.4-1) experimental; urgency=low
+
+ * New upstream release.
+
+ [ José Manuel Santamaría Lema ]
+ * Bump kde-sc-dev-latest build dependency to 4:4.7.2.
+ * Remove patches:
+ - add_findanalitza.diff, applied upstream.
+ - install_variables_model.diff, applied upstream.
+ * Confirm symbols files on more architectures with 4.7.2 build logs.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 18 Dec 2011 00:52:42 +0100
+
kalgebra (4:4.7.3-0ubuntu1) precise; urgency=low
[ Jonathan Riddell ]
@@ -155,6 +223,13 @@ kalgebra (4:4.7.3-0ubuntu1) precise; urgency=low
-- Jonathan Riddell <jriddell at ubuntu.com> Wed, 23 Nov 2011 23:46:55 +0000
+kalgebra (4:4.7.2-1) experimental; urgency=low
+
+ [ José Manuel Santamaría Lema ]
+ * Initial release. Start from the Ubuntu packaging, thanks!
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 03 Dec 2011 10:44:03 -0300
+
kalgebra (4:4.7.2-0r7) raring; urgency=low
* Initial release. Start from the Ubuntu packaging, thanks!
@@ -216,3 +291,4 @@ kalgebra (4:4.6.90+repack1-0ubuntu1) oneiric; urgency=low
* Repack source to include COPYING files
-- Philip Muškovac <yofel at kubuntu.org> Fri, 08 Jul 2011 20:10:34 +0200
+
diff --git a/debian/control b/debian/control
index 06844e3..2467df5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,11 @@ Section: kde
Priority: optional
Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: José Manuel Santamaría Lema <panfaust at gmail.com>
-Build-Depends:
- cmake,
- debhelper (>= 7.3.16),
- pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.10.2),
- pkg-config,
- libqt4-opengl-dev,
- libkdeedu-dev (>= 4:4.10.2),
- analitza-dev (>= 4:4.10.2),
- libssl-dev
+Uploaders: Sune Vuorela <sune at debian.org>
+Build-Depends: kde-sc-dev-latest (>= 4:4.10),
+ cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), pkg-config,
+ kdelibs5-dev (>= 4:4.10), libkdeedu-dev (>= 4:4.10), libanalitza-dev (>= 4:4.10),
+ libqt4-opengl-dev
Standards-Version: 3.9.3
Homepage: http://edu.kde.org/
Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kalgebra
@@ -26,7 +20,7 @@ Architecture: any
Section: math
Depends: ${shlibs:Depends}, ${misc:Depends}, kalgebra-common (= ${binary:Version})
Breaks: kalgebramobile (<< 4:4.7.2)
-Description: algebraic graphing calculator for KDE
+Description: algebraic graphing calculator
KAlgebra is a algebraic graphing calculator with support for 3D graphing and
MathML markup language.
.
@@ -35,12 +29,10 @@ Description: algebraic graphing calculator for KDE
Package: kalgebramobile
Architecture: any
Section: math
-Breaks: kalgebra (<< 4:4.6.1a-0ubuntu2), kalgebra-mobile (<< 4.6.80)
-Replaces: kalgebra (<< 4:4.6.1a-0ubuntu2), kalgebra-mobile (<< 4.6.80)
Depends: ${shlibs:Depends}, ${misc:Depends}, kalgebra-common (= ${binary:Version})
-Description: algebraic graphing calculator for KDE mobile
+Description: algebraic graphing calculator for small touch based interfaces
KAlgebra is a algebraic graphing calculator with support for 3D graphing and
- MathML markup language. This is the version for KDE mobile.
+ MathML markup language. This is the version for small touch based interfaces
.
This package is part of the KDE education module.
@@ -62,7 +54,8 @@ Architecture: any
Section: debug
Priority: extra
Depends: ${misc:Depends},
- kalgebra (= ${binary:Version}) | kalgebramobile (= ${binary:Version})
+ kalgebra (= ${binary:Version}) | kalgebramobile (= ${binary:Version}),
+Recommends: libanalitza-dbg
Breaks: kdeedu-dbg (<< 4:4.6.80)
Replaces: kdeedu-dbg (<< 4:4.6.80)
Description: debugging symbols for the KDE education module
diff --git a/debian/copyright b/debian/copyright
index b82e76a..2bb2985 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,23 +4,21 @@ Comment: This package was developed for Ubuntu by the Kubuntu Developers and
files.
Files: *
-Copyright: 2007-2012 by Aleix Pol <aleixpol at kde.org>
+Copyright: 2007-2011 Aleix Pol <aleixpol at kde.org>
+ 2010 Percy Camilo T. Aucahuasi <percy.camilo.ta at gmail.com>
License: GPL-2+
-Files: plasmoids/graphsplasmoid/contents/ui/main.qml
-Copyright: 2012 Aleix Pol Gonzalez <aleixpol at kde.org>
-License: LGPL-2+
-
Files: debian/*
-Copyright: 2011-2013 Kubuntu Developers <kubuntu-devel at lists.launchpad.net>
+Copyright: 2011 Kubuntu Developers <kubuntu-devel at lists.launchpad.net>
+ 2012 José Manuel Santamaría Lema <panfaust at gmail.com>
License: GPL-2+
Files: doc/*
Copyright: 2007 Aleix Pol
-License: GFDL-1.2
+License: GFDL-NIV-1.2+
Files: cmake/*
-Copyright: 2011, Aleix Pol Gonzalez <aleixpol at kde.org>
+Copyright: 2011 Aleix Pol <aleixpol at kde.org>
License: BSD-3-clause
License: GPL-2+
@@ -42,27 +40,7 @@ License: GPL-2+
version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
-License: LGPL-2+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 or
- (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- .
- On Debian systems, the full text of the GNU Library General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/LGPL-2'.
-
-License: GFDL-1.2
+License: GFDL-NIV-1.2+
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2
or any later version published by the Free Software Foundation;
diff --git a/debian/kalgebra-common.install b/debian/kalgebra-common.install
index f97401c..486ede4 100644
--- a/debian/kalgebra-common.install
+++ b/debian/kalgebra-common.install
@@ -8,9 +8,3 @@ usr/share/icons/hicolor/64x64/apps/kalgebra.png
usr/share/icons/hicolor/scalable/apps/kalgebra.svgz
usr/share/kde4/apps/katepart/syntax/kalgebra.xml
usr/share/kde4/services/kalgebraplasmoid.desktop
-usr/share/kde4/apps/kalgebramobile/plugins
-usr/lib/kde4/imports/org/kde/analitza/Graph2D.qml
-usr/share/kde4/apps/plasma/plasmoids/org.kde.graphsplasmoid/contents/ui/config.ui
-usr/share/kde4/apps/plasma/plasmoids/org.kde.graphsplasmoid/contents/ui/main.qml
-usr/share/kde4/apps/plasma/plasmoids/org.kde.graphsplasmoid/metadata.desktop
-usr/share/kde4/services/graphsplasmoid.desktop
diff --git a/debian/kalgebra.install b/debian/kalgebra.install
index bc62af1..fcc9f4f 100644
--- a/debian/kalgebra.install
+++ b/debian/kalgebra.install
@@ -1,4 +1,2 @@
usr/bin/kalgebra
usr/share/applications/kde4/kalgebra.desktop
-usr/lib/kde4/imports/org/kde/analitza/libanalitzadeclarativeplugin.so
-usr/lib/kde4/imports/org/kde/analitza/qmldir
diff --git a/debian/kalgebramobile.install b/debian/kalgebramobile.install
index 56ebf5b..ba9ea55 100644
--- a/debian/kalgebramobile.install
+++ b/debian/kalgebramobile.install
@@ -1,2 +1,30 @@
usr/bin/kalgebramobile
+usr/lib/kde4/imports/org/kde/analitza/Graph2D.qml
+usr/lib/kde4/imports/org/kde/analitza/libanalitzadeclarativeplugin.so
+usr/lib/kde4/imports/org/kde/analitza/qmldir
usr/share/applications/kde4/kalgebramobile.desktop
+usr/share/kde4/apps/kalgebramobile/plugins/About.qml
+usr/share/kde4/apps/kalgebramobile/plugins/Console.qml
+usr/share/kde4/apps/kalgebramobile/plugins/Plot2D.qml
+usr/share/kde4/apps/kalgebramobile/plugins/Tables.qml
+usr/share/kde4/apps/kalgebramobile/plugins/VariablesView.qml
+usr/share/kde4/apps/kalgebramobile/plugins/kalgebraabout.desktop
+usr/share/kde4/apps/kalgebramobile/plugins/kalgebraconsole.desktop
+usr/share/kde4/apps/kalgebramobile/plugins/kalgebraplot2d.desktop
+usr/share/kde4/apps/kalgebramobile/plugins/kalgebratables.desktop
+usr/share/kde4/apps/kalgebramobile/plugins/kalgebravariables.desktop
+usr/share/kde4/apps/kalgebramobile/plugins/widgets/Button.qml
+usr/share/kde4/apps/kalgebramobile/plugins/widgets/CalcButton.qml
+usr/share/kde4/apps/kalgebramobile/plugins/widgets/ExpressionInput.qml
+usr/share/kde4/apps/kalgebramobile/plugins/widgets/KAlgebraMobile.qml
+usr/share/kde4/apps/kalgebramobile/plugins/widgets/KAlgebraPage.qml
+usr/share/kde4/apps/kalgebramobile/plugins/widgets/Keyboard.qml
+usr/share/kde4/apps/kalgebramobile/plugins/widgets/Label.qml
+usr/share/kde4/apps/kalgebramobile/plugins/widgets/RealInput.qml
+usr/share/kde4/apps/kalgebramobile/plugins/widgets/SimpleListView.qml
+usr/share/kde4/apps/kalgebramobile/plugins/widgets/ToolTip.qml
+usr/share/kde4/apps/kalgebramobile/plugins/widgets/qmldir
+usr/share/kde4/apps/plasma/plasmoids/org.kde.graphsplasmoid/contents/ui/config.ui
+usr/share/kde4/apps/plasma/plasmoids/org.kde.graphsplasmoid/contents/ui/main.qml
+usr/share/kde4/apps/plasma/plasmoids/org.kde.graphsplasmoid/metadata.desktop
+usr/share/kde4/services/graphsplasmoid.desktop
diff --git a/debian/not-installed b/debian/not-installed
deleted file mode 100644
index 021cf82..0000000
--- a/debian/not-installed
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/icons/hicolor/scalable/apps/kalgebra.svgz
diff --git a/debian/patches/kubuntu_remove_ncurses_requirement.diff b/debian/patches/kubuntu_remove_ncurses_requirement.diff
deleted file mode 100644
index 8d46e7c..0000000
--- a/debian/patches/kubuntu_remove_ncurses_requirement.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Do not unnecessarily link against ncurses
-Author: Colin Watson <cjwatson at ubuntu.com>
-Bug: https://bugs.kde.org/show_bug.cgi?id=286272
-Forwarded: yes
-Last-Update: 2011-11-10
-
-Index: kalgebra-4.7.97/cmake/FindReadline.cmake
-===================================================================
---- kalgebra-4.7.97.orig/cmake/FindReadline.cmake 2011-07-27 18:37:55.000000000 +0000
-+++ kalgebra-4.7.97/cmake/FindReadline.cmake 2012-01-05 13:29:05.000000000 +0000
-@@ -1,15 +1,14 @@
- # GNU Readline library finder
--if(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
-+if(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
- set(READLINE_FOUND TRUE)
--else(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
-+else(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
- FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h
- /usr/include/readline
- )
-
- FIND_LIBRARY(READLINE_LIBRARY NAMES readline)
-- FIND_LIBRARY(NCURSES_LIBRARY NAMES ncurses )
- include(FindPackageHandleStandardArgs)
-- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG NCURSES_LIBRARY READLINE_INCLUDE_DIR READLINE_LIBRARY )
-+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG READLINE_INCLUDE_DIR READLINE_LIBRARY )
-
- MARK_AS_ADVANCED(READLINE_INCLUDE_DIR READLINE_LIBRARY)
--endif(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
-+endif(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ee28814..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kubuntu_remove_ncurses_requirement.diff
diff --git a/debian/rules b/debian/rules
index 48f8938..62d4871 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,7 @@
include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
-override_dh_makeshlibs:
- $(overridden_command) -V -- -c0
+.PHONY: override_dh_auto_test
override_dh_strip:
$(overridden_command) --dbg-package=kalgebra-dbg
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..32b40fb
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.kde.org/pub/kde/stable/([\d\.]*)/src/kalgebra-([\d\.]*).tar.xz
--
kalgebra packaging
More information about the pkg-kde-commits
mailing list