← Back to branch summary

~ubuntu-branches/debian/sid/scribus/sid

« back to all changes in this revision

Viewing changes to scribus/cmykfw.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/cmykfw.cpp
216
216
                realEx.clear();
217
217
                for (int m = 0; m < Cust.count(); ++m)
218
218
                {
219
 
                        QString Cpfad = QDir::convertSeparators( ScPaths::getApplicationDataDir() + Cust[m]);
 
219
                        QString Cpfad = QDir::toNativeSeparators( ScPaths::getApplicationDataDir() + Cust[m]);
220
220
                        QFileInfo cfi(Cpfad);
221
221
                        if (cfi.exists())
222
222
                        {
609
609
                        QString listText = Swatches->itemText(n);
610
610
                        listText.replace(" ", "_");
611
611
                        listText += ".xml";
612
 
                        pfadC2 = QDir::convertSeparators(ScPaths::getApplicationDataDir() + listText);
 
612
                        pfadC2 = QDir::toNativeSeparators(ScPaths::getApplicationDataDir() + listText);
613
613
                }
614
614
                if (n != 0)
615
615
                {