SOURCES (AC-branch): scribus-module-fixes.patch - up to 1.2.5

deejay1 deejay1 at pld-linux.org
Mon Jul 17 19:50:46 CEST 2006


Author: deejay1                      Date: Mon Jul 17 17:50:46 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- up to 1.2.5

---- Files affected:
SOURCES:
   scribus-module-fixes.patch (1.3.2.2 -> 1.3.2.3) 

---- Diffs:

================================================================
Index: SOURCES/scribus-module-fixes.patch
diff -u SOURCES/scribus-module-fixes.patch:1.3.2.2 SOURCES/scribus-module-fixes.patch:1.3.2.3
--- SOURCES/scribus-module-fixes.patch:1.3.2.2	Wed Jan  4 15:25:02 2006
+++ SOURCES/scribus-module-fixes.patch	Mon Jul 17 19:50:41 2006
@@ -1,6 +1,6 @@
-diff -Nur scribus-1.2.4/scribus/libabout/Makefile.am scribus-1.2.4-module_fixes/scribus/libabout/Makefile.am
---- scribus-1.2.4/scribus/libabout/Makefile.am	2004-12-11 22:53:41.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/libabout/Makefile.am	2006-01-04 15:15:55.000000000 +0100
+diff -ur scribus-1.2.5/scribus/libabout/Makefile.am scribus-1.2.5-nolibs/scribus/libabout/Makefile.am
+--- scribus-1.2.5/scribus/libabout/Makefile.am	2006-03-29 21:28:17.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/libabout/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -3,7 +3,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -10,9 +10,9 @@
  
  libabout_la_METASOURCES = AUTO
  
-diff -Nur scribus-1.2.4/scribus/libpdf/Makefile.am scribus-1.2.4-module_fixes/scribus/libpdf/Makefile.am
---- scribus-1.2.4/scribus/libpdf/Makefile.am	2004-12-11 22:53:41.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/libpdf/Makefile.am	2006-01-04 15:15:55.000000000 +0100
+diff -ur scribus-1.2.5/scribus/libpdf/Makefile.am scribus-1.2.5-nolibs/scribus/libpdf/Makefile.am
+--- scribus-1.2.5/scribus/libpdf/Makefile.am	2006-03-29 21:28:17.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/libpdf/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -4,7 +4,7 @@
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
  
@@ -22,9 +22,9 @@
  
  libpdf_la_METASOURCES = AUTO
  
-diff -Nur scribus-1.2.4/scribus/libpostscript/Makefile.am scribus-1.2.4-module_fixes/scribus/libpostscript/Makefile.am
---- scribus-1.2.4/scribus/libpostscript/Makefile.am	2004-12-11 22:53:41.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/libpostscript/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/libpostscript/Makefile.am scribus-1.2.5-nolibs/scribus/libpostscript/Makefile.am
+--- scribus-1.2.5/scribus/libpostscript/Makefile.am	2006-03-29 21:28:18.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/libpostscript/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -3,7 +3,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -34,9 +34,9 @@
  
  libpostscript_la_METASOURCES = AUTO
  
-diff -Nur scribus-1.2.4/scribus/libprefs/Makefile.am scribus-1.2.4-module_fixes/scribus/libprefs/Makefile.am
---- scribus-1.2.4/scribus/libprefs/Makefile.am	2004-12-11 22:53:41.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/libprefs/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/libprefs/Makefile.am scribus-1.2.5-nolibs/scribus/libprefs/Makefile.am
+--- scribus-1.2.5/scribus/libprefs/Makefile.am	2006-03-29 21:28:18.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/libprefs/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -3,7 +3,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -46,9 +46,9 @@
  
  libpreferences_la_METASOURCES = AUTO
  
-diff -Nur scribus-1.2.4/scribus/plugins/fileloader/oodraw/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/fileloader/oodraw/Makefile.am
---- scribus-1.2.4/scribus/plugins/fileloader/oodraw/Makefile.am	2005-03-03 17:52:44.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/fileloader/oodraw/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/fileloader/oodraw/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/fileloader/oodraw/Makefile.am
+--- scribus-1.2.5/scribus/plugins/fileloader/oodraw/Makefile.am	2006-03-29 21:28:21.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/fileloader/oodraw/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -6,7 +6,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -58,9 +58,9 @@
  liboodrawimp_la_METASOURCES = AUTO
  liboodrawimp_la_SOURCES = oodrawimp.cpp stylestack.cpp
  
