[Pkg-gmagick-svn-commit] r69 - in branches/experimental/debian: . patches
naoliv at alioth.debian.org
naoliv at alioth.debian.org
Fri Aug 22 13:56:28 UTC 2008
Author: naoliv
Date: 2008-08-22 13:56:27 +0000 (Fri, 22 Aug 2008)
New Revision: 69
Added:
branches/experimental/debian/README.source
Modified:
branches/experimental/debian/README.Debian
branches/experimental/debian/changelog
branches/experimental/debian/control
branches/experimental/debian/patches/readme-utf8.patch
branches/experimental/debian/rules
Log:
New upstream release;
Updated Standards-version;
Added README.source;
Added parallel building support.
Modified: branches/experimental/debian/README.Debian
===================================================================
--- branches/experimental/debian/README.Debian 2008-06-12 23:48:25 UTC (rev 68)
+++ branches/experimental/debian/README.Debian 2008-08-22 13:56:27 UTC (rev 69)
@@ -17,7 +17,7 @@
Debian does not include a package for the 'mpeg2encode' command, available
from ftp.mpeg.org. Because of this, the Debian ImageMagick packages do not
- support the mpeg format (see #455801).
+ support the mpeg format (see http://bugs.debian.org/455801).
-- Nelson A. de Oliveira <naoliv at debian.org>, Wed, 16 Apr 2008 19:32:56 -0300
Added: branches/experimental/debian/README.source
===================================================================
--- branches/experimental/debian/README.source (rev 0)
+++ branches/experimental/debian/README.source 2008-08-22 13:56:27 UTC (rev 69)
@@ -0,0 +1,28 @@
+For compile:
+1- Download the upstream tarball and untarball it.
+ $ wget ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-x.y.z-X.tar.gz
+ $ tar zxf ImageMagick-x.y.z-X.tar.gz
+
+2- Apply the orig.patches with quilt [1], and remove any copies of the
+ non-DFSG-free logo.
+ $ cd ImageMagick-x.y.z
+ $ cp ../trunk/examples.jpg images/
+ $ rm images/configure.jpg images/logo.jpg images/logo.eps images/t-shirt.png www/Magick++/ImageMagick.png
+ $ env QUILT_PATCHES=../trunk/orig.patches quilt push
+ $ rm -rf .pc
+ $ cd ..
+
+3- create the dfsg.orig.tar.gz
+ $ mv ImageMagick-x.y.z imagemagick-x.y.z.X.dfsg1
+ $ tar zcf imagemagick_x.y.z.X.dfsg1.orig.tar.gz imagemagick-x.y.z.X.dfsg1
+
+4- Move the trunk/debian to the directory.
+ $ cp -r trunk/debian imagemagick-x.y.z.X.dfsg1
+ $ rm -rf imagemagick-x.y.z.X.dfsg1/debian/{.svn,patches/.svn}
+
+5- Compile and upload.
+ $ cd imagemagick-x.y.z.X.dfsg1
+ $ pbuilder
+
+
+[1] http://svn.debian.org/wsvn/pkg-gmagick/trunk/orig.patches/
Modified: branches/experimental/debian/changelog
===================================================================
--- branches/experimental/debian/changelog 2008-06-12 23:48:25 UTC (rev 68)
+++ branches/experimental/debian/changelog 2008-08-22 13:56:27 UTC (rev 69)
@@ -1,3 +1,11 @@
+imagemagick (7:6.4.3.2.dfsg1-1) experimental; urgency=low
+
+ * New upstream release;
+ * Enabled parallel building support in debian/rules;
+ * Updated Standards-Version to 3.8.0.
+
+ -- Nelson A. de Oliveira <naoliv at debian.org> Fri, 22 Aug 2008 10:38:15 -0300
+
imagemagick (7:6.4.1.7.dfsg1-1) experimental; urgency=low
* New upstream release;
@@ -236,7 +244,7 @@
was erroneously removed in fix for CVE-2006-4144. Spotted by
Martin Pitt. Closes: #383314
* coders/sgi.c: Fix off-by-one error in boundary check causing slightly
- garbled image output. Also introduced in fix for for CVE-2006-4144.
+ garbled image output. Also introduced in fix for CVE-2006-4144.
* coders/xpm.c: Do not gratuitously limit the allowed number of
bytes per pixel. Patch thanks to Jens Seidel. Closes: #358148
* magick/display.c: Fix NULL pointer dereference in display's
Modified: branches/experimental/debian/control
===================================================================
--- branches/experimental/debian/control 2008-06-12 23:48:25 UTC (rev 68)
+++ branches/experimental/debian/control 2008-08-22 13:56:27 UTC (rev 69)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: ImageMagick Packaging Team <pkg-gmagick-im-team at lists.alioth.debian.org>
Uploaders: Luciano Bello <luciano at debian.org>, Daniel Kobras <kobras at debian.org>, Nelson A. de Oliveira <naoliv at debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Build-Depends: libjpeg62-dev, libbz2-dev, libtiff4-dev, libwmf-dev, zlib1g-dev, libpng12-dev, libx11-dev, libxt-dev, libxext-dev, debhelper (>= 7), libxml2-dev, libfreetype6-dev, liblcms1-dev, libexif-dev, libjasper-dev, libltdl3-dev, libdjvulibre-dev, librsvg2-dev, libopenexr-dev, libgraphviz-dev, ghostscript, pkg-config, quilt, chrpath
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gmagick/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gmagick/
@@ -48,7 +48,7 @@
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: ghostscript
+Recommends: ghostscript, gsfonts
Description: low-level image manipulation library
The MagickCore API is a low-level interface between the C programming language
and the ImageMagick image processing libraries and is recommended for
Modified: branches/experimental/debian/patches/readme-utf8.patch
===================================================================
--- branches/experimental/debian/patches/readme-utf8.patch 2008-06-12 23:48:25 UTC (rev 68)
+++ branches/experimental/debian/patches/readme-utf8.patch 2008-08-22 13:56:27 UTC (rev 69)
@@ -1,16 +1,16 @@
-diff -urN imagemagick-6.3.7.9.dfsg1.old/README.txt imagemagick-6.3.7.9.dfsg1/README.txt
---- imagemagick-6.3.7.9.dfsg1.old/README.txt 2008-02-14 11:37:39.000000000 -0200
-+++ imagemagick-6.3.7.9.dfsg1/README.txt 2008-02-14 11:37:59.000000000 -0200
-@@ -1,10 +1,10 @@
--ImageMagick® is a software suite to create, edit, and compose bitmap
-+ImageMagick® is a software suite to create, edit, and compose bitmap
- images. It can read, convert and write images in a variety of formats
- (about 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD,
- PNG, Postscript, SVG, and TIFF. Use ImageMagick to translate, flip,
- mirror, rotate, scale, shear and transform images, adjust image colors,
- apply various special effects, or draw text, lines, polygons, ellipses
--and Bézier curves.
-+and Bézier curves.
+--- ImageMagick/README.txt 2008-08-21 12:01:52.000000000 -0300
++++ ImageMagick/README.txt 2008-08-21 12:10:37.000000000 -0300
+@@ -1,11 +1,11 @@
+ Introduction to ImageMagick
- The functionality of ImageMagick is typically utilized from the command
- line or you can use the features from programs written in your favorite
+-ImageMagick® is a software suite to create, edit, and compose bitmap images.
++ImageMagick® is a software suite to create, edit, and compose bitmap images.
+ It can read, convert and write images in a variety of formats (over 100)
+ including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG,
+ and TIFF. Use ImageMagick to translate, flip, mirror, rotate, scale, shear and
+ transform images, adjust image colors, apply various special effects, or draw
+-text, lines, polygons, ellipses and Bézier curves.
++text, lines, polygons, ellipses and Bézier curves.
+
+ The functionality of ImageMagick is typically utilized from the command line
+ or you can use the features from programs written in your favorite programming
Modified: branches/experimental/debian/rules
===================================================================
--- branches/experimental/debian/rules 2008-06-12 23:48:25 UTC (rev 68)
+++ branches/experimental/debian/rules 2008-08-22 13:56:27 UTC (rev 69)
@@ -8,10 +8,15 @@
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-IMAGEMAGICKVERSION=6.4.1
+IMAGEMAGICKVERSION=6.4.3
DESTDIR="$(CURDIR)/debian/tmp"
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+endif
+MAKEFLAGS += -j$(NUMJOBS)
+
include /usr/share/quilt/quilt.make
build: build-stamp
@@ -38,9 +43,9 @@
sed -i libtool \
-e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \
- -e '/^archive_cmds="/s/"$$/ \\$$deplibs"/'
+ -e '/^archive_cmds="/s/"$$/ \\$$deplibs"/'
- $(MAKE)
+ $(MAKE) $(MAKEFLAGS)
touch build-stamp
@@ -102,7 +107,7 @@
sed -i 's/doc\/ImageMagick\\-$(IMAGEMAGICKVERSION)/doc\/imagemagick/' \
$(DESTDIR)/usr/share/man/man*/*
- # Use x-terminal emulator for editing (Bug #132947)
+ # Use x-terminal emulator for editing (Bug #132947)
sed -i 's/xterm/\/etc\/alternatives\/x-terminal-emulator/' \
$(DESTDIR)/usr/lib/ImageMagick-$(IMAGEMAGICKVERSION)/config/delegates.xml
@@ -112,7 +117,7 @@
# Remove RPATH from Magick.so
chrpath -d $(DESTDIR)/usr/lib/perl5/auto/Image/Magick/Magick.so
-clean-tarball:
+clean-tarball:
# Nuke logo binaries
rm -f images/configure.jpg images/logo.jpg images/logo.eps \
images/examples.jpg images/t-shirt.png www/Magick++/ImageMagick.png
More information about the pkg-gmagick-svn-commit
mailing list