KOFFICE_1_3_BRANCH: koffice/debian

2005-03-25 Thread Ben Burton
CVS commit by benb: 

Full GFDL text; update build-depends.


  M +9 -0  changelog   1.149.2.21
  M +1 -1  control   1.120.2.11
  M +418 -6copyright   1.13.2.1




-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



KOFFICE_1_3_BRANCH: koffice/debian

2005-01-21 Thread Ben Burton
CVS commit by benb: 

Use the koffice patch, not the debian patch.


  M +6 -5  changelog   1.149.2.20
  M +15 -44patches/xpdf3.diff   1.1.2.2


--- koffice/debian/changelog  #1.149.2.19:1.149.2.20
@@ -1,13 +1,14 @@
 koffice (1:1.3.5-2) unstable; urgency=high
 
-  * Yet another xpdf security fix.  This time a buffer overflow in the
-Decrypt::makeFileKey2 function from the xpdf sources has been fixed
-(closes: #291245).  See the following URL for further information:
-- http://www.kde.org/info/security/advisory-20050119-1.txt
+  * Yet another xpdf security fix.  This time a buffer overflow has been
+fixed relating to an invalid key length (closes: #291245).  See the
+following URLs for further information:
+- http://www.koffice.org/security/advisory-20050120-1.txt
+- http://www.kde.org/info/security/advisory-20050120-1.txt
 References: CAN-2005-0064, DSA-648
   * Added CAN and DSA reference numbers to the previous changelog entry
 for easier tracking.
 
- -- Ben Burton [EMAIL PROTECTED]  Fri, 21 Jan 2005 02:02:46 +1100
+ -- Ben Burton [EMAIL PROTECTED]  Sat, 22 Jan 2005 01:48:18 +1100
 
 koffice (1:1.3.5-1) unstable; urgency=high

--- koffice/debian/patches/xpdf3.diff  #1.1.2.1:1.1.2.2
@@ -1,44 +1,15 @@
 koffice/filters/kword/pdf/xpdf/xpdf/Decrypt.cc
-+++ koffice/filters/kword/pdf/xpdf/xpdf/Decrypt.cc
-@@ -73,6 +73,11 @@
-   Guchar fx, fy;
-   int len, i, j;
- 
-+  // check whether we have non-zero keyLength
-+  if ( !keyLength ) {
-+return gFalse;
-+  }
-+
-   // try using the supplied owner password to generate the user password
-   if (ownerPassword) {
- len = ownerPassword-getLength();
-@@ -100,7 +105,7 @@
-   } else {
- memcpy(test2, ownerKey-getCString(), 32);
- for (i = 19; i = 0; --i) {
--  for (j = 0; j  keyLength; ++j) {
-+  for (j = 0; j  keyLength  j  16; ++j) {
-tmpKey[j] = test[j] ^ i;
-   }
-   rc4InitKey(tmpKey, keyLength, fState);
-@@ -137,6 +142,11 @@
-   int len, i, j;
-   GBool ok;
- 
-+  // check whether we have non-zero keyLength
-+  if ( !keyLength ) {
-+return gFalse;
-+  }
-+
-   // generate file key
-   buf = (Guchar *)gmalloc(68 + fileID-getLength());
-   if (userPassword) {
-@@ -174,7 +184,7 @@
-   } else if (encRevision == 3) {
- memcpy(test, userKey-getCString(), 32);
- for (i = 19; i = 0; --i) {
--  for (j = 0; j  keyLength; ++j) {
-+  for (j = 0; j  keyLength  j  16; ++j) {
-tmpKey[j] = fileKey[j] ^ i;
-   }
-   rc4InitKey(tmpKey, keyLength, fState);
+--- koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc 30 Oct 2004 16:35:33 - 
 1.6
 koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc 20 Jan 2005 17:36:38 - 
 1.8
+@@ -501,6 +501,12 @@ GBool XRef::checkEncrypted(GString *owne
+} else {
+  keyLength = 5;
+}
++   if (keyLength  1) {
++ keyLength = 1;
++   }
++   if (keyLength  16) {
++ keyLength = 16;
++   }
+permFlags = permissions.getInt();
+if (encVersion = 1  encVersion = 2 
+encRevision = 2  encRevision = 3) {



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



KOFFICE_1_3_BRANCH: koffice/debian/patches

2004-10-27 Thread Ben Burton
CVS commit by benb: 

Don't forget limits.h


  M +24 -8 xpdf.diff   1.1.2.2


--- koffice/debian/patches/xpdf.diff  #1.1.2.1:1.1.2.2
@@ -1,5 +1,13 @@
 --- koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc  22 Oct 2004 12:13:56 
-  1.1.2.1
-+++ koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc  27 Oct 2004 10:33:25 
-
-@@ -63,8 +63,8 @@ Catalog::Catalog(XRef *xrefA) {
 koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc  27 Oct 2004 10:51:55 
-
+@@ -12,6 +12,7 @@
+ #pragma implementation
+ #endif
+ 
++#include limits.h
+ #include stddef.h
+ #include gmem.h
+ #include Object.h
+@@ -63,8 +64,8 @@ Catalog::Catalog(XRef *xrefA) {
}
pagesSize = numPages0 = obj.getInt();
@@ -12,5 +20,5 @@
  ok = gFalse;
  return;
-@@ -196,8 +196,8 @@ int Catalog::readPageTree(Dict *pagesDic
+@@ -196,8 +197,8 @@ int Catalog::readPageTree(Dict *pagesDic
}
if (start = pagesSize) {
@@ -24,6 +32,14 @@
  }
 --- koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc 22 Oct 2004 12:13:56 - 
 1.1.2.1
-+++ koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc 27 Oct 2004 10:33:25 -
-@@ -76,7 +76,7 @@ XRef::XRef(BaseStream *strA, GString *ow
 koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc 27 Oct 2004 10:51:56 -
+@@ -12,6 +12,7 @@
+ #pragma implementation
+ #endif
+ 
++#include limits.h
+ #include stdlib.h
+ #include stddef.h
+ #include string.h
+@@ -76,7 +77,7 @@ XRef::XRef(BaseStream *strA, GString *ow
  
// trailer is ok - read the xref table
@@ -34,5 +50,5 @@
ok = gFalse;
errCode = errDamaged;
-@@ -273,7 +273,7 @@ GBool XRef::readXRef(Guint *pos) {
+@@ -273,7 +274,7 @@ GBool XRef::readXRef(Guint *pos) {
  // table size
  if (first + n  size) {
@@ -43,5 +59,5 @@
  goto err2;
}
-@@ -420,7 +420,7 @@ GBool XRef::constructXRef() {
+@@ -420,7 +421,7 @@ GBool XRef::constructXRef() {
 if (!strncmp(p, obj, 3)) {
   if (num = size) {
@@ -52,5 +68,5 @@
   return gFalse;
 }
-@@ -445,7 +445,7 @@ GBool XRef::constructXRef() {
+@@ -445,7 +446,7 @@ GBool XRef::constructXRef() {
  } else if (!strncmp(p, endstream, 9)) {
if (streamEndsLen == streamEndsSize) {




KOFFICE_1_3_BRANCH: koffice/debian

2004-10-27 Thread Ben Burton
CVS commit by benb: 

Install quickprint desktop files.


  M +1 -0  karbon.install   1.8.2.2
  M +1 -0  kformula.install   1.5.2.2
  M +1 -0  kivio-data.install   1.1.2.2
  M +1 -0  kpresenter.install   1.6.2.2
  M +1 -0  kspread.install   1.6.2.2
  M +1 -0  kword.install   1.7.2.2


--- koffice/debian/karbon.install  #1.8.2.1:1.8.2.2
@@ -43,4 +43,5 @@
 usr/share/applnk/Office/karbon.desktop
 usr/share/apps/karbon
+usr/share/apps/konqueror/servicemenus/karbon_konqi.desktop
 usr/share/icons/crystalsvg/16x16/apps/karbon.png
 usr/share/icons/crystalsvg/32x32/apps/karbon.png

--- koffice/debian/kformula.install  #1.5.2.1:1.5.2.2
@@ -4,4 +4,5 @@
 usr/share/applnk/Office/kformula.desktop
 usr/share/apps/kformula
+usr/share/apps/konqueror/servicemenus/kformula_konqi.desktop
 usr/share/doc/kde/HTML/en/kformula/*.bz2
 usr/share/doc/kde/HTML/en/kformula/*.docbook

--- koffice/debian/kivio-data.install  #1.1.2.1:1.1.2.2
@@ -1 +1,2 @@
 usr/share/apps/kivio
+usr/share/apps/konqueror/servicemenus/kivio_konqi.desktop

--- koffice/debian/kpresenter.install  #1.6.2.1:1.6.2.2
@@ -11,4 +11,5 @@
 usr/lib/kde3/libooimpressimport.so
 usr/share/applnk/Office/kpresenter.desktop
+usr/share/apps/konqueror/servicemenus/kpresenter_konqi.desktop
 usr/share/apps/kpresenter
 usr/share/icons/crystalsvg/16x16/apps/kpresenter.png

--- koffice/debian/kspread.install  #1.6.2.1:1.6.2.2
@@ -28,4 +28,5 @@
 usr/lib/kspread.*
 usr/share/applnk/Office/kspread.desktop
+usr/share/apps/konqueror/servicemenus/kspread_konqi.desktop
 usr/share/apps/kspread
 usr/share/icons/crystalsvg/16x16/apps/kspread.png

--- koffice/debian/kword.install  #1.7.2.1:1.7.2.2
@@ -60,4 +60,5 @@
 usr/lib/kde3/libwpimport.so
 usr/share/applnk/Office/kword.desktop
+usr/share/apps/konqueror/servicemenus/kword_konqi.desktop
 usr/share/apps/kword
 usr/share/doc/kde/HTML/en/kword/*.bz2




KOFFICE_1_3_BRANCH: koffice/debian

2004-10-25 Thread Ben Burton
CVS commit by benb: 

Upload xpdf security fixes.


  M +9 -0  changelog   1.149.2.15


--- koffice/debian/changelog  #1.149.2.14:1.149.2.15
@@ -1,2 +1,11 @@
+koffice (1:1.3.3-3) unstable; urgency=critical
+
+  * Security upload.
+  * Fixes integer overflows in KWord's PDF import filter.  This patch forms
+part of the KDE security advisory (2004-10-21, CAN-2004-0888) relating to
+vulnerabilities inherited from the xpdf code.
+
+ -- Ben Burton [EMAIL PROTECTED]  Mon, 25 Oct 2004 20:11:56 +1000
+
 koffice (1:1.3.3-2) unstable; urgency=medium
 




KOFFICE_1_3_BRANCH: koffice/debian

2004-10-21 Thread Ben Burton
CVS commit by benb: 

Add build-conflicts: autoconf2.13.


  M +2 -0  changelog   1.149.2.14
  M +1 -0  control   1.120.2.10


--- koffice/debian/changelog  #1.149.2.13:1.149.2.14
@@ -3,4 +3,6 @@
   * Tightened shlibs files, since the library interface has changed
 since 1.3.0 (closes: #268366).
+  * Build-conflicts with autoconf2.13, since admin/Makefile.common does not
+operate correctly in its presence.
 
  -- Ben Burton [EMAIL PROTECTED]  Fri, 22 Oct 2004 08:04:16 +1000

--- koffice/debian/control  #1.120.2.9:1.120.2.10
@@ -4,4 +4,5 @@
 Maintainer: Ben Burton [EMAIL PROTECTED]
 Build-Depends: automake1.7, debhelper (= 4.0.0), flex, kdelibs4-dev (= 
4:3.2.0), libaspell-dev, libfontconfig1-dev, libmagick++6-dev, 
libmysqlclient-dev, libpaper-dev, libtiff4-dev, libwv2-dev (= 0.1.9-0), 
libxml2-dev, libxslt1-dev, postgresql-dev, python2.3-dev
+Build-Conflicts: autoconf2.13
 Standards-Version: 3.6.1
 




KOFFICE_1_3_BRANCH: koffice/debian

2004-10-17 Thread Ben Burton
CVS commit by benb: 

Updates for 1.3.3.


  M +9 -0  changelog   1.149.2.10
  M +2 -2  source.lintian-overrides   1.1.2.2


--- koffice/debian/changelog  #1.149.2.9:1.149.2.10
@@ -1,2 +1,11 @@
+koffice (1:1.3.3-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * Gnumeric export is fixed (closes: #200313).
+  * Karbon no longer locks up when importing an EPS graphic containing
+%ALDBoundingBox (closes: #242454).
+
+ -- Ben Burton [EMAIL PROTECTED]  Sun, 17 Oct 2004 19:19:03 +1000
+
 koffice (1:1.3.2-2) unstable; urgency=medium
 

--- koffice/debian/source.lintian-overrides  #1.1.2.1:1.1.2.2
@@ -1,3 +1,3 @@
 # These are bundled with all KDE source downloads.
-koffice source: source-contains-CVS-dir
-koffice source: cvsignore-file-in-source
+source-contains-CVS-dir
+cvsignore-file-in-source




KOFFICE_1_3_BRANCH: koffice/debian

2004-10-17 Thread Ben Burton
CVS commit by benb: 

Make koffice suggest koffice-i18n.


  M +2 -0  changelog   1.149.2.11
  M +1 -1  control   1.120.2.8


--- koffice/debian/changelog  #1.149.2.10:1.149.2.11
@@ -2,4 +2,6 @@
 
   * New upstream bugfix release.
+  * Made koffice suggest koffice-i18n (closes: #272754).  As of 1.3.3,
+all koffice-i18n-lang packages provide koffice-i18n accordingly.
   * Gnumeric export is fixed (closes: #200313).
   * Karbon no longer locks up when importing an EPS graphic containing

--- koffice/debian/control  #1.120.2.7:1.120.2.8
@@ -10,5 +10,5 @@
 Section: kde
 Depends: karbon, kchart, kformula, kivio, koshell, kpresenter, kspread, kugar, 
kword
-Suggests: koffice-dev, koffice-doc-html
+Suggests: koffice-i18n, koffice-dev, koffice-doc-html
 Description: KDE Office Suite
  KOffice is an integrated office suite for KDE, the K Desktop




KOFFICE_1_3_BRANCH: koffice/debian

2004-10-17 Thread Ben Burton
CVS commit by benb: 

Build-depend on libpaper-dev.


  M +1 -0  changelog   1.149.2.12
  M +1 -1  control   1.120.2.9


--- koffice/debian/changelog  #1.149.2.11:1.149.2.12
@@ -2,4 +2,5 @@
 
   * New upstream bugfix release.
+  * Build-depends on libpaper-dev for xpdf filters.
   * Made koffice suggest koffice-i18n (closes: #272754).  As of 1.3.3,
 all koffice-i18n-lang packages provide koffice-i18n accordingly.

--- koffice/debian/control  #1.120.2.8:1.120.2.9
@@ -3,5 +3,5 @@
 Priority: optional
 Maintainer: Ben Burton [EMAIL PROTECTED]
-Build-Depends: automake1.7, debhelper (= 4.0.0), flex, kdelibs4-dev (= 
4:3.2.0), libaspell-dev, libfontconfig1-dev, libmagick++6-dev, 
libmysqlclient-dev, libtiff4-dev, libwv2-dev (= 0.1.9-0), libxml2-dev, 
libxslt1-dev, postgresql-dev, python2.3-dev
+Build-Depends: automake1.7, debhelper (= 4.0.0), flex, kdelibs4-dev (= 
4:3.2.0), libaspell-dev, libfontconfig1-dev, libmagick++6-dev, 
libmysqlclient-dev, libpaper-dev, libtiff4-dev, libwv2-dev (= 0.1.9-0), 
libxml2-dev, libxslt1-dev, postgresql-dev, python2.3-dev
 Standards-Version: 3.6.1
 




KOFFICE_1_3_BRANCH: koffice/debian

2004-08-01 Thread Ben Burton
CVS commit by benb: 

Oh yeah.  Transition and all.


  M +1 -1  changelog   1.149.2.9


--- koffice/debian/changelog  #1.149.2.8:1.149.2.9
@@ -1,3 +1,3 @@
-koffice (1:1.3.2-2) unstable; urgency=low
+koffice (1:1.3.2-2) unstable; urgency=medium
 
   * Rebuilt against libtiff4.




KOFFICE_1_3_BRANCH: koffice/debian

2004-07-10 Thread Ben Burton
CVS commit by benb: 

Prepare 1.3.2 packages, including kivio/kivio-data split.


  Akivio-data.README.Debian   1.1.2.1
  Akivio-data.docs   1.1.2.1
  Akivio-data.install   1.1.2.1
  M +1 -0  .cvsignore   1.9.2.1
  M +8 -0  changelog   1.149.2.7
  M +14 -14control   1.120.2.6
  M +0 -1  kivio.install   1.8.2.1





KOFFICE_1_3_BRANCH: koffice/debian

2004-05-09 Thread Ben Burton
CVS commit by benb: 

Missing files and lintian fixes.


  Asource.lintian-overrides   1.1.2.1
  M +1 -1  control   1.120.2.5
  M +1 -0  karbon.install   1.8.2.1
  M +1 -0  kchart.install   1.5.2.1
  M +1 -0  kformula.install   1.5.2.1
  M +1 -0  kpresenter.install   1.6.2.1
  M +1 -0  kspread.install   1.6.2.1
  M +1 -0  kugar.install   1.7.2.3
  M +1 -0  kword.install   1.7.2.1


--- koffice/debian/control  #1.120.2.4:1.120.2.5
@@ -21,5 +21,5 @@
 Architecture: all
 Section: doc
-Suggests: www-browser, koffice
+Suggests: konqueror | www-browser, koffice
 Conflicts: koffice-libs ( 1:1.1.0-0), koshell ( 1:1.1.0-0), kpresenter ( 
1:1.1.0-0), kspread ( 1:1.1.0-0), kugar ( 1:1.1.0-0), kword ( 1:1.1.0-0)
 Replaces: koffice-libs ( 1:1.1.0-0), koshell ( 1:1.1.0-0), kpresenter ( 
1:1.1.0-0), kspread ( 1:1.1.0-0), kugar ( 1:1.1.0-0), kword ( 1:1.1.0-0)

--- koffice/debian/karbon.install  #1.8:1.8.2.1
@@ -58,3 +58,4 @@
 usr/share/services/karbon_wmf_export.desktop
 usr/share/services/karbon_wmf_import.desktop
+usr/share/services/karbonpart.desktop
 ../karbon.xpm usr/share/pixmaps

--- koffice/debian/kchart.install  #1.5:1.5.2.1
@@ -13,3 +13,4 @@
 usr/share/icons/crystalsvg/32x32/apps/kchart.png
 usr/share/icons/crystalsvg/48x48/apps/kchart.png
+usr/share/services/kchartpart.desktop
 ../kchart.xpm usr/share/pixmaps

--- koffice/debian/kformula.install  #1.5:1.5.2.1
@@ -11,3 +11,4 @@
 usr/share/icons/crystalsvg/32x32/apps/kformula.png
 usr/share/icons/crystalsvg/48x48/apps/kformula.png
+usr/share/services/kformulapart.desktop
 ../kformula.xpm usr/share/pixmaps

--- koffice/debian/kpresenter.install  #1.6:1.6.2.1
@@ -22,3 +22,4 @@
 usr/share/services/kpresenter_ooimpress_export.desktop
 usr/share/services/kpresenter_ooimpress_import.desktop
+usr/share/services/kpresenterpart.desktop
 ../kpresenter.xpm usr/share/pixmaps

--- koffice/debian/kspread.install  #1.6:1.6.2.1
@@ -47,4 +47,5 @@
 usr/share/services/kspread_opencalc_import.desktop
 usr/share/services/kspread_qpro_import.desktop
+usr/share/services/kspreadpart.desktop
 usr/share/doc/kde/HTML/en/kspread/*.bz2
 usr/share/doc/kde/HTML/en/kspread/*.docbook

--- koffice/debian/kugar.install  #1.7.2.2:1.7.2.3
@@ -28,3 +28,4 @@
 usr/share/icons/locolor/32x32/apps/kudesigner.png
 usr/share/services/kugar_kugar_import.desktop
+usr/share/services/kugarpart.desktop
 ../kugar.xpm usr/share/pixmaps

--- koffice/debian/kword.install  #1.7:1.7.2.1
@@ -94,3 +94,4 @@
 usr/share/services/kword_wp_export.desktop
 usr/share/services/kword_wp_import.desktop
+usr/share/services/kwordpart.desktop
 ../kword.xpm usr/share/pixmaps




KOFFICE_1_3_BRANCH: koffice/debian/patches

2004-05-08 Thread Ben Burton
CVS commit by benb: 

Make tex fonts the default in kformula, since we have these in debian main.


  Atexfonts.diff   1.1.2.1





KOFFICE_1_3_BRANCH: koffice/debian

2004-03-07 Thread Ben Burton
CVS commit by benb: 

KOffice upload for KDE 3.2.


  M +7 -0  changelog   1.149.2.5
  M +1 -1  control   1.120.2.2
  M +0 -1  koffice-data.install   1.3.2.1
  M +0 -1  kugar.install   1.7.2.2


--- koffice/debian/changelog  #1.149.2.4:1.149.2.5
@@ -1,2 +1,9 @@
+koffice (1:1.3.0-2) unstable; urgency=low
+
+  * Built against KDE 3.2.
+  * No longer installs mimetypes required for KDE 3.1 (closes: #236503).
+
+ -- Ben Burton [EMAIL PROTECTED]  Sun,  7 Mar 2004 21:37:44 +1100
+
 koffice (1:1.3.0-1) unstable; urgency=low
 

--- koffice/debian/control  #1.120.2.1:1.120.2.2
@@ -3,5 +3,5 @@
 Priority: optional
 Maintainer: Ben Burton [EMAIL PROTECTED]
-Build-Depends: automake1.7, debhelper (= 4.0.0), flex, kdelibs4-dev, 
libaspell-dev, libfontconfig1-dev, libmagick++-dev, libmysqlclient-dev, 
libwv2-dev (= 0.1.9-0), libxml2-dev, libxslt1-dev, postgresql-dev, 
python2.3-dev
+Build-Depends: automake1.7, debhelper (= 4.0.0), flex, kdelibs4-dev (= 
4:3.2.0), libaspell-dev, libfontconfig1-dev, libmagick++-dev, 
libmysqlclient-dev, libwv2-dev (= 0.1.9-0), libxml2-dev, libxslt1-dev, 
postgresql-dev, python2.3-dev
 Standards-Version: 3.6.1
 

--- koffice/debian/koffice-data.install  #1.3:1.3.2.1
@@ -65,5 +65,4 @@
 usr/share/icons/crystalsvg/32x32/actions/sum.png
 usr/share/icons/crystalsvg/32x32/actions/under.png
-usr/share/mimelnk
 usr/share/services/clipartthumbnail.desktop
 usr/share/services/kfile_koffice.desktop

--- koffice/debian/kugar.install  #1.7.2.1:1.7.2.2
@@ -22,5 +22,4 @@
 usr/share/icons/crystalsvg/16x16/mimetypes/kugardata.png
 usr/share/icons/crystalsvg/22x22/apps/kugar.png
-usr/share/icons/crystalsvg/22x22/mimetypes/kugardata.png
 usr/share/icons/crystalsvg/32x32/apps/kugar.png
 usr/share/icons/crystalsvg/32x32/mimetypes/kugardata.png




KOFFICE_1_3_BRANCH: koffice/debian

2004-03-07 Thread Ben Burton
CVS commit by benb: 

Quotes in menu files.


  M +3 -3  karbon.menu   1.3.2.1
  M +3 -3  kchart.menu   1.8.2.1
  M +3 -3  kformula.menu   1.5.2.1
  M +3 -3  kivio.menu   1.6.2.1
  M +3 -3  koffice-libs.menu   1.7.2.1
  M +3 -3  koshell.menu   1.4.2.1
  M +3 -3  kpresenter.menu   1.7.2.1
  M +3 -3  kspread.menu   1.9.2.1
  M +6 -6  kugar.menu   1.6.2.1
  M +3 -3  kword.menu   1.8.2.1





KOFFICE_1_3_BRANCH: koffice/debian

2004-01-28 Thread Ben Burton
CVS commit by benb: 

Remove build-depends on libqt3-compat-headers.


  M +2 -0  changelog   1.149.2.4
  M +1 -1  control   1.120.2.1


--- koffice/debian/changelog  #1.149.2.3:1.149.2.4
@@ -3,4 +3,6 @@
   * New upstream release (1.3-final).
   * No longer built against a broken imagemagick (closes: #226013).
+  * Removed libqt3-compat-headers from the build-depends since these are
+no longer necessary.
 
  -- Ben Burton [EMAIL PROTECTED]  Thu, 29 Jan 2004 09:20:54 +1100

--- koffice/debian/control  #1.120:1.120.2.1
@@ -3,5 +3,5 @@
 Priority: optional
 Maintainer: Ben Burton [EMAIL PROTECTED]
-Build-Depends: automake1.7, debhelper (= 4.0.0), flex, kdelibs4-dev, 
libaspell-dev, libfontconfig1-dev, libmagick++-dev, libmysqlclient-dev, 
libqt3-compat-headers, libwv2-dev (= 0.1.9-0), libxml2-dev, libxslt1-dev, 
postgresql-dev, python2.3-dev
+Build-Depends: automake1.7, debhelper (= 4.0.0), flex, kdelibs4-dev, 
libaspell-dev, libfontconfig1-dev, libmagick++-dev, libmysqlclient-dev, 
libwv2-dev (= 0.1.9-0), libxml2-dev, libxslt1-dev, postgresql-dev, 
python2.3-dev
 Standards-Version: 3.6.1
 




KOFFICE_1_3_BRANCH: koffice/debian

2004-01-17 Thread Ben Burton
CVS commit by benb: 

Updates for 1.3-final.


  M +6 -0  changelog   1.149.2.2
  M +1 -1  kchart.shlibs   1.12.2.2
  M +13 -13koffice-libs.shlibs   1.26.2.2
  M +2 -2  kugar.shlibs   1.6.2.2


--- koffice/debian/changelog  #1.149.2.1:1.149.2.2
@@ -1,2 +1,8 @@
+koffice (1:1.3.0-1) unstable; urgency=low
+
+  * New upstream release (1.3-final).
+
+ -- Ben Burton [EMAIL PROTECTED]  Sun, 18 Jan 2004 11:55:39 +1100
+
 koffice (1:1.2.95-1) unstable; urgency=low
 

--- koffice/debian/kchart.shlibs  #1.12.2.1:1.12.2.2
@@ -1,2 +1,2 @@
 kchart 0 kchart
-libkdchart 0 kchart (= 1:1.2.95-0)
+libkdchart 0 kchart (= 1:1.3.0-0)

--- koffice/debian/koffice-libs.shlibs  #1.26.2.1:1.26.2.2
@@ -1,13 +1,13 @@
-libkformula 3 koffice-libs (= 1:1.2.95-0)
-libkochart 1 koffice-libs (= 1:1.2.95-0)
-libkofficecore 2 koffice-libs (= 1:1.2.95-0)
-libkofficeui 2 koffice-libs (= 1:1.2.95-0)
-libkopainter 1 koffice-libs (= 1:1.2.95-0)
-libkoscript 2 koffice-libs (= 1:1.2.95-0)
-libkospell 4 koffice-libs (= 1:1.2.95-0)
-libkotext 2 koffice-libs (= 1:1.2.95-0)
-libkowmf 1 koffice-libs (= 1:1.2.95-0)
-libkstore 2 koffice-libs (= 1:1.2.95-0)
-libkwmailmerge_interface 4 koffice-libs (= 1:1.2.95-0)
-libkwmf 2 koffice-libs (= 1:1.2.95-0)
-libkwordexportfilters 1 koffice-libs (= 1:1.2.95-0)
+libkformula 3 koffice-libs (= 1:1.3.0-0)
+libkochart 1 koffice-libs (= 1:1.3.0-0)
+libkofficecore 2 koffice-libs (= 1:1.3.0-0)
+libkofficeui 2 koffice-libs (= 1:1.3.0-0)
+libkopainter 1 koffice-libs (= 1:1.3.0-0)
+libkoscript 2 koffice-libs (= 1:1.3.0-0)
+libkospell 4 koffice-libs (= 1:1.3.0-0)
+libkotext 2 koffice-libs (= 1:1.3.0-0)
+libkowmf 1 koffice-libs (= 1:1.3.0-0)
+libkstore 2 koffice-libs (= 1:1.3.0-0)
+libkwmailmerge_interface 4 koffice-libs (= 1:1.3.0-0)
+libkwmf 2 koffice-libs (= 1:1.3.0-0)
+libkwordexportfilters 1 koffice-libs (= 1:1.3.0-0)

--- koffice/debian/kugar.shlibs  #1.6.2.1:1.6.2.2
@@ -1,4 +1,4 @@
 kugar 0 kugar
 kudesigner 0 kugar
-libkugar 1 kugar (= 1:1.2.95-0)
-libkudesignercore 0 kugar (= 1:1.2.95-0)
+libkugar 1 kugar (= 1:1.3.0-0)
+libkudesignercore 0 kugar (= 1:1.3.0-0)




KOFFICE_1_3_BRANCH: koffice/debian

2003-12-20 Thread Ben Burton
CVS commit by benb: 

Updated changelog entry for 1.2.95.


  M +3 -3  changelog   1.149.2.1


--- koffice/debian/changelog  #1.149:1.149.2.1
@@ -1,9 +1,9 @@
-koffice (1:1.3.0-1) unstable; urgency=low
+koffice (1:1.2.95-1) unstable; urgency=low
 
-  * New upstream release (1.3-final).
+  * New upstream release (1.3-rc2).
   * Changed suggests openoffice.org-mimelnk to recommends now that OOo is in
 main.
 
- -- Ben Burton [EMAIL PROTECTED]  Mon,  3 Nov 2003 11:18:03 +1100
+ -- Ben Burton [EMAIL PROTECTED]  Sun, 21 Dec 2003 01:26:54 +1100
 
 koffice (1:1.2.94-1) unstable; urgency=low




KOFFICE_1_3_BRANCH: koffice/debian

2003-12-20 Thread Ben Burton
CVS commit by benb: 

Updated shlibs files for 1.2.95.


  M +1 -1  kchart.shlibs   1.12.2.1
  M +13 -13koffice-libs.shlibs   1.26.2.1
  M +2 -2  kugar.shlibs   1.6.2.1


--- koffice/debian/kchart.shlibs  #1.12:1.12.2.1
@@ -1,2 +1,2 @@
 kchart 0 kchart
-libkdchart 0 kchart (= 1:1.2.94-0)
+libkdchart 0 kchart (= 1:1.2.95-0)

--- koffice/debian/koffice-libs.shlibs  #1.26:1.26.2.1
@@ -1,13 +1,13 @@
-libkformula 3 koffice-libs (= 1:1.2.94-0)
-libkochart 1 koffice-libs (= 1:1.2.94-0)
-libkofficecore 2 koffice-libs (= 1:1.2.94-0)
-libkofficeui 2 koffice-libs (= 1:1.2.94-0)
-libkopainter 1 koffice-libs (= 1:1.2.94-0)
-libkoscript 2 koffice-libs (= 1:1.2.94-0)
-libkospell 4 koffice-libs (= 1:1.2.94-0)
-libkotext 2 koffice-libs (= 1:1.2.94-0)
-libkowmf 1 koffice-libs (= 1:1.2.94-0)
-libkstore 2 koffice-libs (= 1:1.2.94-0)
-libkwmailmerge_interface 4 koffice-libs (= 1:1.2.94-0)
-libkwmf 2 koffice-libs (= 1:1.2.94-0)
-libkwordexportfilters 1 koffice-libs (= 1:1.2.94-0)
+libkformula 3 koffice-libs (= 1:1.2.95-0)
+libkochart 1 koffice-libs (= 1:1.2.95-0)
+libkofficecore 2 koffice-libs (= 1:1.2.95-0)
+libkofficeui 2 koffice-libs (= 1:1.2.95-0)
+libkopainter 1 koffice-libs (= 1:1.2.95-0)
+libkoscript 2 koffice-libs (= 1:1.2.95-0)
+libkospell 4 koffice-libs (= 1:1.2.95-0)
+libkotext 2 koffice-libs (= 1:1.2.95-0)
+libkowmf 1 koffice-libs (= 1:1.2.95-0)
+libkstore 2 koffice-libs (= 1:1.2.95-0)
+libkwmailmerge_interface 4 koffice-libs (= 1:1.2.95-0)
+libkwmf 2 koffice-libs (= 1:1.2.95-0)
+libkwordexportfilters 1 koffice-libs (= 1:1.2.95-0)

--- koffice/debian/kugar.shlibs  #1.6:1.6.2.1
@@ -1,4 +1,4 @@
 kugar 0 kugar
 kudesigner 0 kugar
-libkugar 1 kugar (= 1:1.2.94-0)
-libkudesignercore 0 kugar (= 1:1.2.94-0)
+libkugar 1 kugar (= 1:1.2.95-0)
+libkudesignercore 0 kugar (= 1:1.2.95-0)