[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:51 UTC 2014 

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

The following commit has been merged in the master branch:
commit b4d3427ad462ff37e8b0c7fb4287c349a02ca180
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Thu Nov 24 00:49:32 2011 +0000

    [ Jonathan Riddell ]
    * Merge with debian
    [ Colin Watson ]
    * Add kubuntu_remove_ncurses_requirement.diff remove libncurses
      requirement.  calgebra only uses symbols from libreadline.
    * Initial release. Start from the Ubuntu packaging, thanks!
---
 debian/.gitattributes                              |  1 +
 debian/changelog                                   | 23 ++++++++++---
 debian/control                                     | 38 ++++++++++------------
 debian/copyright                                   |  3 ++
 debian/kalgebra.lintian-overrides                  |  1 -
 ...iff => kubuntu_remove_ncurses_requirement.diff} |  0
 debian/patches/series                              |  2 +-
 debian/source/local-options                        |  1 +
 8 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 8eb678f..a517ce3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+kalgebra (4:4.7.3-0ubuntu1) precise; urgency=low
+
+  [ Jonathan Riddell ]
+  * Merge with debian
+
+  [ Colin Watson ]
+  * Add kubuntu_remove_ncurses_requirement.diff remove libncurses
+    requirement.  calgebra only uses symbols from libreadline.
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Nov 2011 23:46:55 +0000
+
+kalgebra (4:4.7.2-0r7) UNRELEASED; urgency=low
+
+  * Initial release. Start from the Ubuntu packaging, thanks!
+
+ -- José Manuel Santamaría Lema <panfaust at gmail.com>  Tue, 18 Oct 2011 01:12:28 +0200
+
 kalgebra (4:4.7.3-0ubuntu1) UNRELEASED; urgency=low
 
   [ Philip Muškovac ]
@@ -12,11 +29,7 @@ kalgebra (4:4.7.3-0ubuntu1) UNRELEASED; urgency=low
     - Add kalgebra-dev with analitza headers, needed by cantor
     - add libncurses-dev to build-deps
 
-  [ Colin Watson ]
-  * Remove libncurses requirement.  calgebra only uses symbols from
-    libreadline.
-
- -- Philip Muškovac <yofel at kubuntu.org>  Sat, 29 Oct 2011 11:42:28 +0200
+ -- Philip Muškovac <yofel at kubuntu.org>  Mon, 03 Oct 2011 22:52:33 +0200
 
 kalgebra (4:4.7.2-0ubuntu1) oneiric-proposed; urgency=low
 
diff --git a/debian/control b/debian/control
index a519481..74b69cc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,15 @@ Source: kalgebra
 Section: kde
 Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-Build-Depends: kde-sc-dev-latest (>= 4:4.7.3),
+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: kde-sc-dev-latest (>= 4:4.7.2),
  cmake,
  debhelper (>= 7.3.16),
  pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.6),
+ kdelibs5-dev (>= 4:4.7),
  libreadline-dev,
+ libncurses-dev,
  pkg-config,
  libqt4-opengl-dev,
  libkdeedu-dev
@@ -15,27 +18,20 @@ Standards-Version: 3.9.2
 Homepage: http://edu.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kalgebra
 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kalgebra
+X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kalgebra.git
+X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kalgebra.git
 
 Package: kalgebra
 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
  KAlgebra is a algebraic graphing calculator with support for 3D graphing and
  MathML markup language.
  .
  This package is part of the KDE education module.
 
-Package: kalgebra-mobile
-Depends: kalgebramobile, ${misc:Depends}
-Architecture: all
-Section: math
-Description: transitional dummy package for kalgebra-mobile
- This is a transitional package for kalgebra-mobile, and can be safely removed
- after the installation is complete.
- .
- This package is part of the KDE education module
-
 Package: kalgebramobile
 Architecture: any
 Section: math
@@ -44,15 +40,15 @@ 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
  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 KDE mobile.
  .
  This package is part of the KDE education module.
 
 Package: kalgebra-common
 Architecture: any
 Section: math
-Breaks: kalgebra (<< 4:4.6.1a-0ubuntu2)
-Replaces: kalgebra (<< 4:4.6.1a-0ubuntu2)
+Breaks: kalgebra (<< 4:4.7.2)
+Replaces: kalgebra (<< 4:4.7.2)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: contains files common for kalgebra and kalgebramobile
  KAlgebra is a algebraic graphing calculator with support for 3D graphing and
@@ -77,8 +73,8 @@ Package: libanalitza4
 X-Debian-ABI: 0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: kalgebra-common (<< 4:4.7.3)
-Replaces: kalgebra-common (<< 4:4.7.3)
+Breaks: kalgebra (<< 4:4.7.2), kalgebra-common (<< 4:4.7.3)
+Replaces: kalgebra (<< 4:4.7.2), kalgebra-common (<< 4:4.7.3)
 Description: library to  work with mathematical expressions
  This library is used by KAlgebra and may be used by other software to parse and
  work with mathematical expressions.
@@ -89,8 +85,8 @@ Package: libanalitzagui4
 X-Debian-ABI: 0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: kalgebra-common (<< 4:4.7.3)
-Replaces: kalgebra-common (<< 4:4.7.3)
+Breaks: kalgebra (<< 4:4.7.2), kalgebra-common (<< 4:4.7.3)
+Replaces: kalgebra (<< 4:4.7.2), kalgebra-common (<< 4:4.7.3)
 Description: library to  work with mathematical expressions - GUI routines
  This library is used by KAlgebra and may be used by other software to parse and
  work with mathematical expressions. This library provides the routines related
@@ -102,7 +98,9 @@ Package: kalgebra-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: ${misc:Depends}, kalgebra (= ${binary:Version})| kalgebramobile (= ${binary:Version})
+Depends: ${misc:Depends},
+ kalgebra (= ${binary:Version}) | kalgebramobile (= ${binary:Version}),
+ libanalitza4 (= ${binary:Version}), libanalitzagui4 (= ${binary:Version})
 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 fcad55a..c2bfebd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,7 @@
 Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=174
+Comment: This package was developed for Ubuntu by the Kubuntu Developers and
+ modified to be included in Debian. See below the copyright holders for debian/*
+ files.
 
 Files: *
 Copyright: 2007-2011 by Aleix Pol <aleixpol at kde.org>
diff --git a/debian/kalgebra.lintian-overrides b/debian/kalgebra.lintian-overrides
deleted file mode 100644
index a42819f..0000000
--- a/debian/kalgebra.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-kalgebra: package-name-doesnt-match-sonames libanalitza4 libanalitzagui4
diff --git a/debian/patches/remove_ncurses_requirement.diff b/debian/patches/kubuntu_remove_ncurses_requirement.diff
similarity index 100%
rename from debian/patches/remove_ncurses_requirement.diff
rename to debian/patches/kubuntu_remove_ncurses_requirement.diff
diff --git a/debian/patches/series b/debian/patches/series
index d220ab6..480022c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 enable_debianabimanager.diff
-remove_ncurses_requirement.diff
+kubuntu_remove_ncurses_requirement.diff
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

-- 
kalgebra packaging

More information about the pkg-kde-commits mailing list