rev 3358 - trunk/packages/koffice/debian/patches

Isaac Clerencia isaac at costa.debian.org
Mon Mar 27 07:42:07 UTC 2006


Author: isaac
Date: 2006-03-27 07:42:03 +0000 (Mon, 27 Mar 2006)
New Revision: 3358

Modified:
   trunk/packages/koffice/debian/patches/98_buildprep.diff
Log:
Update buildprep

Modified: trunk/packages/koffice/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/koffice/debian/patches/98_buildprep.diff	2006-03-27 07:41:17 UTC (rev 3357)
+++ trunk/packages/koffice/debian/patches/98_buildprep.diff	2006-03-27 07:42:03 UTC (rev 3358)
@@ -55,8 +55,8 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=koffice.lsm Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in changes-1.4-beta1 aclocal.m4 Doxyfile.temp configure.in.in Makefile.am acinclude.m4 changes-1.5 Makefile.am.in 
-+KDE_DIST=koffice.lsm stamp-h.in Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in changes-1.4-beta1 aclocal.m4 Doxyfile.temp configure.in.in configure Makefile.am acinclude.m4 changes-1.5 Makefile.am.in 
+-KDE_DIST=koffice.lsm Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in Makefile.cvs changes-1.4-beta1 aclocal.m4 Doxyfile.temp configure.in.in Makefile.am acinclude.m4 changes-1.5 Makefile.am.in 
++KDE_DIST=koffice.lsm stamp-h.in Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in Makefile.cvs changes-1.4-beta1 aclocal.m4 Doxyfile.temp configure.in.in acinclude.m4 configure Makefile.am changes-1.5 Makefile.am.in 
  
  #>+ 2
  docs-am:
@@ -14483,17 +14483,6 @@
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -34278,8 +34103,8 @@
- /* end confdefs.h.  */
- 
-     extern "C" {
--#include <exif-loader.h>
--#include <exif-utils.h>
-+#include <libexif/exif-loader.h>
-+#include <libexif/exif-utils.h>
- }
- 
- int
 @@ -34528,7 +34353,8 @@
    vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
    if test -n "$vers" && test "$vers" -ge 1009
@@ -14918,340 +14907,340 @@
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -48020,7 +47846,7 @@
+@@ -48037,7 +47863,7 @@
  do
    for j in kspell2/broker.h;
    do
