- updated

Changed files:
    scribus-module-fixes.patch -> 1.4

diff --git a/scribus-module-fixes.patch b/scribus-module-fixes.patch
index 3460962e5a412ec461a916b708e9a55d721d7182..dd84d09522779ead51c6c7baca6d437cab0a0d68 100644 (file)
--- a/scribus-module-fixes.patch
+++ b/scribus-module-fixes.patch
@@ -1,20 +1,20 @@
-diff -Nur scribus-0.9.7/scribus/libabout/Makefile.am scribus-0.9.7-patch/scribus/libabout/Makefile.am
---- scribus-0.9.7/scribus/libabout/Makefile.am Sat Feb  8 09:42:42 2003
-+++ scribus-0.9.7-patch/scribus/libabout/Makefile.am   Fri Mar 14 14:34:19 2003
-@@ -9,7 +9,7 @@
- LDFLAGS =  -s                    -export-dynamic 
+diff -Nur scribus-1.2.1/scribus/libabout/Makefile.am scribus-1.2.1-module/scribus/libabout/Makefile.am
+--- scribus-1.2.1/scribus/libabout/Makefile.am 2004-12-11 22:53:41.000000000 +0100
++++ scribus-1.2.1-module/scribus/libabout/Makefile.am  2004-12-21 17:43:12.000000000 +0100
+@@ -3,7 +3,7 @@
  
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
  
 -libabout_la_LDFLAGS = -version-info 0:0:0
 +libabout_la_LDFLAGS = -avoid-version
  
  libabout_la_METASOURCES = AUTO
  
-diff -Nur scribus-0.9.7/scribus/libpdf/Makefile.am scribus-0.9.7-patch/scribus/libpdf/Makefile.am
---- scribus-0.9.7/scribus/libpdf/Makefile.am   Sat Feb  8 09:42:42 2003
-+++ scribus-0.9.7-patch/scribus/libpdf/Makefile.am     Fri Mar 14 14:34:06 2003
-@@ -10,7 +10,7 @@
- LDFLAGS =  -s                    -export-dynamic 
+diff -Nur scribus-1.2.1/scribus/libpdf/Makefile.am scribus-1.2.1-module/scribus/libpdf/Makefile.am
+--- scribus-1.2.1/scribus/libpdf/Makefile.am   2004-12-11 22:53:41.000000000 +0100
++++ scribus-1.2.1-module/scribus/libpdf/Makefile.am    2004-12-21 17:42:55.000000000 +0100
+@@ -4,7 +4,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
  
  
 -libpdf_la_LDFLAGS = -version-info 0:0:0
@@ -22,66 +22,154 @@ diff -Nur scribus-0.9.7/scribus/libpdf/Makefile.am scribus-0.9.7-patch/scribus/l
  
  libpdf_la_METASOURCES = AUTO
  
-diff -Nur scribus-0.9.7/scribus/libpostscript/Makefile.am scribus-0.9.7-patch/scribus/libpostscript/Makefile.am
---- scribus-0.9.7/scribus/libpostscript/Makefile.am    Sat Feb  8 09:42:42 2003
-+++ scribus-0.9.7-patch/scribus/libpostscript/Makefile.am      Fri Mar 14 14:33:50 2003
-@@ -10,7 +10,7 @@
- LDFLAGS =  -s                    -export-dynamic 
+diff -Nur scribus-1.2.1/scribus/libpostscript/Makefile.am scribus-1.2.1-module/scribus/libpostscript/Makefile.am
+--- scribus-1.2.1/scribus/libpostscript/Makefile.am    2004-12-11 22:53:41.000000000 +0100
++++ scribus-1.2.1-module/scribus/libpostscript/Makefile.am     2004-12-21 17:42:41.000000000 +0100
+@@ -3,7 +3,7 @@
  
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
  
 -libpostscript_la_LDFLAGS = -version-info 0:0:0
 +libpostscript_la_LDFLAGS = -avoid-version
  
  libpostscript_la_METASOURCES = AUTO
  
