Le jeudi 06 janvier 2011 à 15:21 +0100, Jonas Smedegaard a écrit :
> On Thu, Jan 06, 2011 at 10:13:11AM +0100, Alban Browaeys wrote:
> >Since I rebuild gs 9 with a copy of ijs sources into the gs 9 soource 
> >tree printing works well with at least hp printers. I had issues with 
> >both ijs driver (printing only ijs driver not found) and cups driver 
> >failing print properly.
> >
> >From a first look at the gs 9 build system it is unable to find an 
> >external ijs library, only either use an ijs subdir in it sources or no 
> >ijs is built.
> >
> >Should I make a patch for the build system ? or is it an upstream 
> >switch to require ijs in tree and the packaging need to adapt ?
> 
> A patch would be nice indeed.

Here is an initial patch (I will be away for a week). It let ijs driver
works well at least for hp printers. For cups hp backend I found out
that I still had the colors inverted though the rebuild of hplip against
gs9 indeed help to get rid of the device communication errros. So the
cups backend was only indirectly affected, ie due to me rebuilding it
with my copy of gs9.



>From 75f40fc57bf8a5b70fe6c36ce9c8db41474ba30d Mon Sep 17 00:00:00 2001
From: Alban Browaeys <pra...@yahoo.com>
Date: Fri, 14 Jan 2011 17:44:49 +0100
Subject: [PATCH] Initial support for ijs system libraries.

This will break builtin ijs support, due to a late change in
base/gdevijs.c to avoid ugly glue. I decided to use proper system
includes instead of those used for builtin.
This needs to be fixed.

Next there is the override in debian/rules about ijs system library
names which uses a versioning scheme not supported by d-shlibmove,
ie -0.35.so instead of .so.0.35.

Finally I changed the upstream md5 sum for upstream gs9 . The upstream 
repository
advertise another sum . I don't know why.
---
 debian/control                       |    1 +
 debian/patches/1010_system-ijs.patch |  164 ++++++++++++++++++++++++++++++++++
 debian/patches/series                |    1 +
 debian/rules                         |    4 +-
 4 files changed, 169 insertions(+), 1 deletions(-)
 create mode 100644 debian/patches/1010_system-ijs.patch

diff --git a/debian/control b/debian/control
index 7bde05e..f9de1e8 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends: cdbs (>= 0.4.70~),
  libjasper-dev,
  libtiff-dev,
  libexpat-dev,
+ libijs-dev,
  libjbig2dec-dev,
  liblcms-dev,
  libcups2-dev (>= 1.3.7),