--    echo "configure: 48023: $i/$j" >&5
-+    echo "configure: 47849: $i/$j" >&5
+-    echo "configure: 48040: $i/$j" >&5
++    echo "configure: 47866: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ac_kspell2_includes=$i
-@@ -48096,7 +47922,7 @@
+@@ -48113,7 +47939,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 48099: $i/$j" >&5
-+    echo "configure: 47925: $i/$j" >&5
+-    echo "configure: 48116: $i/$j" >&5
++    echo "configure: 47942: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48112,7 +47938,7 @@
+@@ -48129,7 +47955,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 48115: $i/$j" >&5
-+    echo "configure: 47941: $i/$j" >&5
+-    echo "configure: 48132: $i/$j" >&5
++    echo "configure: 47958: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48136,7 +47962,7 @@
+@@ -48153,7 +47979,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 48139: $i/$j" >&5
-+    echo "configure: 47965: $i/$j" >&5
+-    echo "configure: 48156: $i/$j" >&5
++    echo "configure: 47982: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48152,7 +47978,7 @@
+@@ -48169,7 +47995,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 48155: $i/$j" >&5
-+    echo "configure: 47981: $i/$j" >&5
+-    echo "configure: 48172: $i/$j" >&5
++    echo "configure: 47998: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48168,7 +47994,7 @@
+@@ -48185,7 +48011,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 48171: $i/$j" >&5
-+    echo "configure: 47997: $i/$j" >&5
+-    echo "configure: 48188: $i/$j" >&5
++    echo "configure: 48014: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48196,7 +48022,7 @@
+@@ -48213,7 +48039,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 48199: $i/$j" >&5
-+    echo "configure: 48025: $i/$j" >&5
+-    echo "configure: 48216: $i/$j" >&5
++    echo "configure: 48042: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -48240,7 +48066,7 @@
+@@ -48257,7 +48083,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 48243: $i/$j" >&5
-+    echo "configure: 48069: $i/$j" >&5
+-    echo "configure: 48260: $i/$j" >&5
++    echo "configure: 48086: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48256,7 +48082,7 @@
+@@ -48273,7 +48099,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 48259: $i/$j" >&5
-+    echo "configure: 48085: $i/$j" >&5
+-    echo "configure: 48276: $i/$j" >&5
++    echo "configure: 48102: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48280,7 +48106,7 @@
+@@ -48297,7 +48123,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 48283: $i/$j" >&5
-+    echo "configure: 48109: $i/$j" >&5
+-    echo "configure: 48300: $i/$j" >&5
++    echo "configure: 48126: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48296,7 +48122,7 @@
+@@ -48313,7 +48139,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 48299: $i/$j" >&5
-+    echo "configure: 48125: $i/$j" >&5
+-    echo "configure: 48316: $i/$j" >&5
++    echo "configure: 48142: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48312,7 +48138,7 @@
+@@ -48329,7 +48155,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 48315: $i/$j" >&5
-+    echo "configure: 48141: $i/$j" >&5
+-    echo "configure: 48332: $i/$j" >&5
++    echo "configure: 48158: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48340,7 +48166,7 @@
+@@ -48357,7 +48183,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 48343: $i/$j" >&5
-+    echo "configure: 48169: $i/$j" >&5
+-    echo "configure: 48360: $i/$j" >&5
++    echo "configure: 48186: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -48384,7 +48210,7 @@
+@@ -48401,7 +48227,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 48387: $i/$j" >&5
-+    echo "configure: 48213: $i/$j" >&5
+-    echo "configure: 48404: $i/$j" >&5
++    echo "configure: 48230: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48400,7 +48226,7 @@
+@@ -48417,7 +48243,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 48403: $i/$j" >&5
-+    echo "configure: 48229: $i/$j" >&5
+-    echo "configure: 48420: $i/$j" >&5
++    echo "configure: 48246: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48424,7 +48250,7 @@
+@@ -48441,7 +48267,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 48427: $i/$j" >&5
-+    echo "configure: 48253: $i/$j" >&5
+-    echo "configure: 48444: $i/$j" >&5
++    echo "configure: 48270: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48440,7 +48266,7 @@
+@@ -48457,7 +48283,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 48443: $i/$j" >&5
-+    echo "configure: 48269: $i/$j" >&5
+-    echo "configure: 48460: $i/$j" >&5
++    echo "configure: 48286: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48456,7 +48282,7 @@
+@@ -48473,7 +48299,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 48459: $i/$j" >&5
-+    echo "configure: 48285: $i/$j" >&5
+-    echo "configure: 48476: $i/$j" >&5
++    echo "configure: 48302: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48484,7 +48310,7 @@
+@@ -48501,7 +48327,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 48487: $i/$j" >&5
-+    echo "configure: 48313: $i/$j" >&5
+-    echo "configure: 48504: $i/$j" >&5
++    echo "configure: 48330: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -48528,7 +48354,7 @@
+@@ -48545,7 +48371,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 48531: $i/$j" >&5
-+    echo "configure: 48357: $i/$j" >&5
+-    echo "configure: 48548: $i/$j" >&5
++    echo "configure: 48374: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48544,7 +48370,7 @@
+@@ -48561,7 +48387,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 48547: $i/$j" >&5
-+    echo "configure: 48373: $i/$j" >&5
+-    echo "configure: 48564: $i/$j" >&5
++    echo "configure: 48390: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48568,7 +48394,7 @@
+@@ -48585,7 +48411,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 48571: $i/$j" >&5
-+    echo "configure: 48397: $i/$j" >&5
+-    echo "configure: 48588: $i/$j" >&5
++    echo "configure: 48414: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48584,7 +48410,7 @@
+@@ -48601,7 +48427,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 48587: $i/$j" >&5
-+    echo "configure: 48413: $i/$j" >&5
+-    echo "configure: 48604: $i/$j" >&5
++    echo "configure: 48430: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48600,7 +48426,7 @@
+@@ -48617,7 +48443,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 48603: $i/$j" >&5
-+    echo "configure: 48429: $i/$j" >&5
+-    echo "configure: 48620: $i/$j" >&5
++    echo "configure: 48446: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48628,7 +48454,7 @@
+@@ -48645,7 +48471,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 48631: $i/$j" >&5
-+    echo "configure: 48457: $i/$j" >&5
+-    echo "configure: 48648: $i/$j" >&5
++    echo "configure: 48474: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -48672,7 +48498,7 @@
+@@ -48689,7 +48515,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 48675: $i/$j" >&5
-+    echo "configure: 48501: $i/$j" >&5
+-    echo "configure: 48692: $i/$j" >&5
++    echo "configure: 48518: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48688,7 +48514,7 @@
+@@ -48705,7 +48531,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 48691: $i/$j" >&5
-+    echo "configure: 48517: $i/$j" >&5
+-    echo "configure: 48708: $i/$j" >&5
++    echo "configure: 48534: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48712,7 +48538,7 @@
+@@ -48729,7 +48555,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 48715: $i/$j" >&5
-+    echo "configure: 48541: $i/$j" >&5
+-    echo "configure: 48732: $i/$j" >&5
++    echo "configure: 48558: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48728,7 +48554,7 @@
+@@ -48745,7 +48571,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 48731: $i/$j" >&5
-+    echo "configure: 48557: $i/$j" >&5
+-    echo "configure: 48748: $i/$j" >&5
++    echo "configure: 48574: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48744,7 +48570,7 @@
+@@ -48761,7 +48587,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 48747: $i/$j" >&5
-+    echo "configure: 48573: $i/$j" >&5
+-    echo "configure: 48764: $i/$j" >&5
++    echo "configure: 48590: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48772,7 +48598,7 @@
+@@ -48789,7 +48615,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 48775: $i/$j" >&5
-+    echo "configure: 48601: $i/$j" >&5
+-    echo "configure: 48792: $i/$j" >&5
++    echo "configure: 48618: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -48816,7 +48642,7 @@
+@@ -48833,7 +48659,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 48819: $i/$j" >&5
-+    echo "configure: 48645: $i/$j" >&5
+-    echo "configure: 48836: $i/$j" >&5
++    echo "configure: 48662: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48832,7 +48658,7 @@
+@@ -48849,7 +48675,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 48835: $i/$j" >&5
-+    echo "configure: 48661: $i/$j" >&5
+-    echo "configure: 48852: $i/$j" >&5
++    echo "configure: 48678: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48856,7 +48682,7 @@
+@@ -48873,7 +48699,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 48859: $i/$j" >&5
-+    echo "configure: 48685: $i/$j" >&5
+-    echo "configure: 48876: $i/$j" >&5
++    echo "configure: 48702: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48872,7 +48698,7 @@
+@@ -48889,7 +48715,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 48875: $i/$j" >&5
-+    echo "configure: 48701: $i/$j" >&5
+-    echo "configure: 48892: $i/$j" >&5
++    echo "configure: 48718: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48888,7 +48714,7 @@
+@@ -48905,7 +48731,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 48891: $i/$j" >&5
-+    echo "configure: 48717: $i/$j" >&5
+-    echo "configure: 48908: $i/$j" >&5
++    echo "configure: 48734: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48916,7 +48742,7 @@
+@@ -48933,7 +48759,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 48919: $i/$j" >&5
-+    echo "configure: 48745: $i/$j" >&5
+-    echo "configure: 48936: $i/$j" >&5
++    echo "configure: 48762: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -58434,6 +58260,13 @@
+@@ -58453,6 +58279,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -15265,7 +15254,7 @@
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -60005,6 +59838,9 @@
+@@ -60025,6 +59858,9 @@
  s, at AMTAR@,$AMTAR,;t t
  s, at am__tar@,$am__tar,;t t
  s, at am__untar@,$am__untar,;t t