-diff -Nur scribus-0.9.7/scribus/libprefs/Makefile.am scribus-0.9.7-patch/scribus/libprefs/Makefile.am
---- scribus-0.9.7/scribus/libprefs/Makefile.am Sat Feb  8 09:42:42 2003
-+++ scribus-0.9.7-patch/scribus/libprefs/Makefile.am   Fri Mar 14 14:34:32 2003
-@@ -10,7 +10,7 @@
- LDFLAGS =  -s                    -export-dynamic 
+diff -Nur scribus-1.2.1/scribus/libprefs/Makefile.am scribus-1.2.1-module/scribus/libprefs/Makefile.am
+--- scribus-1.2.1/scribus/libprefs/Makefile.am 2004-12-11 22:53:41.000000000 +0100
++++ scribus-1.2.1-module/scribus/libprefs/Makefile.am  2004-12-21 17:42:28.000000000 +0100
+@@ -3,7 +3,7 @@
  
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
  
 -libpreferences_la_LDFLAGS = -version-info 0:0:0
 +libpreferences_la_LDFLAGS = -avoid-version
  
  libpreferences_la_METASOURCES = AUTO
  
---- scribus-1.1.2/scribus/plugins/libchar/Makefile.am.orig     Thu Jun 19 12:53:49 2003
-+++ scribus-1.1.2/scribus/plugins/libchar/Makefile.am  Tue Nov  4 11:47:35 2003
+diff -Nur scribus-1.2.1/scribus/plugins/fileloader/oodraw/Makefile.am scribus-1.2.1-module/scribus/plugins/fileloader/oodraw/Makefile.am
+--- scribus-1.2.1/scribus/plugins/fileloader/oodraw/Makefile.am        2004-12-11 23:53:34.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/fileloader/oodraw/Makefile.am 2004-12-21 17:41:35.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+ 
+-liboodrawimp_la_LDFLAGS = -version-info 0:0:0
++liboodrawimp_la_LDFLAGS = -avoid-version
+ liboodrawimp_la_METASOURCES = AUTO
+ liboodrawimp_la_SOURCES = oodrawimp.cpp stylestack.cpp sxwunzip.cpp unzip.c ioapi.c
+ 
+diff -Nur scribus-1.2.1/scribus/plugins/fontpreview/Makefile.am scribus-1.2.1-module/scribus/plugins/fontpreview/Makefile.am
+--- scribus-1.2.1/scribus/plugins/fontpreview/Makefile.am      2004-12-11 22:53:42.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/fontpreview/Makefile.am       2004-12-21 17:41:24.000000000 +0100
 @@ -4,7 +4,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
  
