r17180 by craig - #10485 & 10486: Move swatches and profiles to share dir

[scribus-commit]

Author: craig
Date: Tue Jan  3 21:52:20 2012
New Revision: 17180

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17180
Log:
#10485 & 10486: Move swatches and profiles to share dir

Modified:
    trunk/Scribus/doc/en/color2.html
    trunk/Scribus/doc/it/color2.html
    trunk/Scribus/resources/profiles/CMakeLists.txt
    trunk/Scribus/resources/swatches/CMakeLists.txt
    trunk/Scribus/scribus/scribuscore.cpp

Modified: trunk/Scribus/doc/en/color2.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17180&path=/trunk/Scribus/doc/en/color2.html
==============================================================================
--- trunk/Scribus/doc/en/color2.html (original)
+++ trunk/Scribus/doc/en/color2.html Tue Jan  3 21:52:20 2012
@@ -22,7 +22,7 @@
 
 <h4>Linux/UNIX</h4>
 <p>If you have installed Scribus with a package management system like RPM, DEB or BSD Ports, the palette files need to be copied to either <code>/usr/lib/scribus/swatches</code> or <code>/usr/local/lib/scribus/swatches</code>. The respective location depends on the configuration of a distribution’s package manager.</p>
-<p>Those who compiled Scribus themselves need to copy the palette files to <code>installation_directory/lib/scribus/swatches</code>.</p>
+<p>Those who compiled Scribus themselves need to copy the palette files to <code>installation_directory/share/scribus/swatches</code>.</p>
 <p>If you don’t have root permissions, you can also copy the files to <code>/home/user_name/.scribus/swatches/locked</code>.</p>
 <p>You have to create the folder <code>locked</code> if doesn’t exist.</p>
 <h4>Mac OS X</h4>

Modified: trunk/Scribus/doc/it/color2.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17180&path=/trunk/Scribus/doc/it/color2.html
==============================================================================
--- trunk/Scribus/doc/it/color2.html (original)
+++ trunk/Scribus/doc/it/color2.html Tue Jan  3 21:52:20 2012
@@ -21,7 +21,7 @@
 
 <h4>Linux/UNIX:</h4>
 <p>Se avete installato Scribus per mezzo di un sistema di gestione dei pacchetti come RPM, DEB o BSD Ports, i file delle raccolte devono essere copiati in <code>/usr/lib/scribus/swatches</code> o <code>/usr/local/lib/scribus/swatches</code>. L'esatta posizione dipende dalla configurazione del gestore di pacchetti di ciascuna distribuzione.</p>
-<p>Se avete compilato Scribus personalmente dovete copiare i file delle raccolte in <code>installation_directory/lib/scribus/swatches</code>.</p>
+<p>Se avete compilato Scribus personalmente dovete copiare i file delle raccolte in <code>installation_directory/share/scribus/swatches</code>.</p>
 <p>Se non avete permessi di root, potete anche copiare i file in <code>/home/user_name/.scribus/swatches/locked</code>.</p>
 <p>Se la cartella <code>locked</code> non esiste, dovrete crearla.</p>
 <h4>Mac OS X</h4>

Modified: trunk/Scribus/resources/profiles/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17180&path=/trunk/Scribus/resources/profiles/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/profiles/CMakeLists.txt (original)
+++ trunk/Scribus/resources/profiles/CMakeLists.txt Tue Jan  3 21:52:20 2012
@@ -8,5 +8,5 @@
 Readme
 sRGB.icm
 srgb.license
-  DESTINATION ${LIBDIR}profiles
+  DESTINATION ${SHAREDIR}profiles
 )

Modified: trunk/Scribus/resources/swatches/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17180&path=/trunk/Scribus/resources/swatches/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/swatches/CMakeLists.txt (original)
+++ trunk/Scribus/resources/swatches/CMakeLists.txt Tue Jan  3 21:52:20 2012
@@ -11,5 +11,5 @@
 SET(TXT_LICENSES "${CMAKE_CURRENT_SOURCE_DIR}/COPYING_RESENE.txt" "${CMAKE_CURRENT_SOURCE_DIR}/Japanese_Traditional_README.txt")
 
 INSTALL(FILES ${GIMP_STYLE_PALETTES} ${XML_PALETTES} ${EPS_PALETTES} ${RTF_LICENSES} ${TXT_LICENSES}
- DESTINATION ${LIBDIR}swatches
+ DESTINATION ${SHAREDIR}swatches
 )

Modified: trunk/Scribus/scribus/scribuscore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17180&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp (original)
+++ trunk/Scribus/scribus/scribuscore.cpp Tue Jan  3 21:52:20 2012
@@ -336,7 +336,7 @@
 	PrinterProfiles.clear();
 	InputProfiles.clear();
 	InputProfilesCMYK.clear();
-	QString pfad = ScPaths::instance().libDir();
+	QString pfad = ScPaths::instance().shareDir();
 	pfad += "profiles/";
 	profDirs = ScPaths::getSystemProfilesDirs();
 	profDirs.prepend( prefsManager->appPrefs.pathPrefs.colorProfiles );