@@ -15279,24 +15268,13 @@
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(koffice, "1.4.95") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(koffice, "1.4.98") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
  KDE_SET_PREFIX
  
  dnl generate the config header
-@@ -378,8 +380,8 @@
- [
-     AC_TRY_COMPILE([
-     extern "C" {
--#include <exif-loader.h>
--#include <exif-utils.h>
-+#include <libexif/exif-loader.h>
-+#include <libexif/exif-utils.h>
- }
-     ],[
-         ExifLoader *l = exif_loader_new ();
 @@ -431,7 +433,8 @@
    vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
    if test -n "$vers" && test "$vers" -ge 1009
@@ -18418,7 +18396,7 @@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -313,6 +311,9 @@
+@@ -315,6 +313,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18428,7 +18406,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -653,7 +654,7 @@
+@@ -656,7 +657,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -18437,7 +18415,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -691,9 +692,9 @@
+@@ -694,9 +695,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29247,6 +29225,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -808,9 +811,9 @@
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-edit_picture.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/edit_picture.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-webpres.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/webpres.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-line_end.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/line_end.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-pie.png $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/pie.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-slide_effect.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/slide_effect.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-circle.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/circle.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-pie.png $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/pie.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-closed_cubicbeziercurve.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/closed_cubicbeziercurve.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-freehand.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/freehand.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-pgnum.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/pgnum.png
+@@ -935,9 +938,9 @@
+ 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/edit_picture.png
+ 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/webpres.png
+ 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/line_end.png
++	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/pie.png
+ 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/slide_effect.png
+ 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/circle.png
+-	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/pie.png
+ 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/closed_cubicbeziercurve.png
+ 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/freehand.png
+ 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/pgnum.png
 --- krita/Makefile.in
 +++ krita/Makefile.in
 @@ -1,4 +1,4 @@
@@ -30299,7 +30299,7 @@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -335,6 +333,9 @@
+@@ -341,6 +339,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30309,7 +30309,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -686,7 +687,7 @@
+@@ -692,7 +693,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -30318,7 +30318,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -724,9 +725,9 @@
+@@ -730,9 +731,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31026,7 +31026,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -549,7 +552,7 @@
+@@ -548,7 +551,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -31035,7 +31035,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -587,9 +590,9 @@
+@@ -586,9 +589,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32391,7 +32391,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -550,7 +553,7 @@
+@@ -551,7 +554,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -32400,7 +32400,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -588,9 +591,9 @@
+@@ -589,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33170,7 +33170,7 @@
  # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
  # @configure_input@
  
-@@ -244,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33180,7 +33180,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -546,7 +549,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -33189,7 +33189,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -584,9 +587,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34050,12 +34050,12 @@
  @SET_MAKE@
  
  
--SOURCES = $(libtests_la_SOURCES)
+-SOURCES = $(libtests_la_SOURCES) $(formulatest_SOURCES)
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -273,6 +271,9 @@
+@@ -279,6 +277,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34065,7 +34065,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -583,7 +584,7 @@
+@@ -592,7 +593,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -34074,7 +34074,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +622,9 @@
+@@ -630,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35476,6 +35476,45 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+--- lib/kformula/fonts/Makefile.in
++++ lib/kformula/fonts/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+@@ -243,6 +243,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -530,7 +533,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -568,9 +571,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- lib/kformula/pics/Makefile.in
 +++ lib/kformula/pics/Makefile.in
 @@ -1,4 +1,4 @@
@@ -36178,7 +36217,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -585,7 +586,7 @@
+@@ -586,7 +587,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36187,7 +36226,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +624,9 @@
+@@ -624,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  




More information about the pkg-kde-commits mailing list