rev 3806 - in trunk/packages/koffice/debian: . patches
Isaac Clerencia
isaac at costa.debian.org
Tue May 23 10:33:53 UTC 2006
Author: isaac
Date: 2006-05-23 10:33:46 +0000 (Tue, 23 May 2006)
New Revision: 3806
Added:
trunk/packages/koffice/debian/patches/32_remove_kdxmltools_header.diff
Modified:
trunk/packages/koffice/debian/changelog
trunk/packages/koffice/debian/control
trunk/packages/koffice/debian/rules
Log:
1.5.1
Modified: trunk/packages/koffice/debian/changelog
===================================================================
--- trunk/packages/koffice/debian/changelog 2006-05-22 07:25:12 UTC (rev 3805)
+++ trunk/packages/koffice/debian/changelog 2006-05-23 10:33:46 UTC (rev 3806)
@@ -1,3 +1,21 @@
+koffice (1:1.5.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Bumped Standard-Version to 3.7.2, no changes required
+ * Build-Depend on libexif-dev (>= 0.6.13)
+ * Tighten apps dependency on koffice-libs (<< ${KDE-Next-Version3}),
+ closes: #366298
+ * Add three patches from usptream SVN, including one to not include
+ KDXMLTools.h from public headers, which closes: #330470
+
+ -- Isaac Clerencia <isaac at debian.org> Mon, 22 May 2006 08:20:38 +0200
+
+koffice (1:1.5.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Isaac Clerencia <isaac at debian.org> Thu, 6 Apr 2006 09:04:19 +0200
+
koffice (1:1.4.99-1) unstable; urgency=low
* New upstream release candidate
Modified: trunk/packages/koffice/debian/control
===================================================================
--- trunk/packages/koffice/debian/control 2006-05-22 07:25:12 UTC (rev 3805)
+++ trunk/packages/koffice/debian/control 2006-05-23 10:33:46 UTC (rev 3806)
@@ -52,7 +52,7 @@
Package: karbon
Architecture: any
Section: graphics
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, koffice-libs (<< ${KDE-Next-Version3})
Replaces: koffice-libs (<< 1:1.2.90-0)
Description: a vector graphics application for the KDE Office Suite
Karbon is a vector graphics application.
@@ -62,7 +62,7 @@
Package: kchart
Architecture: any
Section: kde
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, koffice-libs (<< ${KDE-Next-Version3})
Suggests: khelpcenter, koffice-doc-html
Replaces: koffice-libs (<< 1:1.1-20010404-0)
Description: a chart drawing program for the KDE Office Suite
@@ -74,7 +74,7 @@
Package: kexi
Architecture: any
Section: kde
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, koffice-libs (<< ${KDE-Next-Version3})
Replaces: kexi-postgresql-driver (<< 1:1.4.88-1), kexi-mysql-driver (<< 1:1.4.88-1)
Description: integrated database environment for the KDE Office Suite
Kexi is an integrated data management application. It can be used for
@@ -94,7 +94,7 @@
Package: kformula
Architecture: any
Section: kde
-Depends: ${shlibs:Depends}, latex-xft-fonts
+Depends: ${shlibs:Depends}, latex-xft-fonts, koffice-libs (<< ${KDE-Next-Version3})
Suggests: khelpcenter, koffice-doc-html
Replaces: koffice-libs (<< 1:1.1-20010404-0)
Description: a formula editor for the KDE Office Suite
@@ -110,7 +110,7 @@
Package: kivio
Architecture: any
Section: graphics
-Depends: ${shlibs:Depends}, kivio-data (>> 1:1.4.90.2-1), kivio-data (>> ${KDE-Version3}), kivio-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, kivio-data (>> 1:1.4.90.2-1), kivio-data (>> ${KDE-Version3}), kivio-data (<< ${KDE-Next-Version3}), koffice-libs (<< ${KDE-Next-Version3})
Replaces: koffice-libs (<< 1:1.1-20010404-0)
Description: a flowcharting program for the KDE Office Suite
Kivio is a flowcharting program that offers basic flowcharting abilities,
@@ -134,7 +134,7 @@
Package: koshell
Architecture: any
Section: kde
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, koffice-libs (<< ${KDE-Next-Version3})
Recommends: koffice
Suggests: khelpcenter, koffice-doc-html
Replaces: koffice-libs (<< 1:1.1-20010404-0)
@@ -147,7 +147,7 @@
Package: kplato
Architecture: any
Section: kde
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, koffice-libs (<< ${KDE-Next-Version3})
Suggests: khelpcenter, koffice-doc-html
Description: an integrated project management and planning tool
KPlato is a project management application, allowing for the planning and
@@ -159,7 +159,7 @@
Package: kpresenter
Architecture: any
Section: kde
-Depends: ${shlibs:Depends}, ${perl:Depends}, kpresenter-data (>> ${KDE-Version3}), kpresenter-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, ${perl:Depends}, kpresenter-data (>> ${KDE-Version3}), kpresenter-data (<< ${KDE-Next-Version3}), koffice-libs (<< ${KDE-Next-Version3})
Recommends: libkscan1
Suggests: khelpcenter, koffice-doc-html
Replaces: koffice-libs (<< 1:1.1-20010404-0)
@@ -185,7 +185,7 @@
Package: krita
Architecture: any
Section: kde
-Depends: ${shlibs:Depends}, krita-data (>> ${KDE-Version3}), krita-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, krita-data (>> ${KDE-Version3}), krita-data (<< ${KDE-Next-Version3}), koffice-libs (<< ${KDE-Next-Version3})
Suggests: khelpcenter, koffice-doc-html
Description: a pixel-based image manipulation program for the KDE Office Suite
Krita is a painting and image editing application for KOffice. Krita contains
@@ -208,7 +208,7 @@
Package: kspread
Architecture: any
Section: kde
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, koffice-libs (<< ${KDE-Next-Version3})
Suggests: khelpcenter, koffice-doc-html
Replaces: koffice-libs (<< 1:1.2.90-0)
Description: a spreadsheet for the KDE Office Suite
@@ -221,7 +221,7 @@
Package: kugar
Architecture: any
Section: kde
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, koffice-libs (<< ${KDE-Next-Version3})
Suggests: khelpcenter, koffice-doc-html
Replaces: koffice-libs (<< 1:1.1-20010404-0)
Description: a business report maker for the KDE Office Suite
@@ -236,7 +236,7 @@
Package: kword
Architecture: any
Section: kde
-Depends: ${shlibs:Depends}, kword-data (>> ${KDE-Version3}), kword-data (<< ${KDE-Next-Version3})
+Depends: ${shlibs:Depends}, kword-data (>> ${KDE-Version3}), kword-data (<< ${KDE-Next-Version3}), koffice-libs (<< ${KDE-Next-Version3})
Recommends: libkscan1
Suggests: khelpcenter, koffice-doc-html
Replaces: koffice-libs (<< 1:1.2.90-0)
@@ -263,7 +263,7 @@
Package: kthesaurus
Architecture: any
Section: kde
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, koffice-libs (<< ${KDE-Next-Version3})
Suggests: khelpcenter, koffice-doc-html
Replaces: koffice-libs (<< 1:1.4.2-7), koffice-data (<< 1:1.4.2-7)
Description: thesaurus for the KDE Office Suite
Added: trunk/packages/koffice/debian/patches/32_remove_kdxmltools_header.diff
===================================================================
--- trunk/packages/koffice/debian/patches/32_remove_kdxmltools_header.diff 2006-05-22 07:25:12 UTC (rev 3805)
+++ trunk/packages/koffice/debian/patches/32_remove_kdxmltools_header.diff 2006-05-23 10:33:46 UTC (rev 3806)
@@ -0,0 +1,50 @@
+Index: kchart/kdchart/KDChartPropertySet.h
+===================================================================
+--- kchart/kdchart/KDChartPropertySet.h (revision 543552)
++++ kchart/kdchart/KDChartPropertySet.h (revision 543553)
+@@ -30,7 +30,6 @@
+ #define __KDCHARTPROPERTYSET__
+
+
+-#include <KDXMLTools.h>
+ #include <KDChartEnums.h>
+ #include <kdchart_export.h>
+
+Index: kchart/kdchart/KDChartParams_frame.cpp
+===================================================================
+--- kchart/kdchart/KDChartParams_frame.cpp (revision 543552)
++++ kchart/kdchart/KDChartParams_frame.cpp (revision 543553)
+@@ -28,8 +28,8 @@
+ **********************************************************************/
+
+ #include "KDChartParams.h"
++#include "KDXMLTools.h"
+
+-
+ /**
+ \class KDChartParams::KDChartFrameSettings KDChartParams.h
+
+Index: kchart/kdchart/KDChartPropertySet.cpp
+===================================================================
+--- kchart/kdchart/KDChartPropertySet.cpp (revision 543552)
++++ kchart/kdchart/KDChartPropertySet.cpp (revision 543553)
+@@ -28,6 +28,7 @@
+ **********************************************************************/
+ #include "KDChartRingPainter.h"
+ #include "KDChartParams.h"
++#include "KDXMLTools.h"
+
+ #include <qpainter.h>
+ #include <qvaluestack.h>
+Index: kchart/kdchart/KDChartParams_io.cpp
+===================================================================
+--- kchart/kdchart/KDChartParams_io.cpp (revision 543552)
++++ kchart/kdchart/KDChartParams_io.cpp (revision 543553)
+@@ -27,6 +27,7 @@
+ **
+ **********************************************************************/
+ #include "KDChartParams.h"
++#include "KDXMLTools.h"
+
+ #include <qintdict.h>
+
Modified: trunk/packages/koffice/debian/rules
===================================================================
--- trunk/packages/koffice/debian/rules 2006-05-22 07:25:12 UTC (rev 3805)
+++ trunk/packages/koffice/debian/rules 2006-05-23 10:33:46 UTC (rev 3806)
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include debian/cdbs/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_KDE_APIDOX := yes
More information about the pkg-kde-commits
mailing list