← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/fixes_cups1.5.patch

  • 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:
debian/patches/fixes_cups1.5.patch
1
 
From: Ana Guerrero <ana@debian.org>
2
 
Bug-Debian: http://bugs.debian.org/639031
3
 
Subject: fixes with cups 1.5
4
 
 
5
 
--- a/scribus/cupsoptions.cpp
6
 
+++ b/scribus/cupsoptions.cpp
7
 
@@ -42,6 +42,7 @@ for which a new license (GPL+exception)
8
 
 #include "scconfig.h"
9
 
 #ifdef HAVE_CUPS
10
 
 #include <cups/cups.h>
11
 
+#include <cups/ppd.h>
12
 
 #endif
13
 
 #include "util_icon.h"
14
 
 
15
 
--- a/scribus/util_printer.cpp
16
 
+++ b/scribus/util_printer.cpp
17
 
@@ -9,6 +9,7 @@ for which a new license (GPL+exception)
18
 
 
19
 
 #if defined( HAVE_CUPS )
20
 
  #include <cups/cups.h>
21
 
+ #include <cups/ppd.h>
22
 
 #elif defined(_WIN32)
23
 
  #include <windows.h>
24
 
  #include <winspool.h>