-diff -Nur scribus-1.2.4/scribus/plugins/fontpreview/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/fontpreview/Makefile.am
---- scribus-1.2.4/scribus/plugins/fontpreview/Makefile.am	2004-12-11 22:53:42.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/fontpreview/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/fontpreview/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/fontpreview/Makefile.am
+--- scribus-1.2.5/scribus/plugins/fontpreview/Makefile.am	2006-03-29 21:28:21.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/fontpreview/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -4,7 +4,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -70,9 +70,9 @@
  libfontpreview_la_METASOURCES = AUTO
  libfontpreview_la_SOURCES = ui.cpp fontpreview.cpp
  
-diff -Nur scribus-1.2.4/scribus/plugins/gettext/csvim/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/gettext/csvim/Makefile.am
---- scribus-1.2.4/scribus/plugins/gettext/csvim/Makefile.am	2004-12-11 22:53:42.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/gettext/csvim/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/gettext/csvim/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/gettext/csvim/Makefile.am
+--- scribus-1.2.5/scribus/plugins/gettext/csvim/Makefile.am	2006-03-29 21:28:22.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/gettext/csvim/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -6,7 +6,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -82,9 +82,21 @@
  libcsvim_la_METASOURCES = AUTO
  libcsvim_la_SOURCES = csvdia.cpp csvim.cpp
  
-diff -Nur scribus-1.2.4/scribus/plugins/gettext/htmlim/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/gettext/htmlim/Makefile.am
---- scribus-1.2.4/scribus/plugins/gettext/htmlim/Makefile.am	2005-01-11 23:21:25.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/gettext/htmlim/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/gettext/docim/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/gettext/docim/Makefile.am
+--- scribus-1.2.5/scribus/plugins/gettext/docim/Makefile.am	2006-04-09 22:04:02.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/gettext/docim/Makefile.am	2006-07-17 17:48:21.000000000 +0000
+@@ -6,7 +6,7 @@
+ 
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+ 
+-libdocim_la_LDFLAGS = -version-info 0:0:0
++libdocim_la_LDFLAGS = -avoid-version
+ libdocim_la_METASOURCES = AUTO
+ libdocim_la_SOURCES = docim.cpp 
+ 
+diff -ur scribus-1.2.5/scribus/plugins/gettext/htmlim/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/gettext/htmlim/Makefile.am
+--- scribus-1.2.5/scribus/plugins/gettext/htmlim/Makefile.am	2006-03-29 21:28:22.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/gettext/htmlim/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -6,7 +6,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes)
@@ -94,9 +106,9 @@
  libhtmlim_la_METASOURCES = AUTO
  libhtmlim_la_SOURCES = htmlim.cpp htmlreader.cpp 
  
-diff -Nur scribus-1.2.4/scribus/plugins/gettext/odtim/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/gettext/odtim/Makefile.am
---- scribus-1.2.4/scribus/plugins/gettext/odtim/Makefile.am	2005-03-03 18:02:43.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/gettext/odtim/Makefile.am	2006-01-04 15:18:44.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/gettext/odtim/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/gettext/odtim/Makefile.am
+--- scribus-1.2.5/scribus/plugins/gettext/odtim/Makefile.am	2006-03-29 21:28:25.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/gettext/odtim/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -6,7 +6,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes)
@@ -106,9 +118,9 @@
  libodtimplugin_la_METASOURCES = AUTO
  libodtimplugin_la_SOURCES = odtim.cpp odtdia.cpp stylereader.cpp contentreader.cpp
  
-diff -Nur scribus-1.2.4/scribus/plugins/gettext/sxwim/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/gettext/sxwim/Makefile.am
---- scribus-1.2.4/scribus/plugins/gettext/sxwim/Makefile.am	2005-03-03 17:44:46.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/gettext/sxwim/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/gettext/sxwim/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/gettext/sxwim/Makefile.am
+--- scribus-1.2.5/scribus/plugins/gettext/sxwim/Makefile.am	2006-03-29 21:28:26.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/gettext/sxwim/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -6,7 +6,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes)
@@ -118,9 +130,9 @@
  libsxwimplugin_la_METASOURCES = AUTO
  libsxwimplugin_la_SOURCES = sxwim.cpp sxwdia.cpp stylereader.cpp contentreader.cpp
  