+-libfontpreview_la_LDFLAGS = -version-info 0:0:0
++libfontpreview_la_LDFLAGS = -avoid-version
+ libfontpreview_la_METASOURCES = AUTO
+ libfontpreview_la_SOURCES = ui.cpp fontpreview.cpp
+ 
+diff -Nur scribus-1.2.1/scribus/plugins/gettext/csvim/Makefile.am scribus-1.2.1-module/scribus/plugins/gettext/csvim/Makefile.am
+--- scribus-1.2.1/scribus/plugins/gettext/csvim/Makefile.am    2004-12-11 22:53:42.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/gettext/csvim/Makefile.am     2004-12-21 17:41:15.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+ 
+-libcsvim_la_LDFLAGS = -version-info 0:0:0
++libcsvim_la_LDFLAGS = -avoid-version
+ libcsvim_la_METASOURCES = AUTO
+ libcsvim_la_SOURCES = csvdia.cpp csvim.cpp
+ 
+diff -Nur scribus-1.2.1/scribus/plugins/gettext/htmlim/Makefile.am scribus-1.2.1-module/scribus/plugins/gettext/htmlim/Makefile.am
+--- scribus-1.2.1/scribus/plugins/gettext/htmlim/Makefile.am   2004-12-11 22:53:42.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/gettext/htmlim/Makefile.am    2004-12-21 17:41:07.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes)
+ 
+-libhtmlim_la_LDFLAGS = -version-info 0:0:0
++libhtmlim_la_LDFLAGS = -avoid-version
+ libhtmlim_la_METASOURCES = AUTO
+ libhtmlim_la_SOURCES = htmlim.cpp htmlreader.cpp 
+ 
+diff -Nur scribus-1.2.1/scribus/plugins/gettext/sxwim/Makefile.am scribus-1.2.1-module/scribus/plugins/gettext/sxwim/Makefile.am
+--- scribus-1.2.1/scribus/plugins/gettext/sxwim/Makefile.am    2004-12-11 22:53:42.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/gettext/sxwim/Makefile.am     2004-12-21 17:40:59.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes)
+ 
+-libsxwimplugin_la_LDFLAGS = -version-info 0:0:0
++libsxwimplugin_la_LDFLAGS = -avoid-version
+ libsxwimplugin_la_METASOURCES = AUTO
+ libsxwimplugin_la_SOURCES = sxwim.cpp sxwunzip.cpp sxwdia.cpp stylereader.cpp contentreader.cpp unzip.c ioapi.c
+ 
+diff -Nur scribus-1.2.1/scribus/plugins/gettext/textfilter/Makefile.am scribus-1.2.1-module/scribus/plugins/gettext/textfilter/Makefile.am
+--- scribus-1.2.1/scribus/plugins/gettext/textfilter/Makefile.am       2004-12-11 22:53:42.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/gettext/textfilter/Makefile.am        2004-12-21 17:40:52.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+ 
+-libtextfilterplugin_la_LDFLAGS = -version-info 0:0:0
++libtextfilterplugin_la_LDFLAGS = -avoid-version
+ libtextfilterplugin_la_METASOURCES = AUTO
+ libtextfilterplugin_la_SOURCES = textfilter.cpp tfdia.cpp tffilter.cpp
+ 
+diff -Nur scribus-1.2.1/scribus/plugins/gettext/txtim/Makefile.am scribus-1.2.1-module/scribus/plugins/gettext/txtim/Makefile.am
+--- scribus-1.2.1/scribus/plugins/gettext/txtim/Makefile.am    2004-12-11 22:53:42.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/gettext/txtim/Makefile.am     2004-12-21 17:40:44.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+ 
+-libtxtim_la_LDFLAGS = -version-info 0:0:0
++libtxtim_la_LDFLAGS = -avoid-version
+ libtxtim_la_METASOURCES = AUTO
+ libtxtim_la_SOURCES = txtim.cpp 
+ 
+diff -Nur scribus-1.2.1/scribus/plugins/libchar/Makefile.am scribus-1.2.1-module/scribus/plugins/libchar/Makefile.am
+--- scribus-1.2.1/scribus/plugins/libchar/Makefile.am  2004-12-11 22:53:42.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/libchar/Makefile.am   2004-12-21 17:40:14.000000000 +0100
+@@ -3,7 +3,7 @@
+ 
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+ 
 -libcharselect_la_LDFLAGS = -version-info 0:0:0
 +libcharselect_la_LDFLAGS = -avoid-version
  
  libcharselect_la_METASOURCES = AUTO
  
