-diff -Nur scribus-0.8.orig/scribus/libabout/Makefile.am scribus-0.8/scribus/libabout/Makefile.am
---- scribus-0.8.orig/scribus/libabout/Makefile.am Sat Sep 28 09:34:39 2002
-+++ scribus-0.8/scribus/libabout/Makefile.am Thu Oct 24 12:47:03 2002
-@@ -1,4 +1,4 @@
--libdir = $(prefix)/share/scribus/libs
-+libdir = $(prefix)/lib/scribus
- ####### kdevelop will overwrite this part!!! (begin)##########
- lib_LTLIBRARIES = libabout.la
-
+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
+ LDFLAGS = -s -export-dynamic
-libabout_la_LDFLAGS = -version-info 0:0:0
libabout_la_METASOURCES = AUTO
-diff -Nur scribus-0.8.orig/scribus/libabout/Makefile.in scribus-0.8/scribus/libabout/Makefile.in
---- scribus-0.8.orig/scribus/libabout/Makefile.in Sat Sep 28 12:30:30 2002
-+++ scribus-0.8/scribus/libabout/Makefile.in Thu Oct 24 12:47:22 2002
-@@ -225,7 +225,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
-
--libdir = $(prefix)/share/scribus/libs
-+libdir = $(prefix)/lib/scribus
- ####### kdevelop will overwrite this part!!! (begin)##########
- lib_LTLIBRARIES = libabout.la
-
-@@ -233,7 +233,7 @@
-
- LDFLAGS = -s -export-dynamic
-
--libabout_la_LDFLAGS = -version-info 0:0:0
-+libabout_la_LDFLAGS = -avoid-version
-
- #>- libabout_la_METASOURCES = AUTO
-
-diff -Nur scribus-0.8.orig/scribus/libpdf/Makefile.am scribus-0.8/scribus/libpdf/Makefile.am
---- scribus-0.8.orig/scribus/libpdf/Makefile.am Sat Sep 28 09:34:39 2002
-+++ scribus-0.8/scribus/libpdf/Makefile.am Thu Oct 24 12:43:24 2002
-@@ -1,4 +1,4 @@
--libdir = $(prefix)/share/scribus/libs
-+libdir = $(prefix)/lib/scribus
- CPPFLAGS = -I$(top_builddir)/scribus
- ####### kdevelop will overwrite this part!!! (begin)##########
- lib_LTLIBRARIES = libpdf.la
+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
+ LDFLAGS = -s -export-dynamic
-libpdf_la_LDFLAGS = -version-info 0:0:0
libpdf_la_METASOURCES = AUTO
-diff -Nur scribus-0.8.orig/scribus/libpdf/Makefile.in scribus-0.8/scribus/libpdf/Makefile.in
---- scribus-0.8.orig/scribus/libpdf/Makefile.in Sat Sep 28 12:30:31 2002
-+++ scribus-0.8/scribus/libpdf/Makefile.in Thu Oct 24 12:43:49 2002
-@@ -225,7 +225,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
-
--libdir = $(prefix)/share/scribus/libs
-+libdir = $(prefix)/lib/scribus
- CPPFLAGS = -I$(top_builddir)/scribus
- ####### kdevelop will overwrite this part!!! (begin)##########
- lib_LTLIBRARIES = libpdf.la
-@@ -234,7 +234,7 @@
-
- LDFLAGS = -s -export-dynamic
-
--libpdf_la_LDFLAGS = -version-info 0:0:0
-+libpdf_la_LDFLAGS = -avoid-version
-
- #>- libpdf_la_METASOURCES = AUTO
-
-diff -Nur scribus-0.8.orig/scribus/libpostscript/Makefile.am scribus-0.8/scribus/libpostscript/Makefile.am
---- scribus-0.8.orig/scribus/libpostscript/Makefile.am Sat Sep 28 09:34:39 2002
-+++ scribus-0.8/scribus/libpostscript/Makefile.am Thu Oct 24 12:44:08 2002
-@@ -1,4 +1,4 @@
--libdir = $(prefix)/share/scribus/libs
-+libdir = $(prefix)/lib/scribus
- CPPFLAGS = -I$(top_builddir)/scribus
- ####### kdevelop will overwrite this part!!! (begin)##########
- lib_LTLIBRARIES = libpostscript.la
+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
+ LDFLAGS = -s -export-dynamic
-libpostscript_la_LDFLAGS = -version-info 0:0:0
libpostscript_la_METASOURCES = AUTO
-diff -Nur scribus-0.8.orig/scribus/libpostscript/Makefile.in scribus-0.8/scribus/libpostscript/Makefile.in
---- scribus-0.8.orig/scribus/libpostscript/Makefile.in Sat Sep 28 12:30:31 2002
-+++ scribus-0.8/scribus/libpostscript/Makefile.in Thu Oct 24 12:44:26 2002
-@@ -225,7 +225,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
-
--libdir = $(prefix)/share/scribus/libs
-+libdir = $(prefix)/lib/scribus
- CPPFLAGS = -I$(top_builddir)/scribus
- ####### kdevelop will overwrite this part!!! (begin)##########
- lib_LTLIBRARIES = libpostscript.la
-@@ -234,7 +234,7 @@
-
- LDFLAGS = -s -export-dynamic
-
--libpostscript_la_LDFLAGS = -version-info 0:0:0
-+libpostscript_la_LDFLAGS = -avoid-version
-
- #>- libpostscript_la_METASOURCES = AUTO
-
-diff -Nur scribus-0.8.orig/scribus/libprefs/Makefile.am scribus-0.8/scribus/libprefs/Makefile.am
---- scribus-0.8.orig/scribus/libprefs/Makefile.am Sat Sep 28 09:34:39 2002
-+++ scribus-0.8/scribus/libprefs/Makefile.am Thu Oct 24 12:45:54 2002
-@@ -1,4 +1,4 @@
--libdir = $(prefix)/share/scribus/libs
-+libdir = $(prefix)/lib/scribus
- CPPFLAGS = -I$(top_builddir)/scribus
- ####### kdevelop will overwrite this part!!! (begin)##########
- lib_LTLIBRARIES = libpreferences.la
+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
+ LDFLAGS = -s -export-dynamic
-libpreferences_la_LDFLAGS = -version-info 0:0:0
libpreferences_la_METASOURCES = AUTO
-diff -Nur scribus-0.8.orig/scribus/libprefs/Makefile.in scribus-0.8/scribus/libprefs/Makefile.in
---- scribus-0.8.orig/scribus/libprefs/Makefile.in Sat Sep 28 12:30:31 2002
-+++ scribus-0.8/scribus/libprefs/Makefile.in Thu Oct 24 12:46:16 2002
-@@ -225,7 +225,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
-
--libdir = $(prefix)/share/scribus/libs
-+libdir = $(prefix)/lib/scribus
- CPPFLAGS = -I$(top_builddir)/scribus
- ####### kdevelop will overwrite this part!!! (begin)##########
- lib_LTLIBRARIES = libpreferences.la
-@@ -234,7 +234,7 @@
-
- LDFLAGS = -s -export-dynamic
-
--libpreferences_la_LDFLAGS = -version-info 0:0:0
-+libpreferences_la_LDFLAGS = -avoid-version
-
- #>- libpreferences_la_METASOURCES = AUTO
-
-diff -Nur scribus-0.8.orig/scribus/plugins/libchar/Makefile.am scribus-0.8/scribus/plugins/libchar/Makefile.am
---- scribus-0.8.orig/scribus/plugins/libchar/Makefile.am Sat Sep 28 09:34:39 2002
-+++ scribus-0.8/scribus/plugins/libchar/Makefile.am Thu Oct 24 12:44:57 2002
-@@ -1,4 +1,4 @@
--libdir = $(prefix)/share/scribus/plugins
-+libdir = $(prefix)/lib/scribus/plugins
- CPPFLAGS = -I$(top_builddir)/scribus
- ####### kdevelop will overwrite this part!!! (begin)##########
- lib_LTLIBRARIES = libcharselect.la
-@@ -10,7 +10,7 @@
- LDFLAGS = -s -export-dynamic
+--- 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
+@@ -4,7 +4,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
-libcharselect_la_LDFLAGS = -version-info 0:0:0
+libcharselect_la_LDFLAGS = -avoid-version
libcharselect_la_METASOURCES = AUTO
-diff -Nur scribus-0.8.orig/scribus/plugins/libchar/Makefile.in scribus-0.8/scribus/plugins/libchar/Makefile.in
---- scribus-0.8.orig/scribus/plugins/libchar/Makefile.in Sat Sep 28 12:30:31 2002
-+++ scribus-0.8/scribus/plugins/libchar/Makefile.in Thu Oct 24 12:45:38 2002
-@@ -225,7 +225,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
-
--libdir = $(prefix)/share/scribus/plugins
-+libdir = $(prefix)/lib/scribus/plugins
- CPPFLAGS = -I$(top_builddir)/scribus
- ####### kdevelop will overwrite this part!!! (begin)##########
- lib_LTLIBRARIES = libcharselect.la
-@@ -234,7 +234,7 @@
-
- LDFLAGS = -s -export-dynamic
-
--libcharselect_la_LDFLAGS = -version-info 0:0:0
-+libcharselect_la_LDFLAGS = -avoid-version
-
- #>- libcharselect_la_METASOURCES = AUTO
-
-diff -Nur scribus-0.8.orig/scribus/scribus.cpp scribus-0.8/scribus/scribus.cpp
---- scribus-0.8.orig/scribus/scribus.cpp Tue Sep 24 22:09:45 2002
-+++ scribus-0.8/scribus/scribus.cpp Thu Oct 24 12:42:26 2002
-@@ -2361,7 +2361,7 @@
- typedef About* (*sdem)(QWidget *d);
- sdem demo;
- QString pfad = PREL;
-- pfad += "/share/scribus/libs/libabout.so";
-+ pfad += "/lib/scribus/libabout.so";
- mo = dlopen(pfad, RTLD_LAZY);
- if (!mo)
- {
-@@ -3840,7 +3840,7 @@
- typedef Preferences* (*sdem)(QWidget *d, preV *Vor);
- sdem demo;
- QString pfad = PREL;
-- pfad += "/share/scribus/libs/libpreferences.so";
-+ pfad += "/lib/scribus/libpreferences.so";
- mo = dlopen(pfad, RTLD_LAZY);
- if (!mo)
- {
-@@ -4250,7 +4250,7 @@
- typedef PSLib* (*sdem)(bool psart, SCFonts &AllFonts, QMap<QString,QFont> DocFonts, CListe DocColors, bool pdf);
- sdem demo;
- QString pfad = PREL;
-- pfad += "/share/scribus/libs/libpostscript.so";
-+ pfad += "/lib/scribus/libpostscript.so";
- PSDriver = dlopen(pfad, RTLD_LAZY);
- if (!PSDriver)
- {
-@@ -4280,7 +4280,7 @@
- typedef PDFlib* (*sdem)();
- sdem demo;
- QString pfad = PREL;
-- pfad += "/share/scribus/libs/libpdf.so";
-+ pfad += "/lib/scribus/libpdf.so";
- PDFDriver = dlopen(pfad, RTLD_LAZY);
- if (!PDFDriver)
- {
-@@ -4676,7 +4676,7 @@
- QString nam = "";
- int ty = 0;
- struct PlugData pda;
-- pfad += "/share/scribus/plugins/";
-+ pfad += "/lib/scribus/plugins/";
- QDir d(pfad, "*.so*", QDir::Name, QDir::Files | QDir::Executable | QDir::NoSymLinks);
- if ((d.exists()) && (d.count() != 0))
- {
-@@ -4719,7 +4719,7 @@
- QString pfad = PREL;
- if (pda.Typ != 4)
- {
-- pfad += "/share/scribus/plugins/" + pda.Datei;
-+ pfad += "/lib/scribus/plugins/" + pda.Datei;
- mo = dlopen(pfad, RTLD_LAZY | RTLD_GLOBAL);
- if (!mo)
- {
-@@ -4753,7 +4753,7 @@
- sdem1 demo1;
- sdem2 demo2;
- QString pfad = PREL;
-- pfad += "/share/scribus/plugins/" + name;
-+ pfad += "/lib/scribus/plugins/" + name;
- mo = dlopen(pfad, RTLD_LAZY | RTLD_GLOBAL);
- if (!mo)
- return false;
+--- 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
+ 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
+ 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 @@
+
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+
+-libpreview_la_LDFLAGS = -version-info 0:0:0
++libpreview_la_LDFLAGS = -avoid-version
+
+ 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
+ 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
projects / packages / scribus.git / blobdiff