← Back to branch summary

~ubuntu-branches/ubuntu/wily/scribus/wily-proposed

« back to all changes in this revision

Viewing changes to scribus/colorsetmanager.cpp

  • Committer: Package Import Robot
  • Author(s): Oleksandr Moskalenko
  • Date: 2012-02-09 21:50:56 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120209215056-2wrx1ara0jbm7fi5
Tags: 1.4.0.dfsg+r17287-1
http://bugs.debian.org/654703
http://bugs.debian.org/655885
http://bugs.debian.org/630751
* New upstream stable release upload into Debian (Closes: #654703).
* Applied the Ubuntu armel patch.
* Removed non-free color swatches from resources.
* debian/control:
  - Moved icc-profiles from Recommends to Suggests (Closes: #655885).
  - Updated Standards-Version to 3.9.2.
  - Updated extended description per lintian warning.
* debian/rules:
  - Update mailcap (Closes: #630751). A request for mime.types update has
    been sent to the mime-support maintainer.
  - Added build-arch and build-indep targets per lintian warning.
* debian/patches:
  - top_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't install the non-free "doc" dir.
  - profiles_cmakelists.patch - don't install non-free sRGB profile.
* debian/copyright: 
  - Converted to the DEP5 machine readable foramt.
  - Added licenses for free color swatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/colorsetmanager.cpp
29
29
 
30
30
void ColorSetManager::initialiseDefaultPrefs(struct ApplicationPrefs& appPrefs)
31
31
{
32
 
        QString pfadC = ScPaths::instance().libDir()+"swatches/";
 
32
        QString pfadC = ScPaths::instance().shareDir()+"swatches/";
33
33
        QString pfadC2 = pfadC + "Scribus_Basic.xml";
34
34
        QFile fiC(pfadC2);
35
35
        if (!fiC.exists())
113
113
{
114
114
        paletteLocations.clear();
115
115
        QStringList locations=ScPaths::instance().getSystemCreateSwatchesDirs();
116
 
        locations << ScPaths::instance().libDir()+"swatches/";
 
116
        locations << ScPaths::instance().shareDir()+"swatches/";
117
117
        locations << ScPaths::getApplicationDataDir() + "swatches/locked/";
118
118
        locations << ScPaths::getApplicationDataDir() + "swatches/";
119
119
        for ( QStringList::Iterator it = locations.begin(); it != locations.end(); ++it )