---- scribus-1.1.2/scribus/plugins/svgexplugin/Makefile.am.orig Thu Jun 19 12:53:49 2003
-+++ scribus-1.1.2/scribus/plugins/svgexplugin/Makefile.am      Tue Nov  4 12:05:50 2003
-@@ -3,7 +3,7 @@
- plugins_LTLIBRARIES = libsvgexplugin.la
+diff -Nur scribus-1.2.1/scribus/plugins/newfromtemplateplugin/Makefile.am scribus-1.2.1-module/scribus/plugins/newfromtemplateplugin/Makefile.am
+--- scribus-1.2.1/scribus/plugins/newfromtemplateplugin/Makefile.am    2004-12-11 22:53:42.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/newfromtemplateplugin/Makefile.am     2004-12-21 17:39:57.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
- AM_LDFLAGS =  -s $(LIBFREETYPE_LIBS)      
--libsvgexplugin_la_LDFLAGS = -version-info 0:0:0
-+libsvgexplugin_la_LDFLAGS = -avoid-version
- libsvgexplugin_la_METASOURCES = AUTO
- libsvgexplugin_la_SOURCES = svgexplugin.cpp 
- KDE_OPTIONS = qtonly
---- scribus-1.1.2/scribus/plugins/svgimplugin/Makefile.am.orig Fri Aug 15 13:14:10 2003
-+++ scribus-1.1.2/scribus/plugins/svgimplugin/Makefile.am      Tue Nov  4 12:06:09 2003
-@@ -3,7 +3,7 @@
- plugins_LTLIBRARIES = libsvgimplugin.la
+ 
+-libnewfromtemplateplugin_la_LDFLAGS = -version-info 0:0:0
++libnewfromtemplateplugin_la_LDFLAGS = -avoid-version
+ libnewfromtemplateplugin_la_METASOURCES = AUTO
+ libnewfromtemplateplugin_la_SOURCES = nftemplate.cpp nftdialog.cpp nftrcreader.cpp nftsettings.cpp nfttemplate.cpp
+ 
+diff -Nur scribus-1.2.1/scribus/plugins/pixmapexport/Makefile.am scribus-1.2.1-module/scribus/plugins/pixmapexport/Makefile.am
+--- scribus-1.2.1/scribus/plugins/pixmapexport/Makefile.am     2004-12-11 22:53:42.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/pixmapexport/Makefile.am      2004-12-21 17:39:48.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
- AM_LDFLAGS =  -s $(LIBFREETYPE_LIBS)      
--libsvgimplugin_la_LDFLAGS = -version-info 0:0:0
-+libsvgimplugin_la_LDFLAGS = -avoid-version
- libsvgimplugin_la_METASOURCES = AUTO
- libsvgimplugin_la_SOURCES = svgplugin.cpp 
- KDE_OPTIONS = qtonly
---- scribus-1.1.2/scribus/plugins/printpreview/Makefile.am.orig        Thu Jun 19 12:53:49 2003
-+++ scribus-1.1.2/scribus/plugins/printpreview/Makefile.am     Tue Nov  4 12:05:02 2003
-@@ -4,7 +4,7 @@
+ 
+-libscribusexportpixmap_la_LDFLAGS = -version-info 0:0:0
++libscribusexportpixmap_la_LDFLAGS = -avoid-version
+ libscribusexportpixmap_la_METASOURCES = AUTO
+ libscribusexportpixmap_la_SOURCES = export.cpp dialog.cpp
+ 
+diff -Nur scribus-1.2.1/scribus/plugins/printpreview/Makefile.am scribus-1.2.1-module/scribus/plugins/printpreview/Makefile.am
+--- scribus-1.2.1/scribus/plugins/printpreview/Makefile.am     2004-12-11 22:53:42.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/printpreview/Makefile.am      2004-12-21 17:39:37.000000000 +0100
+@@ -3,7 +3,7 @@
  
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
  
@@ -90,14 +178,63 @@ diff -Nur scribus-0.9.7/scribus/libprefs/Makefile.am scribus-0.9.7-patch/scribus
  
  libpreview_la_METASOURCES = AUTO
  
---- scribus-1.1.2/scribus/plugins/scriptplugin/Makefile.am.orig        Mon Oct 20 21:40:21 2003
-+++ scribus-1.1.2/scribus/plugins/scriptplugin/Makefile.am     Tue Nov  4 12:05:24 2003
-@@ -3,7 +3,7 @@
- AM_CPPFLAGS = -I$(top_builddir)/scribus $(PYTHONINC)
- plugins_LTLIBRARIES = libscriptplugin.la
+diff -Nur scribus-1.2.1/scribus/plugins/psimport/Makefile.am scribus-1.2.1-module/scribus/plugins/psimport/Makefile.am
+--- scribus-1.2.1/scribus/plugins/psimport/Makefile.am 2004-12-11 22:53:42.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/psimport/Makefile.am  2004-12-21 17:39:11.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+ 
+-libimportps_la_LDFLAGS = -version-info 0:0:0
++libimportps_la_LDFLAGS = -avoid-version
+ libimportps_la_METASOURCES = AUTO
+ libimportps_la_SOURCES = importps.cpp
+ 
+diff -Nur scribus-1.2.1/scribus/plugins/saveastemplateplugin/Makefile.am scribus-1.2.1-module/scribus/plugins/saveastemplateplugin/Makefile.am
+--- scribus-1.2.1/scribus/plugins/saveastemplateplugin/Makefile.am     2004-12-11 22:53:42.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/saveastemplateplugin/Makefile.am      2004-12-21 17:38:58.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
  INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+ 
