]> git.pld-linux.org Git - packages/scribus.git/commitdiff
projects / packages / scribus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bf94392)
This commit was manufactured by cvs2git to create branch 'AC-branch'.
authorcvs2git <feedback@pld-linux.org>
Sat, 8 Jan 2005 21:51:21 +0000 (21:51 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Cherrypick from master 2005-01-08 16:32:37 UTC deejay1 <deejay1@pld-linux.org> '- fixes build by adding DESTDIR where it should be':
    scribus-destdir.patch -> 1.1
    scribus-post12.patch -> 1.1
    scribus-standard-font-paths.patch -> 1.1
    scribus.desktop -> 1.9
Cherrypick from master 2005-01-08 21:51:21 UTC deejay1 <deejay1@pld-linux.org> '- fixes helpbrowser without docs package, thanks to Craig Bradney from the':
    scribus-helpbrowser.patch -> 1.1

scribus-destdir.patch [new file with mode: 0644] patch | blob
scribus-helpbrowser.patch [new file with mode: 0644] patch | blob
scribus-post12.patch [new file with mode: 0644] patch | blob
scribus-standard-font-paths.patch [new file with mode: 0644] patch | blob
scribus.desktop [new file with mode: 0644] patch | blob

diff --git a/scribus-destdir.patch b/scribus-destdir.patch
new file mode 100644 (file)
index 0000000..9bb2ef8
--- /dev/null
+++ b/scribus-destdir.patch
@@ -0,0 +1,313 @@
+diff -ur scribus-1.2.1/scribus/doc/en/images/Makefile.am scribus-1.2.1-destdir/scribus/doc/en/images/Makefile.am
+--- scribus-1.2.1/scribus/doc/en/images/Makefile.am    2004-12-27 22:45:39.000000000 +0100
++++ scribus-1.2.1-destdir/scribus/doc/en/images/Makefile.am    2005-01-08 17:29:51.221461352 +0100
+@@ -2,158 +2,158 @@
+ 
+ install-data-local:
+ 
+-      $(mkinstalldirs) $(prefix)/share/scribus/doc/en/images/
+-      $(INSTALL_DATA) $(srcdir)/acropass.png $(prefix)/share/scribus/doc/en/images/acropass.png
+-      $(INSTALL_DATA) $(srcdir)/acroinfo.png $(prefix)/share/scribus/doc/en/images/acroinfo.png
+-      $(INSTALL_DATA) $(srcdir)/acrosec.png $(prefix)/share/scribus/doc/en/images/acrosec.png
+-      $(INSTALL_DATA) $(srcdir)/acro1.png $(prefix)/share/scribus/doc/en/images/acro1.png
+-      $(INSTALL_DATA) $(srcdir)/acro3.png $(prefix)/share/scribus/doc/en/images/acro3.png
+-      $(INSTALL_DATA) $(srcdir)/batik1.png $(prefix)/share/scribus/doc/en/images/batik1.png
+-      $(INSTALL_DATA) $(srcdir)/cmspanel.png $(prefix)/share/scribus/doc/en/images/cmspanel.png
+-      $(INSTALL_DATA) $(srcdir)/cmsmodify1.png $(prefix)/share/scribus/doc/en/images/cmsmodify1.png
+-      $(INSTALL_DATA) $(srcdir)/colormgmtscreen.png $(prefix)/share/scribus/doc/en/images/colormgmtscreen.png
+-      $(INSTALL_DATA) $(srcdir)/colormanager2.png $(prefix)/share/scribus/doc/en/images/colormanager2.png
+-      $(INSTALL_DATA) $(srcdir)/cups1.png $(prefix)/share/scribus/doc/en/images/cups1.png
+-      $(INSTALL_DATA) $(srcdir)/cups2.png $(prefix)/share/scribus/doc/en/images/cups2.png
+-      $(INSTALL_DATA) $(srcdir)/docheader1.png $(prefix)/share/scribus/doc/en/images/docheader1.png
+-      $(INSTALL_DATA) $(srcdir)/docheader2.png $(prefix)/share/scribus/doc/en/images/docheader2.png
+-      $(INSTALL_DATA) $(srcdir)/fontpref1.png $(prefix)/share/scribus/doc/en/images/fontpref1.png
+-      $(INSTALL_DATA) $(srcdir)/fontpref2.png  $(prefix)/share/scribus/doc/en/images/fontpref2.png 
+-      $(INSTALL_DATA) $(srcdir)/fontpref3.png $(prefix)/share/scribus/doc/en/images/fontpref3.png
+-      $(INSTALL_DATA) $(srcdir)/fonts.png  $(prefix)/share/scribus/doc/en/images/fonts.png 
+-      $(INSTALL_DATA) $(srcdir)/fontprev.png $(prefix)/share/scribus/doc/en/images/fontprev.png
+-      $(INSTALL_DATA) $(srcdir)/gammagrayscale.png $(prefix)/share/scribus/doc/en/images/gammagrayscale.png
+-      $(INSTALL_DATA) $(srcdir)/gimpoptions1.png  $(prefix)/share/scribus/doc/en/images/gimpoptions1.png 
+-      $(INSTALL_DATA) $(srcdir)/gimpoptions2.png $(prefix)/share/scribus/doc/en/images/gimpoptions2.png
+-      $(INSTALL_DATA) $(srcdir)/gimpoptions3.png $(prefix)/share/scribus/doc/en/images/gimpoptions3.png
+-      $(INSTALL_DATA) $(srcdir)/gsadv1.png $(prefix)/share/scribus/doc/en/images/gsadv1.png
+-      $(INSTALL_DATA) $(srcdir)/gsadv2.png $(prefix)/share/scribus/doc/en/images/gsadv2.png
+-      $(INSTALL_DATA) $(srcdir)/gsadv3.png $(prefix)/share/scribus/doc/en/images/gsadv3.png
+-      $(INSTALL_DATA) $(srcdir)/hyphen1.png $(prefix)/share/scribus/doc/en/images/hyphen1.png
+-      $(INSTALL_DATA) $(srcdir)/hyphen2.png $(prefix)/share/scribus/doc/en/images/hyphen2.png
+-      $(INSTALL_DATA) $(srcdir)/hyphen3.png $(prefix)/share/scribus/doc/en/images/hyphen3.png
+-      $(INSTALL_DATA) $(srcdir)/inkscape.png $(prefix)/share/scribus/doc/en/images/inkscape.png
+-      $(INSTALL_DATA) $(srcdir)/kfontinstaller.png $(prefix)/share/scribus/doc/en/images/kfontinstaller.png
+-      $(INSTALL_DATA) $(srcdir)/ksnapshot.png $(prefix)/share/scribus/doc/en/images/ksnapshot.png
+-      $(INSTALL_DATA) $(srcdir)/monprof1.png $(prefix)/share/scribus/doc/en/images/monprof1.png
+-      $(INSTALL_DATA) $(srcdir)/monprof2.png $(prefix)/share/scribus/doc/en/images/monprof2.png
+-      $(INSTALL_DATA) $(srcdir)/monprof3.png $(prefix)/share/scribus/doc/en/images/monprof3.png
+-      $(INSTALL_DATA) $(srcdir)/monprof4.png $(prefix)/share/scribus/doc/en/images/monprof4.png
+-      $(INSTALL_DATA) $(srcdir)/pdfxcolor.png $(prefix)/share/scribus/doc/en/images/pdfxcolor.png
+-      $(INSTALL_DATA) $(srcdir)/pdfxintent.png $(prefix)/share/scribus/doc/en/images/pdfxintent.png
+-      $(INSTALL_DATA) $(srcdir)/pstoedit1.png $(prefix)/share/scribus/doc/en/images/pstoedit1.png
+-      $(INSTALL_DATA) $(srcdir)/pdfx3-1.png $(prefix)/share/scribus/doc/en/images/pdfx3-1.png 
+-      $(INSTALL_DATA) $(srcdir)/prefsblgrid1.png $(prefix)/share/scribus/doc/en/images/prefsblgrid1.png
+-      $(INSTALL_DATA) $(srcdir)/prefsguides.png $(prefix)/share/scribus/doc/en/images/prefsguides.png
+-      $(INSTALL_DATA) $(srcdir)/prefspanel1.png $(prefix)/share/scribus/doc/en/images/prefspanel1.png 
+-      $(INSTALL_DATA) $(srcdir)/prefspanel2.png $(prefix)/share/scribus/doc/en/images/prefspanel2.png
+-      $(INSTALL_DATA) $(srcdir)/prefspanel3.png $(prefix)/share/scribus/doc/en/images/prefspanel3.png
+-      $(INSTALL_DATA) $(srcdir)/prefspanel4.png $(prefix)/share/scribus/doc/en/images/prefspanel4.png
+-      $(INSTALL_DATA) $(srcdir)/prefspanel5.png $(prefix)/share/scribus/doc/en/images/prefspanel5.png
+-      $(INSTALL_DATA) $(srcdir)/RDF.png $(prefix)/share/scribus/doc/en/images/RDF.png
+-      $(INSTALL_DATA) $(srcdir)/printer1.png $(prefix)/share/scribus/doc/en/images/printer1.png
+-      $(INSTALL_DATA) $(srcdir)/printer2.png $(prefix)/share/scribus/doc/en/images/printer2.png
+-      $(INSTALL_DATA) $(srcdir)/printer3.png $(prefix)/share/scribus/doc/en/images/printer3.png
+-      $(INSTALL_DATA) $(srcdir)/printseps.png $(prefix)/share/scribus/doc/en/images/printseps.png
+-      $(INSTALL_DATA) $(srcdir)/printpreview.png $(prefix)/share/scribus/doc/en/images/printpreview.png
+-      $(INSTALL_DATA) $(srcdir)/result.png $(prefix)/share/scribus/doc/en/images/result.png
+-      $(INSTALL_DATA) $(srcdir)/Scripter_error_string.png $(prefix)/share/scribus/doc/en/images/Scripter_error_string.png
+-      $(INSTALL_DATA) $(srcdir)/Scripter.png $(prefix)/share/scribus/doc/en/images/Scripter.png
+-      $(INSTALL_DATA) $(srcdir)/scribus2.png $(prefix)/share/scribus/doc/en/images/scribus2.png
+-      $(INSTALL_DATA) $(srcdir)/scribuscms1.png $(prefix)/share/scribus/doc/en/images/scribuscms1.png
+-      $(INSTALL_DATA) $(srcdir)/scribustru4.png $(prefix)/share/scribus/doc/en/images/scribustru4.png
+-      $(INSTALL_DATA) $(srcdir)/spinbox1.png $(prefix)/share/scribus/doc/en/images/spinbox1.png
+-      $(INSTALL_DATA) $(srcdir)/svg1.png $(prefix)/share/scribus/doc/en/images/svg1.png
+-      $(INSTALL_DATA) $(srcdir)/xnview.png $(prefix)/share/scribus/doc/en/images/xnview.png
+-      $(INSTALL_DATA) $(srcdir)/formularz_export_PDF.png $(prefix)/share/scribus/doc/en/images/formularz_export_PDF.png
+-      $(INSTALL_DATA) $(srcdir)/formularz_js_skrypt.png $(prefix)/share/scribus/doc/en/images/formularz_js_skrypt.png
+-      $(INSTALL_DATA) $(srcdir)/formularz_js_sprawdzanie.png $(prefix)/share/scribus/doc/en/images/formularz_js_sprawdzanie.png
+-      $(INSTALL_DATA) $(srcdir)/formularz_nowy.png $(prefix)/share/scribus/doc/en/images/formularz_nowy.png
+-      $(INSTALL_DATA) $(srcdir)/formularz_pole_num.png $(prefix)/share/scribus/doc/en/images/formularz_pole_num.png
+-      $(INSTALL_DATA) $(srcdir)/siatka_jednostki_miar.png $(prefix)/share/scribus/doc/en/images/siatka_jednostki_miar.png
+-      $(INSTALL_DATA) $(srcdir)/siatka_menu.png $(prefix)/share/scribus/doc/en/images/siatka_menu.png
+-      $(INSTALL_DATA) $(srcdir)/symbole.png $(prefix)/share/scribus/doc/en/images/symbole.png
+-      $(INSTALL_DATA) $(srcdir)/ulica.png $(prefix)/share/scribus/doc/en/images/ulica.png
+-      $(INSTALL_DATA) $(srcdir)/wlasciwosci_pola.png $(prefix)/share/scribus/doc/en/images/wlasciwosci_pola.png
+-      $(INSTALL_DATA) $(srcdir)/wyslij_formularz.png $(prefix)/share/scribus/doc/en/images/wyslij_formularz.png
++      $(mkinstalldirs) $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/
++      $(INSTALL_DATA) $(srcdir)/acropass.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/acropass.png
++      $(INSTALL_DATA) $(srcdir)/acroinfo.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/acroinfo.png
++      $(INSTALL_DATA) $(srcdir)/acrosec.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/acrosec.png
++      $(INSTALL_DATA) $(srcdir)/acro1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/acro1.png
++      $(INSTALL_DATA) $(srcdir)/acro3.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/acro3.png
++      $(INSTALL_DATA) $(srcdir)/batik1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/batik1.png
++      $(INSTALL_DATA) $(srcdir)/cmspanel.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/cmspanel.png
++      $(INSTALL_DATA) $(srcdir)/cmsmodify1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/cmsmodify1.png
++      $(INSTALL_DATA) $(srcdir)/colormgmtscreen.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/colormgmtscreen.png
++      $(INSTALL_DATA) $(srcdir)/colormanager2.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/colormanager2.png
++      $(INSTALL_DATA) $(srcdir)/cups1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/cups1.png
++      $(INSTALL_DATA) $(srcdir)/cups2.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/cups2.png
++      $(INSTALL_DATA) $(srcdir)/docheader1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/docheader1.png
++      $(INSTALL_DATA) $(srcdir)/docheader2.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/docheader2.png
++      $(INSTALL_DATA) $(srcdir)/fontpref1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/fontpref1.png
++      $(INSTALL_DATA) $(srcdir)/fontpref2.png  $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/fontpref2.png 
++      $(INSTALL_DATA) $(srcdir)/fontpref3.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/fontpref3.png
++      $(INSTALL_DATA) $(srcdir)/fonts.png  $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/fonts.png 
++      $(INSTALL_DATA) $(srcdir)/fontprev.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/fontprev.png
++      $(INSTALL_DATA) $(srcdir)/gammagrayscale.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/gammagrayscale.png
++      $(INSTALL_DATA) $(srcdir)/gimpoptions1.png  $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/gimpoptions1.png 
++      $(INSTALL_DATA) $(srcdir)/gimpoptions2.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/gimpoptions2.png
++      $(INSTALL_DATA) $(srcdir)/gimpoptions3.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/gimpoptions3.png
++      $(INSTALL_DATA) $(srcdir)/gsadv1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/gsadv1.png
++      $(INSTALL_DATA) $(srcdir)/gsadv2.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/gsadv2.png
++      $(INSTALL_DATA) $(srcdir)/gsadv3.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/gsadv3.png
++      $(INSTALL_DATA) $(srcdir)/hyphen1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/hyphen1.png
++      $(INSTALL_DATA) $(srcdir)/hyphen2.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/hyphen2.png
++      $(INSTALL_DATA) $(srcdir)/hyphen3.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/hyphen3.png
++      $(INSTALL_DATA) $(srcdir)/inkscape.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/inkscape.png
++      $(INSTALL_DATA) $(srcdir)/kfontinstaller.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/kfontinstaller.png
++      $(INSTALL_DATA) $(srcdir)/ksnapshot.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/ksnapshot.png
++      $(INSTALL_DATA) $(srcdir)/monprof1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/monprof1.png
++      $(INSTALL_DATA) $(srcdir)/monprof2.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/monprof2.png
++      $(INSTALL_DATA) $(srcdir)/monprof3.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/monprof3.png
++      $(INSTALL_DATA) $(srcdir)/monprof4.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/monprof4.png
++      $(INSTALL_DATA) $(srcdir)/pdfxcolor.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/pdfxcolor.png
++      $(INSTALL_DATA) $(srcdir)/pdfxintent.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/pdfxintent.png
++      $(INSTALL_DATA) $(srcdir)/pstoedit1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/pstoedit1.png
++      $(INSTALL_DATA) $(srcdir)/pdfx3-1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/pdfx3-1.png 
++      $(INSTALL_DATA) $(srcdir)/prefsblgrid1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/prefsblgrid1.png
++      $(INSTALL_DATA) $(srcdir)/prefsguides.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/prefsguides.png
++      $(INSTALL_DATA) $(srcdir)/prefspanel1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/prefspanel1.png 
++      $(INSTALL_DATA) $(srcdir)/prefspanel2.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/prefspanel2.png
++      $(INSTALL_DATA) $(srcdir)/prefspanel3.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/prefspanel3.png
++      $(INSTALL_DATA) $(srcdir)/prefspanel4.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/prefspanel4.png
++      $(INSTALL_DATA) $(srcdir)/prefspanel5.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/prefspanel5.png
++      $(INSTALL_DATA) $(srcdir)/RDF.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/RDF.png
++      $(INSTALL_DATA) $(srcdir)/printer1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/printer1.png
++      $(INSTALL_DATA) $(srcdir)/printer2.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/printer2.png
++      $(INSTALL_DATA) $(srcdir)/printer3.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/printer3.png
++      $(INSTALL_DATA) $(srcdir)/printseps.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/printseps.png
++      $(INSTALL_DATA) $(srcdir)/printpreview.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/printpreview.png
++      $(INSTALL_DATA) $(srcdir)/result.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/result.png
++      $(INSTALL_DATA) $(srcdir)/Scripter_error_string.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/Scripter_error_string.png
++      $(INSTALL_DATA) $(srcdir)/Scripter.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/Scripter.png
++      $(INSTALL_DATA) $(srcdir)/scribus2.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/scribus2.png
++      $(INSTALL_DATA) $(srcdir)/scribuscms1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/scribuscms1.png
++      $(INSTALL_DATA) $(srcdir)/scribustru4.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/scribustru4.png
++      $(INSTALL_DATA) $(srcdir)/spinbox1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/spinbox1.png
++      $(INSTALL_DATA) $(srcdir)/svg1.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/svg1.png
++      $(INSTALL_DATA) $(srcdir)/xnview.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/xnview.png
++      $(INSTALL_DATA) $(srcdir)/formularz_export_PDF.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/formularz_export_PDF.png
++      $(INSTALL_DATA) $(srcdir)/formularz_js_skrypt.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/formularz_js_skrypt.png
++      $(INSTALL_DATA) $(srcdir)/formularz_js_sprawdzanie.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/formularz_js_sprawdzanie.png
++      $(INSTALL_DATA) $(srcdir)/formularz_nowy.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/formularz_nowy.png
++      $(INSTALL_DATA) $(srcdir)/formularz_pole_num.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/formularz_pole_num.png
++      $(INSTALL_DATA) $(srcdir)/siatka_jednostki_miar.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/siatka_jednostki_miar.png
++      $(INSTALL_DATA) $(srcdir)/siatka_menu.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/siatka_menu.png
++      $(INSTALL_DATA) $(srcdir)/symbole.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/symbole.png
++      $(INSTALL_DATA) $(srcdir)/ulica.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/ulica.png
++      $(INSTALL_DATA) $(srcdir)/wlasciwosci_pola.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/wlasciwosci_pola.png
++      $(INSTALL_DATA) $(srcdir)/wyslij_formularz.png $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/wyslij_formularz.png
+ 
+ uninstall-local:
+ 
+-      -rm -f $(prefix)/share/scribus/doc/en/images/acro1.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/acro3.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/acroinfo.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/acropass.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/acrosec.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/batik1.png 
+-      -rm -f $(prefix)/share/scribus/doc/en/images/cmsmodify1.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/cmspanel.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/colormanager2.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/colormgmtscreen.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/cups1.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/cups2.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/cmspanel.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/colormanager2.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/docheader1.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/docheader2.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/fontprev.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/fonts.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/fonts2.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/fontpref1.png 
+-      -rm -f $(prefix)/share/scribus/doc/en/images/fontpref2.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/fontpref3.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/fontprev.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/gammagrayscale.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/gimpoptions2.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/gimpoptions1.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/gimpoptions3.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/gsadv1.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/gsadv2.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/gsadv3.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/hyphen1.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/hyphen2.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/hyphen3.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/inkscape.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/kfontinstaller.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/ksnapshot.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/monprof1.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/monprof2.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/monprof3.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/monprof4.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/pdfxcolor.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/pdfxintent.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/prefsblgrid1.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/prefsguides.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/prefspanel1.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/prefspanel2.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/prefspanel3.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/prefspanel4.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/prefspanel5.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/printer1.png 
+-      -rm -f $(prefix)/share/scribus/doc/en/images/printer2.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/printer3.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/printpreview.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/printseps.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/pstoedit1.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/pdfx3-1.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/result.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/RDF.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/spinbox1.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/Scripter.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/Scripter_error_string.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/scribus2.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/scribustru4.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/svg1.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/scribuscms1.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/xnview.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/formularz_export_PDF.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/formularz_js_skrypt.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/formularz_js_sprawdzanie.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/formularz_nowy.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/formularz_pole_num.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/siatka_jednostki_miar.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/siatka_menu.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/symbole.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/ulica.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/wlasciwosci_pola.png
+-      -rm -f $(prefix)/share/scribus/doc/en/images/wyslij_formularz.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/acro1.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/acro3.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/acroinfo.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/acropass.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/acrosec.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/batik1.png      
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/cmsmodify1.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/cmspanel.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/colormanager2.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/colormgmtscreen.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/cups1.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/cups2.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/cmspanel.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/colormanager2.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/docheader1.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/docheader2.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/fontprev.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/fonts.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/fonts2.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/fontpref1.png 
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/fontpref2.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/fontpref3.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/fontprev.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/gammagrayscale.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/gimpoptions2.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/gimpoptions1.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/gimpoptions3.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/gsadv1.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/gsadv2.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/gsadv3.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/hyphen1.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/hyphen2.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/hyphen3.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/inkscape.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/kfontinstaller.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/ksnapshot.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/monprof1.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/monprof2.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/monprof3.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/monprof4.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/pdfxcolor.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/pdfxintent.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/prefsblgrid1.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/prefsguides.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/prefspanel1.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/prefspanel2.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/prefspanel3.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/prefspanel4.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/prefspanel5.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/printer1.png 
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/printer2.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/printer3.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/printpreview.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/printseps.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/pstoedit1.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/pdfx3-1.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/result.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/RDF.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/spinbox1.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/Scripter.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/Scripter_error_string.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/scribus2.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/scribustru4.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/svg1.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/scribuscms1.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/xnview.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/formularz_export_PDF.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/formularz_js_skrypt.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/formularz_js_sprawdzanie.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/formularz_nowy.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/formularz_pole_num.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/siatka_jednostki_miar.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/siatka_menu.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/symbole.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/ulica.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/wlasciwosci_pola.png
++      -rm -f $(DESTDIR)/$(prefix)/share/scribus/doc/en/images/wyslij_formularz.png
+ 
diff --git a/scribus-helpbrowser.patch b/scribus-helpbrowser.patch
new file mode 100644 (file)
index 0000000..3549f7f
--- /dev/null
+++ b/scribus-helpbrowser.patch
@@ -0,0 +1,39 @@
+diff -ur scribus-1.2.1/scribus/helpbrowser.cpp scribus-1.2.1-help/scribus/helpbrowser.cpp
+--- scribus-1.2.1/scribus/helpbrowser.cpp      2005-01-06 21:18:30.000000000 +0100
++++ scribus-1.2.1-help/scribus/helpbrowser.cpp 2005-01-08 22:44:17.000000000 +0100
+@@ -187,6 +187,7 @@
+ void HelpBrowser::jumpToHelpSection(QString jumpToSection, QString jumpToFile)
+ {
+       QString toLoad;
++      bool noDocs=false;
+ 
+       if (jumpToFile=="") 
+       {
+@@ -194,8 +195,13 @@
+               toLoad = pfad + language + "/"; //clean this later to handle 5 char locales
+               if (jumpToSection=="") 
+               {
+-                      toLoad+=listView->firstChild()->text(1);
+-                      listView->setSelected( listView->firstChild(), true );
++                      if (listView->firstChild())
++                      {
++                              toLoad+=listView->firstChild()->text(1);
++                              listView->setSelected( listView->firstChild(), true );
++                      }
++                      else
++                              noDocs=true;
+               }
+               else if (jumpToSection=="scripter") 
+               {
+@@ -214,7 +220,10 @@
+       else
+               toLoad=jumpToFile;
+ 
+-      loadHelp(toLoad);
++      if (!noDocs)
++              loadHelp(toLoad);
++      else
++              textBrowser->setText("<h2>"+ tr("Sorry, no manual available! Please see: http://docs.scribus.net for updated docs\nand www.scribus.net for downloads.")+"</h2>");
+ }
+ 
+ void HelpBrowser::loadHelp(QString filename)
diff --git a/scribus-post12.patch b/scribus-post12.patch
new file mode 100644 (file)
index 0000000..4492dce
--- /dev/null
+++ b/scribus-post12.patch
@@ -0,0 +1,389 @@
+diff -urN scribus-1.2.0.final/scribus/newfile.cpp ../../../2004-08-31/scribus-1.2.0.final+cvs20040831/scribus/newfile.cpp
+--- scribus-1.2.0.final/scribus/newfile.cpp    2004-08-25 17:41:13.000000000 -0500
++++ ../../../2004-08-31/scribus-1.2.0.final+cvs20040831/scribus/newfile.cpp    2004-08-31 18:27:31.000000000 -0500
+@@ -1,6 +1,12 @@
+ #include "newfile.h"
+ #include "newfile.moc"
+ #include <qtooltip.h>
++
++// definitions for clear reading the code - pv
++#define PORTRAIT    0
++#define LANDSCAPE   1
++#define USERFORMAT 30
++
+ extern QPixmap loadIcon(QString nam);
+ 
+ NewDoc::NewDoc( QWidget* parent, preV *Vor )
+@@ -8,27 +14,14 @@
+ {
+       QString units[] = { tr(" pt"), tr(" mm"), tr(" in"), tr(" p")};
+       int decimals;
+-      ein = units[Vor->Einheit];
+-      switch (Vor->Einheit)
+-      {
+-      case 0:
+-              Umrech = 1.0;
+-              decimals = 2;
+-              break;
+-      case 1:
+-              Umrech = 0.3527777;
+-              decimals = 3;
+-              break;
+-      case 2:
+-              Umrech = 1.0 / 72.0;
+-              decimals = 4;
+-              break;
+-      case 3:
+-              Umrech = 1.0 / 12.0;
+-              decimals = 2;
+-              break;
+-      }
++      // pv - removed switch hell
++      double umr[] = {1.0, 0.3527777, (1.0 / 72.0), (1.0 / 12.0)};
++      int dec[] = {2, 3, 4, 2};
++
+       einheit = Vor->Einheit;
++      ein = units[einheit];
++      Umrech = umr[einheit];
++      decimals = dec[einheit];
+       Orient = 0;
+       setCaption( tr( "New Document" ) );
+       setIcon(loadIcon("AppIcon.png"));
+@@ -270,6 +263,15 @@
+ 
+ void NewDoc::code_repeat(int m)
+ {
++      // #869 pv - auto-flip landscape/portrait based on the height:width ratio
++      if (ComboBox1->currentItem() == USERFORMAT)
++      {
++              if (Breite->value() > Hoehe->value())
++                      ComboBox2->setCurrentItem(LANDSCAPE);
++              else
++                      ComboBox2->setCurrentItem(PORTRAIT);
++      } // end of #869
++
+       switch (m)
+       {
+       case 0 :
+@@ -339,6 +341,10 @@
+       int decimals;
+       double AltUmrech = Umrech;
+       double val, oldB, oldBM, oldH, oldHM;
++      // pv - removed switch hell
++      double umr[] = {1.0, 0.3527777, (1.0 / 72.0), (1.0 / 12.0)};
++      int dec[] = {100, 1000, 10000, 100};
++
+       disconnect(Breite, SIGNAL(valueChanged(int)), this, SLOT(setBreite(int)));
+       disconnect(Hoehe, SIGNAL(valueChanged(int)), this, SLOT(setHoehe(int)));
+       disconnect(TopR, SIGNAL(valueChanged(int)), this, SLOT(setTop(int)));
+@@ -351,25 +357,9 @@
+       Hoehe->getValues(&oldH, &oldHM, &decimals, &val);
+       oldH /= AltUmrech;
+       oldHM /= AltUmrech;
+-      switch (u)
+-      {
+-      case 0:
+-              Umrech = 1.0;
+-              decimals = 100;
+-              break;
+-      case 1:
+-              Umrech = 0.3527777;
+-              decimals = 1000;
+-              break;
+-      case 2:
+-              Umrech = 1.0 / 72.0;
+-              decimals = 10000;
+-              break;
+-      case 3:
+-              Umrech = 1.0 / 12.0;
+-              decimals = 100;
+-              break;
+-      }
++
++      Umrech = umr[u];
++      decimals = dec[u];
+       einheit = u;
+       Breite->setValues(oldB * Umrech, oldBM * Umrech, decimals, Pagebr * Umrech);
+       Hoehe->setValues(oldH * Umrech, oldHM * Umrech, decimals, Pageho * Umrech);
+@@ -396,20 +386,9 @@
+ 
+ void NewDoc::ExitOK()
+ {
+-      if (ComboBox1->currentItem() == 30)
+-      {
+               Pagebr = Breite->value() / Umrech;
+               Pageho = Hoehe->value() / Umrech;
+               accept();
+-              return;
+-      }
+-      if (Orient == 1)
+-      {
+-              double br = Pagebr;
+-              Pagebr = Pageho;
+-              Pageho = br;
+-      }
+-      accept();
+ }
+ 
+ void NewDoc::setOrien(int ori)
+@@ -423,10 +402,10 @@
+               Breite->setValue(Hoehe->value());
+               Hoehe->setValue(br);
+       }
+-      if (ori == 0)
+-              Orient = 0;
+-      else
+-              Orient = 1;
++      // #869 pv - defined constants added + code repeat (check w/h)
++      (ori == PORTRAIT) ? Orient = PORTRAIT : Orient = LANDSCAPE;
++      code_repeat(666); // just check w/h
++      // end of #869
+       RightR->setMaxValue(Breite->value() - LeftR->value());
+       LeftR->setMaxValue(Breite->value() - RightR->value());
+       TopR->setMaxValue(Hoehe->value() - BottomR->value());
+@@ -437,7 +416,7 @@
+ 
+ void NewDoc::setPGsize()
+ {
+-      if (ComboBox1->currentItem() == 30)
++      if (ComboBox1->currentItem() == USERFORMAT)
+               setSize(ComboBox1->currentItem());
+       else
+       {
+@@ -458,15 +437,22 @@
+                       355, 250, 178, 125, 89, 462, 298, 312, 542, 595, 1224, 612, 612, 792};
+       int page_y[] = {3368, 2380, 1684, 1190, 842, 595, 421, 297, 210, 148, 4008, 2836, 2004, 1418, 1002, 709,
+                       501, 355, 250, 178, 125, 649, 683, 624, 720, 935, 792, 1008, 792, 1225};
+-      if (gr == 30)
++      if (gr == USERFORMAT)
+       {
+               Breite->setEnabled(true);
+               Hoehe->setEnabled(true);
+       }
+       else
+       {
++              // pv - correct handling of the disabled spins
++              if (ComboBox2->currentItem() == PORTRAIT)
++              {
+               Pagebr = page_x[gr];
+               Pageho = page_y[gr];
++              } else {
++                      Pagebr = page_y[gr];
++                      Pageho = page_x[gr];
++              }
+       }
+       Breite->setValue(Pagebr * Umrech);
+       Hoehe->setValue(Pageho * Umrech);
+diff -urN scribus-1.2.0.final/scribus/page.cpp ../../../2004-08-31/scribus-1.2.0.final+cvs20040831/scribus/page.cpp
+--- scribus-1.2.0.final/scribus/page.cpp       2004-08-25 17:27:25.000000000 -0500
++++ ../../../2004-08-31/scribus-1.2.0.final+cvs20040831/scribus/page.cpp       2004-08-31 18:27:31.000000000 -0500
+@@ -5464,12 +5464,42 @@
+               if (!inText)
+               {
+                       Deselect(true);
++                      slotDoCurs(true);
+                       if (!SeleItem(m))
+                       {
+-                              slotDoCurs(true);
+                               emit Amode(1);
+                               return;
+                       }
++                      else
++                      {
++                              b = doku->ActPage->SelItem.at(0);
++                              if ((m->button() == MidButton) && (b->PType == 4))
++                              {
++                                      Mpressed = false;
++                                      MidButt = false;
++                                      QString cc;
++                                      cc = QApplication::clipboard()->text(QClipboard::Selection);
++                                      if (cc.isNull())
++                                              cc = QApplication::clipboard()->text(QClipboard::Clipboard);
++                                      if (!cc.isNull())
++                                      {
++                                              Serializer *ss = new Serializer("");
++                                              ss->Objekt = cc;
++                                              int st = doku->CurrentABStil;
++                                              ss->GetText(b, st, doku->Vorlagen[st].Font, doku->Vorlagen[st].FontSize, true);
++                                              delete ss;
++                                              if (doku->Trenner->AutoCheck)
++                                                      doku->Trenner->slotHyphenate(b);
++                                      }
++                                      else
++                                      {
++                                              if (ScApp->Buffer2.startsWith("<SCRIBUSTEXT"))
++                                                      ScApp->slotEditPaste();
++                                      }
++                                      RefreshItem(b);
++                              }
++                              return;
++                      }
+               }
+               b = doku->ActPage->SelItem.at(0);
+               oldCp = b->CPos;
+@@ -5494,6 +5524,34 @@
+                               qApp->setOverrideCursor(QCursor(ArrowCursor), true);
+                       }
+               }
++              else
++              {
++                      if ((m->button() == MidButton) && (b->PType == 4))
++                      {
++                              Mpressed = false;
++                              MidButt = false;
++                              QString cc;
++                              cc = QApplication::clipboard()->text(QClipboard::Selection);
++                              if (cc.isNull())
++                                      cc = QApplication::clipboard()->text(QClipboard::Clipboard);
++                              if (!cc.isNull())
++                              {
++                                      Serializer *ss = new Serializer("");
++                                      ss->Objekt = cc;
++                                      int st = doku->CurrentABStil;
++                                      ss->GetText(b, st, doku->Vorlagen[st].Font, doku->Vorlagen[st].FontSize, true);
++                                      delete ss;
++                                      if (doku->Trenner->AutoCheck)
++                                              doku->Trenner->slotHyphenate(b);
++                              }
++                              else
++                              {
++                                      if (ScApp->Buffer2.startsWith("<SCRIBUSTEXT"))
++                                              ScApp->slotEditPaste();
++                              }
++                              RefreshItem(b);
++                      }
++              }
+               break;
+       case 8:
+               SeleItem(m);
+diff -urN scribus-1.2.0.final/scribus/scribus.cpp ../../../2004-08-31/scribus-1.2.0.final+cvs20040831/scribus/scribus.cpp
+--- scribus-1.2.0.final/scribus/scribus.cpp    2004-08-23 17:06:34.000000000 -0500
++++ ../../../2004-08-31/scribus-1.2.0.final+cvs20040831/scribus/scribus.cpp    2004-08-31 18:27:32.000000000 -0500
+@@ -4233,9 +4233,9 @@
+ {
+       QString cc;
+ #if QT_VERSION  >= 0x030100
+-      cc = ClipB->text(QClipboard::Clipboard);
++      cc = ClipB->text(QClipboard::Selection);
+       if (cc.isNull())
+-              cc = ClipB->text(QClipboard::Selection);
++              cc = ClipB->text(QClipboard::Clipboard);
+ #else
+       cc = ClipB->text();
+ #endif
+diff -urN scribus-1.2.0.final/scribus/seiten.cpp ../../../2004-08-31/scribus-1.2.0.final+cvs20040831/scribus/seiten.cpp
+--- scribus-1.2.0.final/scribus/seiten.cpp     2004-08-01 10:42:03.000000000 -0500
++++ ../../../2004-08-31/scribus-1.2.0.final+cvs20040831/scribus/seiten.cpp     2004-08-31 18:27:32.000000000 -0500
+@@ -813,16 +813,18 @@
+ {
+       QString tmp;
+       QPainter p;
+-      p.begin(&ret);
+-      p.setBrush(white);
+-      p.setBackgroundColor(white);
+-      p.setBackgroundMode(QPainter::OpaqueMode);
+-      p.setPen(QPen(black, 1, SolidLine, FlatCap, MiterJoin));
+-      p.setFont(QFont("Helvetica", 12, QFont::Bold));
+-      tmp = tmp.setNum(nr+1);
+-      QRect b = p.boundingRect(3,0, ret.width(), ret.height(), Qt::AlignCenter, tmp);
+-      p.drawRect(QRect(b.x()-2, b.y()-2, b.width()+4, b.height()+4));
+-      p.drawText(b, Qt::AlignCenter, tmp);
+-      p.end();
++      if (p.begin(&ret))
++      {
++              p.setBrush(white);
++              p.setBackgroundColor(white);
++              p.setBackgroundMode(QPainter::OpaqueMode);
++              p.setPen(QPen(black, 1, SolidLine, FlatCap, MiterJoin));
++              p.setFont(QFont("Helvetica", 12, QFont::Bold));
++              tmp = tmp.setNum(nr+1);
++              QRect b = p.boundingRect(3,0, ret.width(), ret.height(), Qt::AlignCenter, tmp);
++              p.drawRect(QRect(b.x()-2, b.y()-2, b.width()+4, b.height()+4));
++              p.drawText(b, Qt::AlignCenter, tmp);
++              p.end();
++      }
+       return ret;
+ }
+diff -urN scribus-1.2.0.final/scribus/story.cpp ../../../2004-08-31/scribus-1.2.0.final+cvs20040831/scribus/story.cpp
+--- scribus-1.2.0.final/scribus/story.cpp      2004-08-24 16:47:54.000000000 -0500
++++ ../../../2004-08-31/scribus-1.2.0.final+cvs20040831/scribus/story.cpp      2004-08-31 18:27:32.000000000 -0500
+@@ -159,6 +159,7 @@
+       viewport()->setAcceptDrops(false);
+       ClipData = 0;
+       connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(ClipChange()));
++      connect(QApplication::clipboard(), SIGNAL(selectionChanged()), this, SLOT(SelClipChange()));
+ }
+ 
+ void SEditor::keyPressEvent(QKeyEvent *k)
+@@ -1171,11 +1172,13 @@
+       if ((hasSelectedText()) && (selectedText() != ""))
+       {
+               disconnect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(ClipChange()));
++              disconnect(QApplication::clipboard(), SIGNAL(selectionChanged()), this, SLOT(SelClipChange()));
+               tBuffer = selectedText();
+               copyStyledText();
+               QApplication::clipboard()->setText(tBuffer, QClipboard::Clipboard);
+               ClipData = 1;
+               connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(ClipChange()));
++              connect(QApplication::clipboard(), SIGNAL(selectionChanged()), this, SLOT(SelClipChange()));
+               emit PasteAvail();
+       }
+       emit SideBarUp(true);
+@@ -1198,19 +1201,29 @@
+ {
+       emit SideBarUp(false);
+       int p, i;
++      QString data = "";
+       getCursorPosition(&p, &i);
+-      if (ClipData == 2)
++      if (ClipData == 1)
++              insStyledText();
++      else
+       {
+-              QString data = QApplication::clipboard()->text(QClipboard::Clipboard);
++              QString data = QApplication::clipboard()->text(QClipboard::Selection);
++              if (data.isNull())
++                      data = QApplication::clipboard()->text(QClipboard::Clipboard);
+               if (!data.isNull())
+               {
+                       data.replace(QRegExp("\r"), "");
+                       data.replace(QRegExp("\n"), QChar(13));
+                       insChars(data);
++                      ClipData = 2;
++                      emit PasteAvail();
++              }
++              else
++              {
++                      emit SideBarUp(true);
++                      return;
+               }
+       }
+-      else
+-              insStyledText();
+       updateAll();
+       emit SideBarUp(true);
+       emit SideBarUpdate();
+@@ -1226,6 +1239,12 @@
+       return p;
+ }
+ 
++void SEditor::SelClipChange()
++{
++      ClipData = 3;
++      emit PasteAvail();
++}
++
+ void SEditor::ClipChange()
+ {
+       ClipData = 2;
+diff -urN scribus-1.2.0.final/scribus/story.h ../../../2004-08-31/scribus-1.2.0.final+cvs20040831/scribus/story.h
+--- scribus-1.2.0.final/scribus/story.h        2004-08-20 16:38:23.000000000 -0500
++++ ../../../2004-08-31/scribus-1.2.0.final+cvs20040831/scribus/story.h        2004-08-31 18:27:32.000000000 -0500
+@@ -114,6 +114,7 @@
+       void copy();
+       void paste();
+       void ClipChange();
++      void SelClipChange();
+ 
+ signals:
+       void setProps(int, int);
diff --git a/scribus-standard-font-paths.patch b/scribus-standard-font-paths.patch
new file mode 100644 (file)
index 0000000..0a3e345
--- /dev/null
+++ b/scribus-standard-font-paths.patch
@@ -0,0 +1,11 @@
+--- scribus-0.8/scribus/scfonts.cpp.orig       Sun Sep 22 10:54:38 2002
++++ scribus-0.8/scribus/scfonts.cpp    Thu Oct 24 11:53:26 2002
+@@ -463,6 +463,8 @@
+       char **fontpath=XGetFontPath(display,&pathcount);
+       for(i=0; i<pathcount; ++i)
+               AddPath(fontpath[i]);
++      AddPath("/usr/share/fonts/Type1");
++      AddPath("/usr/share/fonts/TTF");
+       XFreeFontPath(fontpath);
+ }
+ 
diff --git a/scribus.desktop b/scribus.desktop
new file mode 100644 (file)
index 0000000..2921ef8
--- /dev/null
+++ b/scribus.desktop
@@ -0,0 +1,60 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Scribus
+Name[fa]=اسکریباس
+Name[lo]=ສະຄຣີບັດສ໌
+GenericName=Desktop Publishing
+GenericName[af]=Werkskerm Publisering
+GenericName[bg]=Издателска програма
+GenericName[bs]=Stono izdavaštvo (DTP)
+GenericName[ca]=Publicació d'escriptori
+GenericName[cs]=Publikování na desktopu
+GenericName[cy]=Cyhoeddi Penbwrdd
+GenericName[da]=Dtp
+GenericName[eo]=DTP-programo
+GenericName[es]=Publicación de escritorio
+GenericName[et]=Küljendusrakendus
+GenericName[fa]=نشر میزکار
+GenericName[fi]=Julkaisuohjelma
+GenericName[fr]=Publication de bureau
+GenericName[he]=הוצאה לאור שולחנית
+GenericName[hr]=Stolno izdavaštvo
+GenericName[hu]=Kiadványszerkesztés
+GenericName[it]=Pubblicazioni
+GenericName[ja]=デスクトップパブリッシング
+GenericName[lo]=ເດດທອບພັລບບີດຊິງ
+GenericName[lt]=Darbastalio leidykla
+GenericName[nb]=Datatrykkeprogram
+GenericName[nn]=Datatrykk
+GenericName[nso]=Kwalakwatso ya Desktop
+GenericName[pl]=Program do składu tekstu
+GenericName[pt]=Publicação no Ecrã
+GenericName[pt_BR]=Publicação do Ambiente de Trabalho
+GenericName[ru]=Настольное издательство
+GenericName[sl]=Namizno založništvo
+GenericName[sr]=Стоно издаваштво
+GenericName[ss]=Kushicelela ku desktop
+GenericName[sv]=Dáhtaprentenprográmma
+GenericName[th]=เดสก์ทอปพับลิชชิง
+GenericName[tr]=Desktop Yayıncılık
+GenericName[uk]=Видавнича система
+GenericName[uz]=Кичик нашриёт
+GenericName[ve]=U andadza Desikithopo
+GenericName[xh]=Upapasho lwe Desktop
+GenericName[zh_CN]=桌面出版
+GenericName[zh_TW]=桌面出版
+GenericName[zu]=Ukushicilelwa kwe-Desktop
+FilePattern=scribus
+TryExec=scribus
+Exec=scribus %f
+MimeType=application/x-scribus
+Terminal=false
+Icon=scribusicon.png
+Type=Application
+X-StandardInstall=false
+Categories=Qt;Office;X-Misc;
+StartupWMClass=scribus
+X-KDE-SubstituteUID=false
+X-KDE-Username=
+# vi: encoding=utf-8
Scribus - Open Source Desktop Publishing
This page took 0.13587 seconds and 4 git commands to generate.