-diff -Nur scribus-1.2.4/scribus/plugins/gettext/textfilter/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/gettext/textfilter/Makefile.am
---- scribus-1.2.4/scribus/plugins/gettext/textfilter/Makefile.am	2004-12-11 22:53:42.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/gettext/textfilter/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/gettext/textfilter/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/gettext/textfilter/Makefile.am
+--- scribus-1.2.5/scribus/plugins/gettext/textfilter/Makefile.am	2006-03-29 21:28:26.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/gettext/textfilter/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -6,7 +6,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -130,9 +142,9 @@
  libtextfilterplugin_la_METASOURCES = AUTO
  libtextfilterplugin_la_SOURCES = textfilter.cpp tfdia.cpp tffilter.cpp
  
-diff -Nur scribus-1.2.4/scribus/plugins/gettext/txtim/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/gettext/txtim/Makefile.am
---- scribus-1.2.4/scribus/plugins/gettext/txtim/Makefile.am	2004-12-11 22:53:42.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/gettext/txtim/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/gettext/txtim/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/gettext/txtim/Makefile.am
+--- scribus-1.2.5/scribus/plugins/gettext/txtim/Makefile.am	2006-03-29 21:28:27.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/gettext/txtim/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -6,7 +6,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -142,9 +154,9 @@
  libtxtim_la_METASOURCES = AUTO
  libtxtim_la_SOURCES = txtim.cpp 
  
-diff -Nur scribus-1.2.4/scribus/plugins/libchar/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/libchar/Makefile.am
---- scribus-1.2.4/scribus/plugins/libchar/Makefile.am	2004-12-11 22:53:42.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/libchar/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/libchar/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/libchar/Makefile.am
+--- scribus-1.2.5/scribus/plugins/libchar/Makefile.am	2006-03-29 21:28:27.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/libchar/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -3,7 +3,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -154,9 +166,9 @@
  
  libcharselect_la_METASOURCES = AUTO
  
-diff -Nur scribus-1.2.4/scribus/plugins/newfromtemplateplugin/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/newfromtemplateplugin/Makefile.am
---- scribus-1.2.4/scribus/plugins/newfromtemplateplugin/Makefile.am	2004-12-11 22:53:42.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/newfromtemplateplugin/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/newfromtemplateplugin/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/newfromtemplateplugin/Makefile.am
+--- scribus-1.2.5/scribus/plugins/newfromtemplateplugin/Makefile.am	2006-03-29 21:28:28.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/newfromtemplateplugin/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -6,7 +6,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -166,9 +178,9 @@
  libnewfromtemplateplugin_la_METASOURCES = AUTO
  libnewfromtemplateplugin_la_SOURCES = nftemplate.cpp nftdialog.cpp nftrcreader.cpp nftsettings.cpp nfttemplate.cpp
  
-diff -Nur scribus-1.2.4/scribus/plugins/pixmapexport/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/pixmapexport/Makefile.am
---- scribus-1.2.4/scribus/plugins/pixmapexport/Makefile.am	2004-12-11 22:53:42.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/pixmapexport/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/pixmapexport/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/pixmapexport/Makefile.am
+--- scribus-1.2.5/scribus/plugins/pixmapexport/Makefile.am	2006-03-29 21:28:28.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/pixmapexport/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -6,7 +6,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -178,9 +190,9 @@
  libscribusexportpixmap_la_METASOURCES = AUTO
  libscribusexportpixmap_la_SOURCES = export.cpp dialog.cpp
  
-diff -Nur scribus-1.2.4/scribus/plugins/printpreview/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/printpreview/Makefile.am
---- scribus-1.2.4/scribus/plugins/printpreview/Makefile.am	2004-12-11 22:53:42.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/printpreview/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/printpreview/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/printpreview/Makefile.am
+--- scribus-1.2.5/scribus/plugins/printpreview/Makefile.am	2006-03-29 21:28:29.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/printpreview/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -3,7 +3,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -190,9 +202,9 @@
  
  libpreview_la_METASOURCES = AUTO
  
-diff -Nur scribus-1.2.4/scribus/plugins/psimport/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/psimport/Makefile.am
---- scribus-1.2.4/scribus/plugins/psimport/Makefile.am	2004-12-11 22:53:42.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/psimport/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/psimport/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/psimport/Makefile.am
+--- scribus-1.2.5/scribus/plugins/psimport/Makefile.am	2006-03-29 21:28:29.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/psimport/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -6,7 +6,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -202,9 +214,9 @@
  libimportps_la_METASOURCES = AUTO
  libimportps_la_SOURCES = importps.cpp
  
