[Pkg-gmagick-svn-commit] r57 - branches/6.3.9.4.dfsg1-1/debian
naoliv at alioth.debian.org
naoliv at alioth.debian.org
Fri Mar 28 19:57:08 UTC 2008
Author: naoliv
Date: 2008-03-28 19:57:08 +0000 (Fri, 28 Mar 2008)
New Revision: 57
Added:
branches/6.3.9.4.dfsg1-1/debian/imagemagick.manpages
Modified:
branches/6.3.9.4.dfsg1-1/debian/TODO
branches/6.3.9.4.dfsg1-1/debian/changelog
branches/6.3.9.4.dfsg1-1/debian/imagemagick.install
branches/6.3.9.4.dfsg1-1/debian/rules
Log:
Quote $(CURDIR) vars inside debian/rules;
Install manpages with dh_installman (except perlmagick's for now);
Uploading it to experimental.
Modified: branches/6.3.9.4.dfsg1-1/debian/TODO
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/TODO 2008-03-25 20:24:04 UTC (rev 56)
+++ branches/6.3.9.4.dfsg1-1/debian/TODO 2008-03-28 19:57:08 UTC (rev 57)
@@ -1,4 +1,3 @@
-- verify conflicts, replaces, provides, dependencies, etc
- use symbol files; seems interesting:
http://wiki.debian.org/Projects/ImprovedDpkgShlibdeps
http://wiki.debian.org/UsingSymbolsFiles
Modified: branches/6.3.9.4.dfsg1-1/debian/changelog
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/changelog 2008-03-25 20:24:04 UTC (rev 56)
+++ branches/6.3.9.4.dfsg1-1/debian/changelog 2008-03-28 19:57:08 UTC (rev 57)
@@ -1,6 +1,6 @@
-imagemagick (7:6.4.0.0.dfsg1-1) UNRELEASED; urgency=low
+imagemagick (7:6.4.0.1.dfsg1-1) experimental; urgency=low
- * New upstream release (Closes: 469819);
+ * New upstream release (Closes: #469819);
* Fix ImageMagick's README.txt encoding (Closes: #465717);
* debian/control:
- replace build-depends libz-dev -> zlib1g-dev;
@@ -27,7 +27,7 @@
* Fix update of the EXIF profile (Closes: #468692);
* Fix HTML image map creation when using montage (Closes: #364128).
- -- Nelson A. de Oliveira <naoliv at debian.org> Fri, 07 Mar 2008 17:25:06 -0300
+ -- Nelson A. de Oliveira <naoliv at debian.org> Fri, 28 Mar 2008 16:52:44 -0300
imagemagick (7:6.3.7.9.dfsg1-2) unstable; urgency=low
Modified: branches/6.3.9.4.dfsg1-1/debian/imagemagick.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/imagemagick.install 2008-03-25 20:24:04 UTC (rev 56)
+++ branches/6.3.9.4.dfsg1-1/debian/imagemagick.install 2008-03-28 19:57:08 UTC (rev 57)
@@ -11,16 +11,4 @@
usr/bin/mogrify
usr/lib/ImageMagick-*/config
usr/share/ImageMagick-*/config
-usr/share/man/man1/animate.1
-usr/share/man/man1/compare.1
-usr/share/man/man1/composite.1
-usr/share/man/man1/conjure.1
-usr/share/man/man1/convert.1
-usr/share/man/man1/display.1
-usr/share/man/man1/identify.1
-usr/share/man/man1/ImageMagick.1
-usr/share/man/man1/import.1
-usr/share/man/man1/mogrify.1
-usr/share/man/man1/montage.1
-usr/share/man/man1/stream.1
usr/share/pixmaps/
Added: branches/6.3.9.4.dfsg1-1/debian/imagemagick.manpages
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/imagemagick.manpages (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/imagemagick.manpages 2008-03-28 19:57:08 UTC (rev 57)
@@ -0,0 +1,12 @@
+debian/tmp/usr/share/man/man1/animate.1
+debian/tmp/usr/share/man/man1/compare.1
+debian/tmp/usr/share/man/man1/composite.1
+debian/tmp/usr/share/man/man1/conjure.1
+debian/tmp/usr/share/man/man1/convert.1
+debian/tmp/usr/share/man/man1/display.1
+debian/tmp/usr/share/man/man1/identify.1
+debian/tmp/usr/share/man/man1/ImageMagick.1
+debian/tmp/usr/share/man/man1/import.1
+debian/tmp/usr/share/man/man1/mogrify.1
+debian/tmp/usr/share/man/man1/montage.1
+debian/tmp/usr/share/man/man1/stream.1
Modified: branches/6.3.9.4.dfsg1-1/debian/rules
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/rules 2008-03-25 20:24:04 UTC (rev 56)
+++ branches/6.3.9.4.dfsg1-1/debian/rules 2008-03-28 19:57:08 UTC (rev 57)
@@ -11,7 +11,7 @@
IMAGEMAGICKVERSION=6.4.0
SOVERSION:=1
-DESTDIR=$(CURDIR)/debian/tmp
+DESTDIR="$(CURDIR)/debian/tmp"
include /usr/share/quilt/quilt.make
@@ -72,7 +72,7 @@
-cd PerlMagick && $(MAKE) distclean
[ ! -f Makefile ] || $(MAKE) distclean
-cd Magick++ && $(MAKE) distclean
- -rm $(CURDIR)/utilities/.libs/*
+ -rm "$(CURDIR)/utilities/.libs/*"
dh_clean build-stamp
@@ -83,10 +83,10 @@
dh_installdirs
$(MAKE) install \
- DESTDIR=$(CURDIR)/debian/tmp \
+ DESTDIR="$(CURDIR)/debian/tmp" \
pkgdocdir=/usr/share/doc/imagemagick
- cd $(CURDIR)/PerlMagick && \
+ cd "$(CURDIR)/PerlMagick" && \
$(MAKE) install_vendor \
PREFIX=$(DESTDIR)/usr \
SITEPREFIX=$(DESTDIR)/usr \
@@ -94,9 +94,9 @@
INSTALLSITEMAN3DIR=$(DESTDIR)/usr/share/man/man3
mkdir -p $(DESTDIR)/usr/share/pixmaps/
- install -m 644 $(CURDIR)/debian/display.xpm $(DESTDIR)/usr/share/pixmaps/
+ install -m 644 "$(CURDIR)/debian/display.xpm" $(DESTDIR)/usr/share/pixmaps/
- -find $(CURDIR)/debian -type f -name .packlist | xargs rm -f
+ -find "$(CURDIR)/debian" -type f -name .packlist | xargs rm -f
# Fix HTML location inside manpages
sed -i 's/doc\/ImageMagick-$(IMAGEMAGICKVERSION)/doc\/imagemagick/' \
@@ -116,13 +116,12 @@
clean-tarball:
# Nuke logo binaries
- rm -f images/configure.jpg images/logo.jpg images/logo.eps images/examples.jpg \
- www/Magick++/ImageMagick.png
+ rm -f images/configure.jpg images/logo.jpg images/logo.eps \
+ images/examples.jpg www/Magick++/ImageMagick.png
# Nuke the LogoImage define
perl -pi -e 'BEGIN{undef $$/;} s/LogoImage\[\]\s+=\s+\{[^\}]+\}/LogoImage[] = {}/s' \
coders/magick.c
-
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
@@ -135,6 +134,7 @@
dh_installexamples
dh_install --sourcedir=debian/tmp
dh_installmenu
+ dh_installman
dh_installmime
dh_installinfo
dh_installchangelogs
More information about the pkg-gmagick-svn-commit
mailing list