[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

KOFFICE_1_3_BRANCH: koffice/debian



CVS commit by benb: 

New upload with a couple of bugfixes that are also committed to BRANCH.


  A            patches/kpresenter-templates.tgz.uu   1.1.2.1
  M +13 -2     changelog   1.149.2.22
  M +1 -1      control   1.120.2.12
  M +5 -0      rules   1.93.2.1


--- koffice/debian/changelog  #1.149.2.21:1.149.2.22
@@ -1,2 +1,13 @@
+koffice (1:1.3.5-4) unstable; urgency=high
+
+  * Fixed kpresenter templates for screen presentations (closes: #305989).
+    Broken tarball templates are now replaced by unbroken XML templates.
+    Since this requires patching binary files, a build-depends on sharutils
+    (for uudecode) has been added.
+  * Applied upstream patch so that kspread no longer ignores currency
+    specification in cell formatting (closes: #301943).
+
+ -- Ben Burton <bab@debian.org>  Mon, 25 Apr 2005 23:08:18 +1000
+
 koffice (1:1.3.5-3) unstable; urgency=low
 
@@ -589,7 +600,7 @@
  
   * more upstream fixes
-                      
+
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 01 Jan 2001 17:00:00 -0700
-                    
+
 koffice (2.1-20001218-1) unstable; urgency=low
 

--- koffice/debian/control  #1.120.2.11:1.120.2.12
@@ -3,5 +3,5 @@
 Priority: optional
 Maintainer: Ben Burton <bab@debian.org>
-Build-Depends: automake1.7, debhelper (>= 4.0.0), flex, kdelibs4-dev (>= 4:3.2.0), libaspell-dev, libfontconfig1-dev, libmagick++6-dev, libpaper-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, libpaper-dev, libtiff4-dev, libwv2-dev (>= 0.1.9-0), libxml2-dev, libxslt1-dev, postgresql-dev, python2.3-dev, sharutils
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.6.1

--- koffice/debian/rules  #1.93:1.93.2.1
@@ -62,4 +62,9 @@
         fi
 
+        # Patch binary files that were changed upstream in BRANCH.
+        echo APPLYING BINARY PATCH\: kpresenter-templates.tgz.uu
+        (cd kpresenter/templates/Screen ; uudecode -o /dev/stdout \
+                ../../../debian/patches/kpresenter-templates.tgz.uu | tar -zxf -)
+
         # KDE CVS does not have aclocal.m4 or configure
         # if test ! -f configure; then \




Reply to: