tag 285347 pending tag 289501 pending tag 346993 pending thanks Hello,
I've uploaded a NMU to fix this bug to DELAYED/14-day, the diff is
attached. Please let me know if you see any problems with the packages
I prepared. As always, a maintainer upload within the following 14
days will supersede this upload.
Cheers,
--
Adeodato Simó dato at net.com.org.es
Debian Developer adeodato at debian.org
There is no man so good who, were he to submit all his thoughts to the
laws, would not deserve hanging ten times in his life.
-- Michel de Montaigne
diff -u gs-afpl-8.14/debian/changelog gs-afpl-8.53/debian/changelog
--- gs-afpl-8.14/debian/changelog
+++ gs-afpl-8.53/debian/changelog
@@ -1,3 +1,28 @@
+gs-afpl (8.53-0.1) unstable; urgency=low
+
+ * NMU. (DELAYED/14-day)
+
+ * New upstream release packaged. (Closes: #285347, #289501)
+ + dropped hunks of the .diff.gz that patched files out of debian
+ (configure, src/gdevijs.c): already present in the 8.53 tarball.
+ + re-diffed first hunk of 03_libpaper_support.dpatch.
+ + update gs-common dependency to (>= 0.3.9).
+ + added 07_no_internal_libraries.dpatch to prevent configure from using
+ internal copies of libjasper, libjpeg, libpng, and zlib, which the
+ tarball now includes.
+ + update debian/links to create them in the gs-afpl/8.53 directory.
+
+ * Build-Depends adjustments:
+ + replace xlibs-dev with libx11-dev, libxt-dev, x-dev. (Closes: #346993)
+ + replace virtual build-depends provided by only one package with the real
+ package; add automake1.9 as a first option for automaken.
+ + add build-dependency on libjasper-1.701-dev.
+
+ * Enable ps2write, at Steinar H. Gunderson's request.
+ [08_enable_ps2write.dpatch]
+
+ -- Adeodato Simó <[EMAIL PROTECTED]> Sat, 21 Jan 2006 17:30:37 +0100
+
gs-afpl (8.14-3.1) unstable; urgency=low
* src/gdevijs.c added "dci.max_components = components;"
diff -u gs-afpl-8.14/debian/control gs-afpl-8.53/debian/control
--- gs-afpl-8.14/debian/control
+++ gs-afpl-8.53/debian/control
@@ -2,7 +2,7 @@
Section: non-free/text
Priority: optional
Maintainer: Masayuki Hatta (mhatta) <[EMAIL PROTECTED]>
-Build-Depends: autoconf, automaken, debhelper (>= 4.0.0), dpatch, libjpeg-dev,
libpaper-dev, libpng-dev, libz-dev, xlibs-dev
+Build-Depends: autoconf, automake1.9 | automaken, debhelper (>= 4.0.0),
dpatch, libjasper-1.701-dev, libjpeg62-dev, libpaper-dev, libpng12-dev,
zlib1g-dev, libx11-dev, libxt-dev, x-dev
Standards-Version: 3.6.1
Uploaders: Torsten Landschoff <[EMAIL PROTECTED]>
@@ -12,7 +12,7 @@
Replaces: gs (<< 8.01), gs-aladdin (<< 8.14), gs-pdfencrypt (<< 7.00)
Provides: gs, gs-aladdin, gs-pdfencrypt, postscript-viewer
Recommends: gsfonts (>= 6.0-1), psfontmgr
-Depends: ${shlibs:Depends}, gs-common (>= 0.2)
+Depends: ${shlibs:Depends}, gs-common (>= 0.3.9)
Description: The AFPL Ghostscript PostScript interpreter
This version is released under AFPL, not GNU GPL. See
/usr/share/doc/gs-afpl/copyright for detail.
diff -u gs-afpl-8.14/debian/links gs-afpl-8.53/debian/links
--- gs-afpl-8.14/debian/links
+++ gs-afpl-8.53/debian/links
@@ -1,4 +1,4 @@
-etc/gs-afpl/FAPIcidfmap usr/share/gs-afpl/8.14/lib/FAPIcidfmap
-etc/gs-afpl/FAPIfontmap usr/share/gs-afpl/8.14/lib/FAPIfontmap
-etc/gs-afpl/Fontmap usr/share/gs-afpl/8.14/lib/Fontmap
-etc/gs-afpl/cidfmap usr/share/gs-afpl/8.14/lib/cidfmap
+etc/gs-afpl/FAPIcidfmap usr/share/gs-afpl/8.53/lib/FAPIcidfmap
+etc/gs-afpl/FAPIfontmap usr/share/gs-afpl/8.53/lib/FAPIfontmap
+etc/gs-afpl/Fontmap usr/share/gs-afpl/8.53/lib/Fontmap
+etc/gs-afpl/cidfmap usr/share/gs-afpl/8.53/lib/cidfmap
diff -u gs-afpl-8.14/debian/patches/03_libpaper_support.dpatch
gs-afpl-8.53/debian/patches/03_libpaper_support.dpatch
--- gs-afpl-8.14/debian/patches/03_libpaper_support.dpatch
+++ gs-afpl-8.53/debian/patches/03_libpaper_support.dpatch
@@ -22,11 +22,10 @@
diff -urN gs-afpl-8.14.orig/lib/gs_init.ps gs-afpl-8.14/lib/gs_init.ps
--- gs-afpl-8.14.orig/lib/gs_init.ps 2003-11-21 04:29:12.000000000 +0900
+++ gs-afpl-8.14/lib/gs_init.ps 2004-03-24 14:57:02.000000000 +0900
-@@ -64,7 +64,13 @@
- systemdict /.languagelevel known not { /.languagelevel 1 def } if
-
- % Optionally choose a default paper size other than U.S. letter.
--% (a4) /PAPERSIZE where { pop pop } { /PAPERSIZE exch def } ifelse
+@@ -73,6 +73,13 @@
+ % devices that default to letter or A4 can be changed by setting
+ % DEFAULTPAPERSIZE.
+ % /DEFAULTPAPERSIZE (a4) def
+% Debian: Libpaper's default is in DEFPAPERSIZE; use that if the
+% current device is not "cups".
+currentdict /DEFPAPERSIZE known
diff -u gs-afpl-8.14/debian/patches/00list gs-afpl-8.53/debian/patches/00list
--- gs-afpl-8.14/debian/patches/00list
+++ gs-afpl-8.53/debian/patches/00list
@@ -6,0 +7,2 @@
+07_no_internal_libraries
+08_enable_ps2write
--- gs-afpl-8.53.orig/debian/patches/07_no_internal_libraries.dpatch
+++ gs-afpl-8.53/debian/patches/07_no_internal_libraries.dpatch
@@ -0,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_no_internal_jasper.dpatch by Adeodato Simó <[EMAIL PROTECTED]>
+
[EMAIL PROTECTED]@
+--- gs-afpl-8.53.orig/src/configure.ac 2005-07-15 07:23:42.000000000 +0200
++++ gs-afpl-8.53/src/configure.ac 2006-01-21 15:54:31.000000000 +0100
+@@ -161,11 +161,11 @@
+ dnl A more sophisticated approach would be to test the shared lib
+ dnl to see whether it has already been patched.
+ LIBJPEGDIR=src
+-if test -f jpeg/jpeglib.h; then
++if test -f jpeg_disabled/jpeglib.h; then
+ AC_MSG_RESULT([jpeg])
+ SHARE_LIBJPEG=0
+ LIBJPEGDIR=jpeg
+-elif test -f jpeg-6b/jpeglib.h; then
++elif test -f jpeg-6b_disabled/jpeglib.h; then
+ AC_MSG_RESULT([jpeg-6b])
+ SHARE_LIBJPEG=0
+ LIBJPEGDIR=jpeg-6b
+@@ -203,7 +203,7 @@
+ # we must define ZLIBDIR regardless because libpng.mak does a -I$(ZLIBDIR)
+ # this seems a harmless default
+ ZLIBDIR=src
+-if test -d zlib; then
++if test -d zlib_disabled; then
+ AC_MSG_RESULT([yes])
+ SHARE_ZLIB=0
+ ZLIBDIR=zlib
+@@ -228,7 +228,7 @@
+ PNGDEVS=''
+ PNGDEVS_ALL='$(DD)png48.dev $(DD)png16m.dev $(DD)pnggray.dev $(DD)pngmono.dev
$(DD)png256.dev $(DD)png16.dev $(DD)pngalpha.dev'
+ AC_MSG_CHECKING([for local png library source])
+-if test -f libpng/pngread.c; then
++if test -f libpng_disabled/pngread.c; then
+ AC_MSG_RESULT([yes])
+ SHARE_LIBPNG=0
+ LIBPNGDIR=libpng
+@@ -308,7 +308,7 @@
+ JPXDEVS=''
+ if test x$with_jasper != xno; then
+ AC_MSG_CHECKING([for local jasper library source])
+- for d in jasper jasper-1.7*; do
++ for d in jasper_disabled jasper-1.7_disabled; do
+ test -d "$d" && JASPERDIR=$d && break
+ done
+ if test "x$JASPERDIR" != xsrc; then
--- gs-afpl-8.53.orig/debian/patches/08_enable_ps2write.dpatch
+++ gs-afpl-8.53/debian/patches/08_enable_ps2write.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_enable_ps2write.dpatch by Adeodato Simó <[EMAIL PROTECTED]>
+
[EMAIL PROTECTED]@
+--- gs-afpl-8.53.orig/src/Makefile.in 2006-01-21 16:50:14.000000000 +0100
++++ gs-afpl-8.53/src/Makefile.in 2006-01-21 16:52:27.000000000 +0100
+@@ -379,7 +379,7 @@
+ #DEVICE_DEVS13=$(DD)pngmono.dev $(DD)pnggray.dev $(DD)png16.dev
$(DD)png256.dev $(DD)png16m.dev
+ [EMAIL PROTECTED]@
+ DEVICE_DEVS14=$(DD)jpeg.dev $(DD)jpeggray.dev
+-DEVICE_DEVS15=$(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)epswrite.dev
$(DD)pxlmono.dev $(DD)pxlcolor.dev
++DEVICE_DEVS15=$(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)ps2write.dev
$(DD)epswrite.dev $(DD)pxlmono.dev $(DD)pxlcolor.dev
+ DEVICE_DEVS16=$(DD)bbox.dev
+
+ DEVICE_DEVS17=
+--- gs-afpl-8.53.orig/src/unixinst.mak 2005-06-29 16:21:27.000000000 +0200
++++ gs-afpl-8.53/src/unixinst.mak 2006-01-21 17:15:16.000000000 +0100
+@@ -84,7 +84,7 @@
+ pdf2dsc.ps pdfopt.ps ;\
+ do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_DATA) $(PSLIBDIR)/$$f
$(gsdatadir)/lib; fi;\
+ done'
+- $(SH) -c 'for f in $(PSLIBDIR)/gs_*.ps $(PSLIBDIR)/pdf*.ps;\
++ $(SH) -c 'for f in $(PSLIBDIR)/gs_*.ps $(PSLIBDIR)/pdf*.ps
$(PSLIBDIR)/opdfread.ps;\
+ do $(INSTALL_DATA) $$f $(gsdatadir)/lib ;\
+ done'
+ $(SH) -c 'for f in $(PSLIBDIR)/*.ppd $(PSLIBDIR)/*.rpd
$(PSLIBDIR)/*.upp $(PSLIBDIR)/*.xbm $(PSLIBDIR)/*.xpm;\
reverted:
--- gs-afpl-8.14/src/gdevijs.c
+++ gs-afpl-8.14.orig/src/gdevijs.c
@@ -1075,7 +1075,6 @@
}
maxvalue = (1 << bpc) - 1;
- dci.max_components = components;
dci.num_components = components;
dci.depth = bpc * components;
dci.max_gray = maxvalue;
reverted:
--- gs-afpl-8.14/configure
+++ gs-afpl-8.14.orig/configure
@@ -6737,12 +6737,9 @@
+echo "$as_me:$LINENO: checking for X" >&5
-
-if test "x$ac_path_x_has_been_run" != xyes; then
- echo "$as_me:$LINENO: checking for X" >&5
echo $ECHO_N "checking for X... $ECHO_C" >&6
-ac_path_x_has_been_run=yes
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -6835,7 +6832,7 @@
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
+ # Guess where to find include files, by looking for Intrinsic.h.
- # Guess where to find include files, by looking for a specified header file.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -6969,15 +6966,10 @@
# Update the cache value to reflect the command line values.
ac_cv_have_x="have_x=yes \
ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+ echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes"
>&5
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
- # It might be that x_includes is empty (headers are found in the
- # standard search path. Then output the corresponding message
- ac_out_x_includes=$x_includes
- test "x$x_includes" = x && ac_out_x_includes="in standard search path"
- echo "$as_me:$LINENO: result: libraries $x_libraries, headers
$ac_out_x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
fi
-fi
if test "$no_x" = yes; then
# Not all programs may use this symbol, but it does not hurt to define it.
signature.asc
Description: Digital signature