diff --git a/debian/patches/1010_system-ijs.patch 
b/debian/patches/1010_system-ijs.patch
new file mode 100644
index 0000000..d604a47
--- /dev/null
+++ b/debian/patches/1010_system-ijs.patch
@@ -0,0 +1,164 @@
+Description: initial support for linking against ijs system wide.
+Author: Alban Browaeys <pra...@yahoo.com>
+Bug-Debian: http://bugs.debian.org/609098
+Last-Update: 2011-01-14
+--- a/base/unix-dll.mak
++++ b/base/unix-dll.mak
+@@ -107,7 +107,7 @@ so: SODIRS
+                 $(GLOBJDIR)/$(SOOBJRELDIR)/echogs$(XEAUX) 
$(GLOBJDIR)/$(SOOBJRELDIR)/genarch$(XEAUX)
+       $(MAKE) $(SODEFS) LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)' 
CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' \
+                 prefix=$(prefix)
+-      $(MAKE) $(SODEFS) LDFLAGS='$(LDFLAGS)' CFLAGS='$(CFLAGS_STANDARD) 
$(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX)
++      $(MAKE) $(SODEFS) LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)' 
CFLAGS='$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) 
$(GSSOX)
+ 
+ # Debug shared object
+ # Note that this is in the same directory as the normal shared
+--- a/base/Makefile.in
++++ b/base/Makefile.in
+@@ -248,8 +248,11 @@ LCMSSRCDIR=lcms
+ # and the process forking method to use for the server.
+ # See ijs.mak for more information.
+  
++SHARE_IJS=@SHARE_IJS@
+ IJSSRCDIR=@IJSDIR@
+ IJSEXECTYPE=unix
++IJS_CFLAGS=@IJS_CFLAGS@
++IJS_LIBS=@IJS_LIBS@
+ 
+ # Define the directory where the imdi library source is stored.
+ # See devs.mak for more information.
+@@ -325,7 +328,7 @@ LDFLAGS=@LDFLAGS@ $(XLDFLAGS)
+ # Solaris may need -lnsl -lsocket -lposix4.
+ # (Libraries required by individual drivers are handled automatically.)
+ 
+-EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@
++EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @IJS_LIBS@
+ 
+ # Define the standard libraries to search at the end of linking.
+ # Most platforms require -lpthread for the POSIX threads library;
+--- a/base/configure.ac
++++ b/base/configure.ac
+@@ -668,18 +668,37 @@ AC_ARG_WITH([ijs], AC_HELP_STRING([--wit
+ dnl set safe defaults
+     IJSDIR=src
+     IJSDEVS=''
++    IJS_CFLAGS=""
++    IJS_LIBS=""
++    SHARE_IJS=0
+ if test x$with_ijs != xno; then
+     AC_MSG_CHECKING([for local ijs library source])
+     if test -d ijs; then
+         AC_MSG_RESULT([yes])
+         IJSDIR=ijs
+         IJSDEVS='$(DD)ijs.dev'
++      SHARE_IJS=0
+     else
+-        AC_MSG_RESULT([no])
++      AC_MSG_RESULT([no])
++      if test "x$PKGCONFIG" != x; then
++        AC_MSG_CHECKING(for system ijs with pkg-config)
++        if $PKGCONFIG --exists ijs; then
++            AC_MSG_RESULT(yes)
++            IJSDEVS='$(DD)ijs.dev'
++            IJS_CFLAGS="$CFLAGS `$PKGCONFIG --cflags ijs`"
++            IJS_LIBS="`$PKGCONFIG --libs ijs`"
++            SHARE_IJS=1
++        else
++            AC_MSG_RESULT(no)
++        fi
++      fi
+     fi
+ fi
++AC_SUBST(SHARE_IJS)
+ AC_SUBST(IJSDIR)
+ AC_SUBST(IJSDEVS)
++AC_SUBST(IJS_CFLAGS)
++AC_SUBST(IJS_LIBS)
+ 
+ dnl look for jbig2dec
+ AC_ARG_WITH([jbig2dec], AC_HELP_STRING([--without-jbig2dec],
+--- a/base/ijs.mak
++++ b/base/ijs.mak
+@@ -51,15 +51,28 @@ ijs.config-clean :
+ 
+ IJSDEP=$(AK)
+ 
+-ijslib_=$(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_server.$(OBJ) \
++ijslib_1=""
++ijslib_0_=$(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_server.$(OBJ) \
+     $(IJSOBJ)ijs_client.$(OBJ) $(IJSOBJ)ijs_exec_$(IJSEXECTYPE).$(OBJ)
+-$(IJSGEN)ijslib.dev : $(IJS_MAK) $(ECHOGS_XE) $(ijslib_)
+-      $(SETMOD) $(IJSGEN)ijslib $(ijslib_)
+ 
+-ijs_h=$(IJSSRC)ijs.h
++$(IJSGEN)ijslib.dev : $(IJS_MAK) $(IJSGEN)freetype_$(SHARE_IJS).dev
+ 
+-ijs_client_h=$(IJSSRC)$(D)ijs_client.h
+-ijs_server_h=$(IJSSRC)$(D)ijs_server.h
++$(IJSGEN)ijslib_1.dev : $(IJS_MAK) $(ECHOGS_XE)
++      $(SETMOD) $(IJSGEN)ijslib_1 -link $(IJS_LIBS)
++
++$(IJSGEN)ijslib_0.dev : $(IJS_MAK) $(ECHOGS_XE) $(ijslib_)
++      $(SETMOD) $(IJSGEN)ijslib_0 $(ijslib_)
++
++ijs_h: ijs_$(SHARE_IJS)_h
++ijs_1_h=""
++ijs_0_h=$(IJSSRC)ijs.h
++
++ijs_client_h: ijs_client_$(SHARE_IJS)_h
++ijs_client_1_h=""
++ijs_client_0_h=$(IJSSRC)$(D)ijs_client.h
++ijs_server_h: ijs_server_$(SHARE_IJS)_h
++ijs_server_1_h=
++ijs_server_0_h=$(IJSSRC)$(D)ijs_server.h
+ 
+ $(IJSOBJ)ijs.$(OBJ) : $(IJSSRC)ijs.c $(IJSDEP) $(ijs_h)
+ #     echo $(IJS_CCFLAGS)
+--- a/base/gdevijs.c
++++ b/base/gdevijs.c
+@@ -66,8 +66,8 @@
+ #include <fcntl.h>
+ #include "gdevprn.h"
+ #include "gp.h"
+-#include "ijs.h"
+-#include "ijs_client.h"
++#include "ijs/ijs.h"
++#include "ijs/ijs_client.h"
+ 
+ #if 0
+ #define KRGB_DEBUG
+--- a/base/gs.mak
++++ b/base/gs.mak
+@@ -318,8 +318,7 @@ ICCF_=
+ ICCCF_=
+ IJSI_=$(IJSSRCDIR)
+ IJSF_=
+-# Currently there is no option for sharing ijs.
+-IJSCF_=
++IJSCF_=$(IJS_CFLAGS)
+ JI_=$(JSRCDIR)
+ JF_=
+ JCF_=$(D_)SHARE_JPEG=$(SHARE_JPEG)$(_D)
+--- a/base/devs.mak
++++ b/base/devs.mak
+@@ -650,15 +650,16 @@ $(GLOBJ)gdevlj56.$(OBJ) : $(GLSRC)gdevlj
+ 
+ ### -------------------- The ijs client ----------------- ###
+ 
+-ijs_=$(GLOBJ)gdevijs.$(OBJ) $(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_client.$(OBJ) \
++ijs_0_=$(GLOBJ)gdevijs.$(OBJ) $(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_client.$(OBJ) \
+  $(IJSOBJ)ijs_exec_$(IJSEXECTYPE).$(OBJ)
++ijs_1_=$(GLOBJ)gdevijs.$(OBJ)
+ 
+-$(DD)ijs.dev : $(ijs_) $(GLD)page.dev $(DD)ijslib.dev
+-      $(SETPDEV) $(DD)ijs $(ijs_)
++$(DD)ijs.dev : $(ijs_$(SHARE_IJS)_) $(GLD)page.dev $(DD)ijslib.dev
++      $(SETPDEV) $(DD)ijs $(ijs_$(SHARE_IJS)_)
+ 
+ $(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) $(unistd__h) $(gp_h)\
+  $(ijs_h) $(ijs_client_h)
+-      $(CC_) $(I_)$(GLI_) $(II)$(IJSI_)$(_I) $(GLF_) $(GLO_)gdevijs.$(OBJ) 
$(C_) $(GLSRC)gdevijs.c
++      $(CC_) $(I_)$(GLI_) $(II)$(IJSI_)$(_I) $(IJSCF_) $(GLF_) 
$(GLO_)gdevijs.$(OBJ) $(C_) $(GLSRC)gdevijs.c
+ 
+ # Please see ijs.mak for the Makefile fragment which builds the IJS
+ # library.
diff --git a/debian/patches/series b/debian/patches/series
index d67fc91..ede8c00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,5 +12,6 @@
 1007_fix_pphs_script_not_lib.patch
 1008_CVE-2009-4270.patch
 1009_fix-build-of-executables.patch
+1010_system-ijs.patch
 2001_docdir_fix_for_debian.patch
 2002_gs_man_fix_debian.patch
diff --git a/debian/rules b/debian/rules
index c4f485e..3d7c30b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,8 @@ libname = libgs
 libpkgname = $(libname)$(major)
 
 DEB_UPSTREAM_URL = http://ghostscript.com/releases
-DEB_UPSTREAM_TARBALL_MD5 = 43d71a8e4d78ac99da10d3fb60f8fdbb
+#DEB_UPSTREAM_TARBALL_MD5 = 43d71a8e4d78ac99da10d3fb60f8fdbb
+DEB_UPSTREAM_TARBALL_MD5 = a402462478b4cdda3e1816899227b845
 
 # Non-DFSG license limited to verbatim copying
 DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./Resource/CMap/90ms-RKSJ-UCS2 \
@@ -209,6 +210,7 @@ debian/stamp-local-shlibs-$(libname): 
binary-install/$(libpkgname)
                --override s/libstdc++6.*-dev// \
                --override s/libgnutls26/libgnutls/ \
                --override s/libjasper1/libjasper/ \
+               --override s/libijs-0.35.solibijs-0.35.so/libijs/ \
                --override s/libpaper1/libpaper/ \
                --devunversioned --ignorelibdep \
                --movedev "debian/tmp/usr/include/*" usr/include/ \
-- 
1.7.2.3



>From 75f40fc57bf8a5b70fe6c36ce9c8db41474ba30d Mon Sep 17 00:00:00 2001
From: Alban Browaeys <pra...@yahoo.com>
Date: Fri, 14 Jan 2011 17:44:49 +0100
Subject: [PATCH] Initial support for ijs system libraries.

This will break builtin ijs support, due to a late change in
base/gdevijs.c to avoid ugly glue. I decided to use proper system
includes instead of those used for builtin.
This needs to be fixed.

Next there is the override in debian/rules about ijs system library
names which uses a versioning scheme not supported by d-shlibmove,
ie -0.35.so instead of .so.0.35.

Finally I changed the upstream md5 sum for upstream gs9 . The upstream 
repository
advertise another sum . I don't know why.
---
 debian/control                       |    1 +
 debian/patches/1010_system-ijs.patch |  164 ++++++++++++++++++++++++++++++++++
 debian/patches/series                |    1 +
 debian/rules                         |    4 +-
 4 files changed, 169 insertions(+), 1 deletions(-)
 create mode 100644 debian/patches/1010_system-ijs.patch

diff --git a/debian/control b/debian/control
index 7bde05e..f9de1e8 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends: cdbs (>= 0.4.70~),
  libjasper-dev,
  libtiff-dev,
  libexpat-dev,
+ libijs-dev,
  libjbig2dec-dev,
  liblcms-dev,
  libcups2-dev (>= 1.3.7),
diff --git a/debian/patches/1010_system-ijs.patch 
b/debian/patches/1010_system-ijs.patch
new file mode 100644
index 0000000..d604a47
--- /dev/null
+++ b/debian/patches/1010_system-ijs.patch
@@ -0,0 +1,164 @@
+Description: initial support for linking against ijs system wide.
+Author: Alban Browaeys <pra...@yahoo.com>
+Bug-Debian: http://bugs.debian.org/609098
+Last-Update: 2011-01-14
+--- a/base/unix-dll.mak
++++ b/base/unix-dll.mak
+@@ -107,7 +107,7 @@ so: SODIRS
+                 $(GLOBJDIR)/$(SOOBJRELDIR)/echogs$(XEAUX) 
$(GLOBJDIR)/$(SOOBJRELDIR)/genarch$(XEAUX)
+       $(MAKE) $(SODEFS) LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)' 
CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' \
+                 prefix=$(prefix)
+-      $(MAKE) $(SODEFS) LDFLAGS='$(LDFLAGS)' CFLAGS='$(CFLAGS_STANDARD) 
$(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX)
++      $(MAKE) $(SODEFS) LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)' 
CFLAGS='$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) 
$(GSSOX)
+ 
+ # Debug shared object
+ # Note that this is in the same directory as the normal shared
+--- a/base/Makefile.in
++++ b/base/Makefile.in
+@@ -248,8 +248,11 @@ LCMSSRCDIR=lcms
+ # and the process forking method to use for the server.
+ # See ijs.mak for more information.
+  
++SHARE_IJS=@SHARE_IJS@
+ IJSSRCDIR=@IJSDIR@
+ IJSEXECTYPE=unix
++IJS_CFLAGS=@IJS_CFLAGS@
++IJS_LIBS=@IJS_LIBS@
+ 
+ # Define the directory where the imdi library source is stored.
+ # See devs.mak for more information.
+@@ -325,7 +328,7 @@ LDFLAGS=@LDFLAGS@ $(XLDFLAGS)
+ # Solaris may need -lnsl -lsocket -lposix4.
+ # (Libraries required by individual drivers are handled automatically.)
+ 
+-EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@
++EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @IJS_LIBS@
+ 
+ # Define the standard libraries to search at the end of linking.
+ # Most platforms require -lpthread for the POSIX threads library;
+--- a/base/configure.ac
++++ b/base/configure.ac
+@@ -668,18 +668,37 @@ AC_ARG_WITH([ijs], AC_HELP_STRING([--wit
+ dnl set safe defaults
+     IJSDIR=src
+     IJSDEVS=''
++    IJS_CFLAGS=""
++    IJS_LIBS=""
++    SHARE_IJS=0
+ if test x$with_ijs != xno; then
+     AC_MSG_CHECKING([for local ijs library source])
+     if test -d ijs; then
+         AC_MSG_RESULT([yes])
+         IJSDIR=ijs
+         IJSDEVS='$(DD)ijs.dev'
++      SHARE_IJS=0
+     else
+-        AC_MSG_RESULT([no])
++      AC_MSG_RESULT([no])
++      if test "x$PKGCONFIG" != x; then
++        AC_MSG_CHECKING(for system ijs with pkg-config)
++        if $PKGCONFIG --exists ijs; then
++            AC_MSG_RESULT(yes)
++            IJSDEVS='$(DD)ijs.dev'
++            IJS_CFLAGS="$CFLAGS `$PKGCONFIG --cflags ijs`"
++            IJS_LIBS="`$PKGCONFIG --libs ijs`"
++            SHARE_IJS=1
++        else
++            AC_MSG_RESULT(no)
++        fi
++      fi
+     fi
+ fi
++AC_SUBST(SHARE_IJS)
+ AC_SUBST(IJSDIR)
+ AC_SUBST(IJSDEVS)
++AC_SUBST(IJS_CFLAGS)
++AC_SUBST(IJS_LIBS)
+ 
+ dnl look for jbig2dec
+ AC_ARG_WITH([jbig2dec], AC_HELP_STRING([--without-jbig2dec],
+--- a/base/ijs.mak
++++ b/base/ijs.mak
+@@ -51,15 +51,28 @@ ijs.config-clean :
+ 
+ IJSDEP=$(AK)
+ 
+-ijslib_=$(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_server.$(OBJ) \
++ijslib_1=""
++ijslib_0_=$(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_server.$(OBJ) \
+     $(IJSOBJ)ijs_client.$(OBJ) $(IJSOBJ)ijs_exec_$(IJSEXECTYPE).$(OBJ)
+-$(IJSGEN)ijslib.dev : $(IJS_MAK) $(ECHOGS_XE) $(ijslib_)
+-      $(SETMOD) $(IJSGEN)ijslib $(ijslib_)
+ 
+-ijs_h=$(IJSSRC)ijs.h
++$(IJSGEN)ijslib.dev : $(IJS_MAK) $(IJSGEN)freetype_$(SHARE_IJS).dev
+ 
+-ijs_client_h=$(IJSSRC)$(D)ijs_client.h
+-ijs_server_h=$(IJSSRC)$(D)ijs_server.h
++$(IJSGEN)ijslib_1.dev : $(IJS_MAK) $(ECHOGS_XE)
++      $(SETMOD) $(IJSGEN)ijslib_1 -link $(IJS_LIBS)
++
++$(IJSGEN)ijslib_0.dev : $(IJS_MAK) $(ECHOGS_XE) $(ijslib_)
++      $(SETMOD) $(IJSGEN)ijslib_0 $(ijslib_)
++
++ijs_h: ijs_$(SHARE_IJS)_h
++ijs_1_h=""
++ijs_0_h=$(IJSSRC)ijs.h
++
++ijs_client_h: ijs_client_$(SHARE_IJS)_h
++ijs_client_1_h=""
++ijs_client_0_h=$(IJSSRC)$(D)ijs_client.h
++ijs_server_h: ijs_server_$(SHARE_IJS)_h
++ijs_server_1_h=
++ijs_server_0_h=$(IJSSRC)$(D)ijs_server.h
+ 
+ $(IJSOBJ)ijs.$(OBJ) : $(IJSSRC)ijs.c $(IJSDEP) $(ijs_h)
+ #     echo $(IJS_CCFLAGS)
+--- a/base/gdevijs.c
++++ b/base/gdevijs.c
+@@ -66,8 +66,8 @@
+ #include <fcntl.h>
+ #include "gdevprn.h"
+ #include "gp.h"
+-#include "ijs.h"
+-#include "ijs_client.h"
++#include "ijs/ijs.h"
++#include "ijs/ijs_client.h"
+ 
+ #if 0
+ #define KRGB_DEBUG
+--- a/base/gs.mak
++++ b/base/gs.mak
+@@ -318,8 +318,7 @@ ICCF_=
+ ICCCF_=
+ IJSI_=$(IJSSRCDIR)
+ IJSF_=
+-# Currently there is no option for sharing ijs.
+-IJSCF_=
++IJSCF_=$(IJS_CFLAGS)
+ JI_=$(JSRCDIR)
+ JF_=
+ JCF_=$(D_)SHARE_JPEG=$(SHARE_JPEG)$(_D)
+--- a/base/devs.mak
++++ b/base/devs.mak
+@@ -650,15 +650,16 @@ $(GLOBJ)gdevlj56.$(OBJ) : $(GLSRC)gdevlj
+ 
+ ### -------------------- The ijs client ----------------- ###
+ 
+-ijs_=$(GLOBJ)gdevijs.$(OBJ) $(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_client.$(OBJ) \
++ijs_0_=$(GLOBJ)gdevijs.$(OBJ) $(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_client.$(OBJ) \
+  $(IJSOBJ)ijs_exec_$(IJSEXECTYPE).$(OBJ)
++ijs_1_=$(GLOBJ)gdevijs.$(OBJ)
+ 
+-$(DD)ijs.dev : $(ijs_) $(GLD)page.dev $(DD)ijslib.dev
+-      $(SETPDEV) $(DD)ijs $(ijs_)
++$(DD)ijs.dev : $(ijs_$(SHARE_IJS)_) $(GLD)page.dev $(DD)ijslib.dev
++      $(SETPDEV) $(DD)ijs $(ijs_$(SHARE_IJS)_)
+ 
+ $(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) $(unistd__h) $(gp_h)\
+  $(ijs_h) $(ijs_client_h)
+-      $(CC_) $(I_)$(GLI_) $(II)$(IJSI_)$(_I) $(GLF_) $(GLO_)gdevijs.$(OBJ) 
$(C_) $(GLSRC)gdevijs.c
++      $(CC_) $(I_)$(GLI_) $(II)$(IJSI_)$(_I) $(IJSCF_) $(GLF_) 
$(GLO_)gdevijs.$(OBJ) $(C_) $(GLSRC)gdevijs.c
+ 
+ # Please see ijs.mak for the Makefile fragment which builds the IJS
+ # library.
diff --git a/debian/patches/series b/debian/patches/series
index d67fc91..ede8c00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,5 +12,6 @@
 1007_fix_pphs_script_not_lib.patch
 1008_CVE-2009-4270.patch
 1009_fix-build-of-executables.patch
+1010_system-ijs.patch
 2001_docdir_fix_for_debian.patch
 2002_gs_man_fix_debian.patch
diff --git a/debian/rules b/debian/rules
index c4f485e..3d7c30b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,8 @@ libname = libgs
 libpkgname = $(libname)$(major)
 
 DEB_UPSTREAM_URL = http://ghostscript.com/releases
-DEB_UPSTREAM_TARBALL_MD5 = 43d71a8e4d78ac99da10d3fb60f8fdbb
+#DEB_UPSTREAM_TARBALL_MD5 = 43d71a8e4d78ac99da10d3fb60f8fdbb
+DEB_UPSTREAM_TARBALL_MD5 = a402462478b4cdda3e1816899227b845
 
 # Non-DFSG license limited to verbatim copying
 DEB_UPSTREAM_REPACKAGE_EXCLUDES += ./Resource/CMap/90ms-RKSJ-UCS2 \
@@ -209,6 +210,7 @@ debian/stamp-local-shlibs-$(libname): 
binary-install/$(libpkgname)
                --override s/libstdc++6.*-dev// \
                --override s/libgnutls26/libgnutls/ \
                --override s/libjasper1/libjasper/ \
+               --override s/libijs-0.35.solibijs-0.35.so/libijs/ \
                --override s/libpaper1/libpaper/ \
                --devunversioned --ignorelibdep \
                --movedev "debian/tmp/usr/include/*" usr/include/ \
-- 
1.7.2.3

Reply via email to