-diff -Nur scribus-1.2.4/scribus/plugins/saveastemplateplugin/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/saveastemplateplugin/Makefile.am
---- scribus-1.2.4/scribus/plugins/saveastemplateplugin/Makefile.am	2004-12-11 22:53:42.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/saveastemplateplugin/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/saveastemplateplugin/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/saveastemplateplugin/Makefile.am
+--- scribus-1.2.5/scribus/plugins/saveastemplateplugin/Makefile.am	2006-03-29 21:28:29.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/saveastemplateplugin/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -6,7 +6,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -214,9 +226,9 @@
  libsaveastemplateplugin_la_METASOURCES = AUTO
  libsaveastemplateplugin_la_SOURCES = satemplate.cpp satdialog.cpp 
  
-diff -Nur scribus-1.2.4/scribus/plugins/scriptplugin/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/scriptplugin/Makefile.am
---- scribus-1.2.4/scribus/plugins/scriptplugin/Makefile.am	2005-02-08 14:54:31.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/scriptplugin/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/scriptplugin/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/scriptplugin/Makefile.am
+--- scribus-1.2.5/scribus/plugins/scriptplugin/Makefile.am	2006-03-29 21:28:29.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/scriptplugin/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -6,7 +6,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -226,9 +238,9 @@
  libscriptplugin_la_METASOURCES = AUTO
  libscriptplugin_la_SOURCES = valuedialog.cpp cmdutil.cpp cmddialog.cpp cmddoc.cpp cmdpage.cpp cmdobj.cpp cmdgetprop.cpp cmdsetprop.cpp cmdtext.cpp cmdmani.cpp cmdcolor.cpp cmdmisc.cpp objprinter.cpp objpdffile.cpp extmacro.cpp guiapp.cpp conswin.cpp pconsole.cpp scripterprefs.ui managemacrosdialog.ui editmacrodialog.ui macro.cpp macromanager.cpp scriptplugin.cpp objimageexport.cpp scriptercore.cpp
  
-diff -Nur scribus-1.2.4/scribus/plugins/short-words/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/short-words/Makefile.am
---- scribus-1.2.4/scribus/plugins/short-words/Makefile.am	2005-02-10 19:48:35.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/short-words/Makefile.am	2006-01-04 15:19:45.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/short-words/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/short-words/Makefile.am
+--- scribus-1.2.5/scribus/plugins/short-words/Makefile.am	2006-03-29 21:28:29.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/short-words/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -4,7 +4,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
@@ -238,9 +250,9 @@
  libscribusshortwords_la_METASOURCES = AUTO
  libscribusshortwords_la_SOURCES = vlnadialog.cpp parse.cpp shortwords.cpp configuration.cpp version.h
  
-diff -Nur scribus-1.2.4/scribus/plugins/svgexplugin/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/svgexplugin/Makefile.am
---- scribus-1.2.4/scribus/plugins/svgexplugin/Makefile.am	2004-12-11 22:53:43.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/svgexplugin/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/svgexplugin/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/svgexplugin/Makefile.am
+--- scribus-1.2.5/scribus/plugins/svgexplugin/Makefile.am	2006-03-29 21:28:30.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/svgexplugin/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -11,7 +11,7 @@
  endif
  AM_LDFLAGS =  $(linkflag) $(LIBFREETYPE_LIBS)
@@ -250,9 +262,9 @@
  libsvgexplugin_la_METASOURCES = AUTO
  libsvgexplugin_la_SOURCES = svgexplugin.cpp 
  
-diff -Nur scribus-1.2.4/scribus/plugins/svgimplugin/Makefile.am scribus-1.2.4-module_fixes/scribus/plugins/svgimplugin/Makefile.am
---- scribus-1.2.4/scribus/plugins/svgimplugin/Makefile.am	2004-12-11 22:53:43.000000000 +0100
-+++ scribus-1.2.4-module_fixes/scribus/plugins/svgimplugin/Makefile.am	2006-01-04 15:15:56.000000000 +0100
+diff -ur scribus-1.2.5/scribus/plugins/svgimplugin/Makefile.am scribus-1.2.5-nolibs/scribus/plugins/svgimplugin/Makefile.am
+--- scribus-1.2.5/scribus/plugins/svgimplugin/Makefile.am	2006-03-29 21:28:30.000000000 +0000
++++ scribus-1.2.5-nolibs/scribus/plugins/svgimplugin/Makefile.am	2006-07-17 17:47:00.000000000 +0000
 @@ -12,7 +12,7 @@
  
  AM_LDFLAGS =  $(linkflag) $(LIBFREETYPE_LIBS)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/scribus-module-fixes.patch?r1=1.3.2.2&r2=1.3.2.3&f=u



More information about the pld-cvs-commit mailing list