[Pkg-gmagick-svn-commit] r50 - branches/6.3.9.4.dfsg1-1/debian
naoliv at alioth.debian.org
naoliv at alioth.debian.org
Sat Mar 22 22:55:55 UTC 2008
Author: naoliv
Date: 2008-03-22 22:55:54 +0000 (Sat, 22 Mar 2008)
New Revision: 50
Added:
branches/6.3.9.4.dfsg1-1/debian/TODO
Modified:
branches/6.3.9.4.dfsg1-1/debian/imagemagick.install
branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.install
branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.install
branches/6.3.9.4.dfsg1-1/debian/libmagickwand-dev.install
branches/6.3.9.4.dfsg1-1/debian/perlmagick.install
branches/6.3.9.4.dfsg1-1/debian/rules
Log:
Include manpages in packages; I am using the same .install file for this, but it's also possible to use .manpages files (and call dh_installman), but it seems that it would be necessary to add the full path inside the .manpages (debian/tmp/usr/share/man/man1/foo.1 instead usr/share/man/man1/foo.1, as it's now in .install; it's only a cosmetic thing to choose, as I can see);
Some cleanup on debian/rules (removing unneeded things, for example);
Enabled testsuite again; it "fails" when testing perlmagick:
======
t/tiff/write......ok
t/wmf/read........sh: wmf2eps: command not found
Readimage (wizard.wmf): Exception 430: unable to open file `/tmp/magick-XXyyUa1t': No such file or directory at t/subroutines.pl line 342.
sh: wmf2eps: command not found
Readimage (clock.wmf): Exception 430: unable to open file `/tmp/magick-XX7uUWta': No such file or directory at t/subroutines.pl line 342.
FAILED tests 1-2
Failed 2/2 tests, 0.00% okay
t/write...........ok
t/x11/read........ok
t/x11/write.......FAILED test 1
Failed 1/2 tests, 50.00% okay
t/zlib/read.......ok
t/zlib/write......ok
Failed Test Stat Wstat Total Fail Failed List of Failed
+------------------------------------------------------------------------------
t/wmf/read.t 2 2 100.00% 1-2
t/x11/write.t 2 1 50.00% 1
Failed 2/24 test scripts, 91.67% okay. 3/336 subtests failed, 99.11% okay.
======
Enabled again the replace to use x-terminal-emulator instead xterm (#132947);
Added TODO list (it's not sorted by priority).
Well, it seems to be almost in shape :-)
Added: branches/6.3.9.4.dfsg1-1/debian/TODO
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/TODO (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/TODO 2008-03-22 22:55:54 UTC (rev 50)
@@ -0,0 +1,10 @@
+- verify conflicts, replaces, provides, dependencies, etc
+- debug packages
+- use symbol files; seems interesting:
+ http://wiki.debian.org/Projects/ImprovedDpkgShlibdeps
+ http://wiki.debian.org/UsingSymbolsFiles
+- menu icon
+- lintian warning:
+ W: perlmagick: binary-or-shlib-defines-rpath ./usr/lib/perl5/auto/Image/Magick/Magick.so /tmp/buildd/imagemagick-6.3.9.9.dfsg1/PerlMagick/../magick/.libs:/tmp/buildd/imagemagick-6.3.9.9.dfsg1/PerlMagick/../wand/.libs
+ Needs to use only chrpath?
+- nox packages (without having dependencies on X libs)
Modified: branches/6.3.9.4.dfsg1-1/debian/imagemagick.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/imagemagick.install 2008-03-22 15:34:09 UTC (rev 49)
+++ branches/6.3.9.4.dfsg1-1/debian/imagemagick.install 2008-03-22 22:55:54 UTC (rev 50)
@@ -1,3 +1,25 @@
-usr/bin
+usr/bin/compare
+usr/bin/animate
+usr/bin/convert
+usr/bin/composite
+usr/bin/conjure
+usr/bin/import
+usr/bin/identify
+usr/bin/stream
+usr/bin/display
+usr/bin/montage
+usr/bin/mogrify
usr/lib/ImageMagick-6.3.9/config
usr/share/ImageMagick-6.3.9/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
Modified: branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.install 2008-03-22 15:34:09 UTC (rev 49)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagick++-dev.install 2008-03-22 22:55:54 UTC (rev 50)
@@ -5,3 +5,4 @@
usr/lib/libMagick++.so
usr/lib/pkgconfig/ImageMagick++.pc
usr/lib/pkgconfig/Magick++.pc
+usr/share/man/man1/Magick++-config.1
Modified: branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.install 2008-03-22 15:34:09 UTC (rev 49)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickcore-dev.install 2008-03-22 22:55:54 UTC (rev 50)
@@ -7,3 +7,5 @@
usr/lib/libMagickCore.so
usr/lib/pkgconfig/ImageMagick.pc
usr/lib/pkgconfig/MagickCore.pc
+usr/share/man/man1/Magick-config.1
+usr/share/man/man1/MagickCore-config.1
Modified: branches/6.3.9.4.dfsg1-1/debian/libmagickwand-dev.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/libmagickwand-dev.install 2008-03-22 15:34:09 UTC (rev 49)
+++ branches/6.3.9.4.dfsg1-1/debian/libmagickwand-dev.install 2008-03-22 22:55:54 UTC (rev 50)
@@ -6,3 +6,5 @@
usr/lib/libMagickWand.so
usr/lib/pkgconfig/MagickWand.pc
usr/lib/pkgconfig/Wand.pc
+usr/share/man/man1/MagickWand-config.1
+usr/share/man/man1/Wand-config.1
Modified: branches/6.3.9.4.dfsg1-1/debian/perlmagick.install
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/perlmagick.install 2008-03-22 15:34:09 UTC (rev 49)
+++ branches/6.3.9.4.dfsg1-1/debian/perlmagick.install 2008-03-22 22:55:54 UTC (rev 50)
@@ -1 +1,2 @@
usr/lib/perl5
+usr/share/man/man3
Modified: branches/6.3.9.4.dfsg1-1/debian/rules
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/rules 2008-03-22 15:34:09 UTC (rev 49)
+++ branches/6.3.9.4.dfsg1-1/debian/rules 2008-03-22 22:55:54 UTC (rev 50)
@@ -13,10 +13,6 @@
include /usr/share/quilt/quilt.make
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
build: build-stamp
build-stamp: $(QUILT_STAMPFN)
dh_testdir
@@ -44,11 +40,7 @@
-e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \
-e '/^archive_cmds="/s/"$$/ \\$$deplibs"/'
- # Add here commands to compile the package.
-
$(MAKE)
-# cd $(CURDIR)/PerlMagick && perl Makefile.PL
-# cd $(CURDIR)/PerlMagick && make LD_RUN_PATH=
touch build-stamp
@@ -60,7 +52,7 @@
# but don't make a failing testsuite fail the whole build. Change it
# to a fatal error only once we've got an estimate on how harmful
# that would be.
-# @if test "$(DEB_HOST_GNU_TYPE)" = "$(DEB_BUILD_GNU_TYPE)"; then \
+ @if test "$(DEB_HOST_GNU_TYPE)" = "$(DEB_BUILD_GNU_TYPE)"; then \
unset DISPLAY; \
LD_LIBRARY_PATH="$(CURDIR)/magick/.libs:$(CURDIR)/wand/.libs:$(CURDIR)/Magick++/lib/.libs:$$LD_LIBRARY_PATH" \
$(MAKE) check LD_RUN_PATH= && echo "*** Testsuite succeeded ***" || echo "*** Testsuite failed ***"; \
@@ -91,7 +83,6 @@
$(MAKE) install \
DESTDIR=$(CURDIR)/debian/tmp \
pkgdocdir=/usr/share/doc/imagemagick
-# pkgdatadir=/usr/share/doc/imagemagick
cd $(CURDIR)/PerlMagick && \
$(MAKE) install_vendor \
@@ -99,39 +90,19 @@
SITEPREFIX=$(CURDIR)/debian/tmp/usr \
INSTALLMAN3DIR=$(CURDIR)/debian/tmp/usr/share/man/man3 \
INSTALLSITEMAN3DIR=$(CURDIR)/debian/tmp/usr/share/man/man3
-# cp $(CURDIR)/magick/*.h $(CURDIR)/debian/imagemagick/usr/include/magick
-# -cp $(CURDIR)/magick/Magick-config.1 $(CURDIR)/debian/imagemagick/usr/share/man/man1/
+
-find $(CURDIR)/debian -type f -name .packlist | xargs rm -f
- # These files are already included in the doc dir.
-# -rm -r "$(CURDIR)"/debian/imagemagick/usr/share/ImageMagick-$(IMAGEMAGICKVERSION)
-
# Fix HTML location inside manpages
sed -i 's/doc\/ImageMagick-$(IMAGEMAGICKVERSION)/doc\/imagemagick/' \
- "$(CURDIR)"/debian/tmp/usr/share/man/man1/*
+ $(CURDIR)/debian/tmp/usr/share/man/man1/*
-# Use x-terninal emulator for editing (Bug #132947)
-#
-# rm $(CURDIR)/debian/imagemagick/usr/lib/ImageMagick-$(IMAGEMAGICKVERSION)/config/delegates.xml
-# sed -e s!xterm!/etc/alternatives/x-terminal-emulator! \
-# $(CURDIR)/config/delegates.xml > \
-# $(CURDIR)/debian/imagemagick/usr/lib/ImageMagick-$(IMAGEMAGICKVERSION)/config/delegates.xml
-# dh_movefiles --sourcedir=debian/imagemagick
+ # Use x-terminal emulator for editing (Bug #132947)
+ sed -i 's/xterm/\/etc\/alternatives\/x-terminal-emulator/' \
+ $(CURDIR)/debian/tmp/usr/lib/ImageMagick-$(IMAGEMAGICKVERSION)/config/delegates.xml
-# add write permission for dh_strip
-# chmod +w $(CURDIR)/debian/perlmagick/usr/lib/perl5/auto/Image/Magick/Magick.so
-#
-# Remove empty directories in debian/imagemagick and debian/libmagickXX
-#
+ # Remove empty directories in debian/tmp
-find $(CURDIR)/debian/tmp -type d -empty | xargs rmdir -p
-# -find $(CURDIR)/debian/libmagick$(SOVERSION) -type d -empty | xargs rmdir -p
-#
-# -while find $(CURDIR)/debian/imagemagick -empty |xargs rmdir ; do \
-# find $(CURDIR)/debian/imagemagick -empty | xargs rmdir; \
-# done
-# -while find $(CURDIR)/debian/libmagick -empty | xargs rmdir ; do \
-# find $(CURDIR)/debian/libmagick -empty | xargs rmdir; \
-# done
clean-tarball:
# Nuke logo binaries
@@ -146,17 +117,15 @@
binary-indep: build install
# We have nothing to do by default.
-
# Build architecture-dependent files here.
binary-arch: build check install
dh_testdir
dh_testroot
dh_installdocs
dh_installexamples
- ls -lR debian
dh_install --sourcedir=debian/tmp
dh_installmenu
- dh_installmime -pimagemagick
+ dh_installmime
dh_installinfo
dh_installchangelogs
dh_link
@@ -173,4 +142,3 @@
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
-
More information about the pkg-gmagick-svn-commit
mailing list