+-libsaveastemplateplugin_la_LDFLAGS = -version-info 0:0:0
++libsaveastemplateplugin_la_LDFLAGS = -avoid-version
+ libsaveastemplateplugin_la_METASOURCES = AUTO
+ libsaveastemplateplugin_la_SOURCES = satemplate.cpp satdialog.cpp 
+ 
+diff -Nur scribus-1.2.1/scribus/plugins/scriptplugin/Makefile.am scribus-1.2.1-module/scribus/plugins/scriptplugin/Makefile.am
+--- scribus-1.2.1/scribus/plugins/scriptplugin/Makefile.am     2004-12-11 22:53:43.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/scriptplugin/Makefile.am      2004-12-21 17:38:45.000000000 +0100
+@@ -7,7 +7,7 @@
+ 
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+ 
 -libscriptplugin_la_LDFLAGS = -version-info 0:0:0
 +libscriptplugin_la_LDFLAGS = -avoid-version
  libscriptplugin_la_METASOURCES = AUTO
- libscriptplugin_la_SOURCES = cmdutil.cpp cmddialog.cpp cmddoc.cpp cmdpage.cpp cmdobj.cpp cmdgetprop.cpp cmdsetprop.cpp cmdtext.cpp cmdmani.cpp cmdcolor.cpp cmdmisc.cpp conswin.cpp pconsole.cpp scriptplugin.cpp 
- EXTRA_DIST = cmdvar.h cmdutil.cpp cmdutil.h cmddialog.cpp cmddialog.h cmddoc.cpp cmddoc.h cmdpage.cpp cmdpage.h cmdobj.cpp cmdobj.h cmdgetprop.cpp cmdgetprop.h cmdsetprop.cpp cmdsetprop.h cmdtext.cpp cmdtext.h cmdmani.cpp cmdmani.h cmdcolor.cpp cmdcolor.h cmdmisc.cpp cmdmisc.h scriptplugin.cpp scriptplugin.h pconsole.cpp pconsole.h conswin.cpp conswin.h 
+ 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 guiapp.cpp conswin.cpp pconsole.cpp scriptplugin.cpp 
+ 
+diff -Nur scribus-1.2.1/scribus/plugins/svgexplugin/Makefile.am scribus-1.2.1-module/scribus/plugins/svgexplugin/Makefile.am
+--- scribus-1.2.1/scribus/plugins/svgexplugin/Makefile.am      2004-12-11 22:53:43.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/svgexplugin/Makefile.am       2004-12-21 17:38:16.000000000 +0100
+@@ -11,7 +11,7 @@
+ endif
+ AM_LDFLAGS =  $(linkflag) $(LIBFREETYPE_LIBS)
+ 
+-libsvgexplugin_la_LDFLAGS = -version-info 0:0:0
++libsvgexplugin_la_LDFLAGS = -avoid-version
+ libsvgexplugin_la_METASOURCES = AUTO
+ libsvgexplugin_la_SOURCES = svgexplugin.cpp 
+ 
+diff -Nur scribus-1.2.1/scribus/plugins/svgimplugin/Makefile.am scribus-1.2.1-module/scribus/plugins/svgimplugin/Makefile.am
+--- scribus-1.2.1/scribus/plugins/svgimplugin/Makefile.am      2004-12-11 22:53:43.000000000 +0100
++++ scribus-1.2.1-module/scribus/plugins/svgimplugin/Makefile.am       2004-12-21 17:37:48.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ AM_LDFLAGS =  $(linkflag) $(LIBFREETYPE_LIBS)
+ 
+-libsvgimplugin_la_LDFLAGS = -version-info 0:0:0
++libsvgimplugin_la_LDFLAGS = -avoid-version
+ libsvgimplugin_la_METASOURCES = AUTO
+ libsvgimplugin_la_SOURCES = svgplugin.cpp 
+