On 14/06/16 07:10, Scott Kitterman wrote:
On Tuesday, June 14, 2016 01:21:26 AM peter green wrote:
I am reluctant to NMU this In Debian myself because I don't use calligra
personally and I have not had any feedback from anyone on the patched
package.
Considering it doesn't build at all and the binaries have been removed from
Testing and Unstable, I think the chance of you making it worse is nil. If
you can get it building again, then I wouldn't wait.
Ok, I just set up a sid VM, built calligra with my, installed it and did
a quick smoke test and it seemed to run (I was able to start the writer
tool and create a blank document). So i've uploaded it. Debdiff
attatched (which is the same as what I had in raspbian except for
changelog changes)
diff -Nru calligra-2.8.5+dfsg/debian/changelog
calligra-2.8.5+dfsg/debian/changelog
--- calligra-2.8.5+dfsg/debian/changelog2015-06-21 07:38:53.0
+0100
+++ calligra-2.8.5+dfsg/debian/changelog2016-07-03 16:51:02.0
+0100
@@ -1,3 +1,14 @@
+calligra (1:2.8.5+dfsg-1.3) stretch-staging; urgency=medium
+
+ * Non-maintainer upload.
+ * Add build-depends on libsoprano-dev (Closes: 797389)
+ * Drop kexi-map-form-widget and calligra-reports-map-element binary packages
+and drop build-dependencies on libmarble-dev. It seems marble has moved
+entirely to qt5 and is hence incompatble with this package. (Closes:
818395)
+ * Remove dependency on kde-runtime-dbg which no longer exists.
+
+ -- Peter Michael Green Sun, 03 Jul 2016 12:06:15 +
+
calligra (1:2.8.5+dfsg-1.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru calligra-2.8.5+dfsg/debian/control calligra-2.8.5+dfsg/debian/control
--- calligra-2.8.5+dfsg/debian/control 2015-06-21 07:38:20.0 +0100
+++ calligra-2.8.5+dfsg/debian/control 2016-06-12 23:17:41.0 +0100
@@ -27,7 +27,6 @@
libkactivities-dev (>= 4:4.10),
libkdcraw-dev (>= 4:4.12),
liblcms2-dev (>= 2.4),
- libmarble-dev (>> 4:4.12),
libmysqlclient-dev,
libodfgen-dev (>= 0.1),
libopencolorio-dev,
@@ -59,7 +58,8 @@
pstoedit,
shared-desktop-ontologies,
shared-mime-info,
- zlib1g-dev
+ zlib1g-dev,
+ libsoprano-dev
Standards-Version: 3.9.5
XS-Testsuite: autopkgtest
Homepage: http://www.calligra-suite.org/
@@ -273,23 +273,6 @@
.
This package is part of the Calligra Suite.
-Package: kexi-map-form-widget
-Architecture: any
-Section: database
-Depends: kexi (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Breaks: kexi (<< 1:2.3.70)
-Replaces: kexi (<< 1:2.3.70)
-Description: map form widget for Kexi
- Kexi is an integrated data management application. It can be used for
- creating database schemas, inserting data, performing queries, and
- processing data. Forms can be created to provide a custom interface to
- your data. All database objects - tables, queries and forms - are stored
- in the database, making it easy to share data and design.
- .
- This package provides a map widget for Kexi using the Marble library.
- .
- This package is part of the Calligra Suite.
-
Package: calligra-reports-web-element
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -303,20 +286,6 @@
.
This package is part of the Calligra Suite.
-Package: calligra-reports-map-element
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: map element for Calligra Reports
- Calligra Suite is a set of applications written to help you to accomplish
- your work. It includes office applications such as a word processor,
- a spreadsheet, a presentation program, a database application, etc., and
- raster and vector graphics tools.
- .
- This package provides a map element for Calligra Reports, based on the
- Marble library.
- .
- This package is part of the Calligra Suite.
-
Package: krita
Architecture: any
Section: graphics
@@ -573,7 +542,7 @@
Section: debug
Architecture: any
Priority: extra
-Depends: calligra-libs (= ${binary:Version}), kde-runtime-dbg, ${misc:Depends}
+Depends: calligra-libs (= ${binary:Version}), ${misc:Depends}
Description: debugging symbols for Calligra
This package contains the debugging symbols associated with Calligra.
They will automatically be used by gdb for debugging calligra-related
diff -Nru calligra-2.8.5+dfsg/debian/kexi-map-form-widget.install
calligra-2.8.5+dfsg/debian/kexi-map-form-widget.install
--- calligra-2.8.5+dfsg/debian/kexi-map-form-widget.install 2014-08-12
14:42:38.0 +0100
+++ calligra-2.8.5+dfsg/debian/kexi-map-form-widget.install 1970-01-01
01:00:00.0 +0100
@@ -1,2 +0,0 @@
-usr/lib/kde4/kformdesigner_mapbrowser.so
-usr/share/kde4/services/kformdesigner/kformdesigner_mapbrowser.desktop