[med-svn] r2058 - in trunk/packages/emboss-explorer/trunk/debian: . patches

plessy at alioth.debian.org plessy at alioth.debian.org
Sun Jun 15 14:33:02 UTC 2008


Author: plessy
Date: 2008-06-15 14:33:01 +0000 (Sun, 15 Jun 2008)
New Revision: 2058

Added:
   trunk/packages/emboss-explorer/trunk/debian/patches/05-build-manpages.dpatch
Modified:
   trunk/packages/emboss-explorer/trunk/debian/changelog
   trunk/packages/emboss-explorer/trunk/debian/patches/00list
   trunk/packages/emboss-explorer/trunk/debian/rules
Log:
Work in progress, package not buildable.

debian/rules has been refreshed using dh-make-perl, and a new patch has been
written (and submitted upstream) for having the POD manpages of acdcheck and
mkstatic automatically build and installed. Unfortunately, there is something
broken in the packaging and some files are being installed in /usr/local for an
unknown reason...



Modified: trunk/packages/emboss-explorer/trunk/debian/changelog
===================================================================
--- trunk/packages/emboss-explorer/trunk/debian/changelog	2008-06-15 06:53:42 UTC (rev 2057)
+++ trunk/packages/emboss-explorer/trunk/debian/changelog	2008-06-15 14:33:01 UTC (rev 2058)
@@ -1,9 +1,15 @@
 emboss-explorer (2.2.0-6) UNRELEASED; urgency=medium
 
+BROKEN: work in progress, and I do not know why debian/rules install tries to
+put things in /usr/local...
+
   [ Charles Plessy ]
   * Relicensed the packaging work to "Same as EMBOSS explorer".
   * Documented the patches, and forwarded the that moves
     the configuration to `/etc/emboss-explorer.conf'.
+  * debian/rules:
+    - refreshed using dh-make-perl version 0.45;
+    - tests disable because of upstream bug 1994385.
 
   [ David Paleino ]
   * debian/control:

Modified: trunk/packages/emboss-explorer/trunk/debian/patches/00list
===================================================================
--- trunk/packages/emboss-explorer/trunk/debian/patches/00list	2008-06-15 06:53:42 UTC (rev 2057)
+++ trunk/packages/emboss-explorer/trunk/debian/patches/00list	2008-06-15 14:33:01 UTC (rev 2058)
@@ -1,3 +1,4 @@
 01-fix_examples.dpatch
 02-fix_Conf.pm.dpatch
 04-fix_install.dpatch
+05-build-manpages.dpatch

Added: trunk/packages/emboss-explorer/trunk/debian/patches/05-build-manpages.dpatch
===================================================================
--- trunk/packages/emboss-explorer/trunk/debian/patches/05-build-manpages.dpatch	                        (rev 0)
+++ trunk/packages/emboss-explorer/trunk/debian/patches/05-build-manpages.dpatch	2008-06-15 14:33:01 UTC (rev 2058)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05-build-manpages.dpatch by Charles Plessy <plessy at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: With this patch, the perl build system will automatically build
+## DP: and install the POD manpages of acdcheckd and mkstatic.
+## DP: Forwarded: http://sourceforge.net/tracker/index.php?func=detail&aid=1994395&group_id=124389&atid=699414
+
+ at DPATCH@
+diff -urNad emboss-explorer~/t/ACD.t emboss-explorer/t/ACD.t
+--- emboss-explorer-2.2.0/Makefile.PL.old	2008-06-16 07:53:53.000000000 +0900
++++ emboss-explorer-2.2.0/Makefile.PL	2008-06-16 07:55:33.000000000 +0900
+@@ -10,5 +10,6 @@
+ 	},
+ 	PREREQ_FATAL => 1,
+     ABSTRACT_FROM => 'lib/EMBOSS/GUI.pm',
+-    AUTHOR        => 'Luke McCarthy <lukem at gene.pbi.nrc.ca>'
++    AUTHOR        => 'Luke McCarthy <lukem at gene.pbi.nrc.ca>',
++    EXE_FILES     =>  => [ qw( bin/acdcheck bin/mkstatic ) ]
+ );


Property changes on: trunk/packages/emboss-explorer/trunk/debian/patches/05-build-manpages.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/emboss-explorer/trunk/debian/rules
===================================================================
--- trunk/packages/emboss-explorer/trunk/debian/rules	2008-06-15 06:53:42 UTC (rev 2057)
+++ trunk/packages/emboss-explorer/trunk/debian/rules	2008-06-15 14:33:01 UTC (rev 2058)
@@ -1,62 +1,71 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
+# This debian/rules file is provided as a template for normal perl
+# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
+# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
+# be used freely wherever it is useful.
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
+export PERL_MM_USE_DEFAULT=1
+
+PERL   ?= /usr/bin/perl
+PACKAGE = emboss-explorer # was: $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
+
 include /usr/share/dpatch/dpatch.make
 
-configure: configure-stamp
-configure-stamp:
-	# the VENDORARCHEXP and INSTALLVENDORARCH
-	# variables are set to avoid the creation
-	# of /usr/lib/perl5
-	perl Makefile.PL \
-		INSTALLDIRS=vendor \
-		VENDORARCHEXP=/usr/share/perl5 \
-		INSTALLVENDORARCH=/usr/share/perl5
-	touch configure-stamp
-
-build: patch configure build-stamp
+build: patch build-stamp
 build-stamp:
+	dh_testdir
+	# Add commands to compile the package here
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
-	touch build-stamp
+#	$(MAKE) test # disabled because of http://sourceforge.net/tracker/index.php?func=detail&aid=1994385&group_id=124389&atid=699414
+	touch $@
 
-clean: unpatch configure
+clean: unpatch
 	dh_testdir
 	dh_testroot
-	$(MAKE) clean
-	dh_clean Makefile.old build-stamp configure-stamp
+	dh_clean build-stamp install-stamp
+	# Add commands to clean up after the build process here
+	[ ! -f Makefile ] || $(MAKE) realclean
 
-install: build
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i
-	dh_installdirs -i -A
-	$(MAKE) install PREFIX=$(CURDIR)/debian/emboss-explorer/usr
+	dh_clean -k
+	# Add commands to install the package into $(TMP) here
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
 	./install
+	[ ! -d $(TMP)/usr/lib/perl5 ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/lib/perl5
 	chown -R www-data $(CURDIR)/debian/emboss-explorer/var/www/emboss-explorer/output
 	# ACD.pm desserves its own package.
 	mv $(CURDIR)/debian/emboss-explorer/usr/share/perl5/EMBOSS/ACD.pm $(CURDIR)/debian/libemboss-acd-perl/usr/share/perl5/EMBOSS/
 	mv $(CURDIR)/debian/emboss-explorer/usr/share/man/man3/EMBOSS::ACD.3pm $(CURDIR)/debian/libemboss-acd-perl/usr/share/man/man3/
+	touch $@
 
 binary-arch:
+# We have nothing to do here for an architecture-independent package
+
 binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_install
-	dh_installchangelogs 
+	dh_installdocs README debian/README.Debian
+	dh_installchangelogs debian/changelog
+	dh_installcron
 	dh_installexamples
-	dh_installcron
-	dh_installdocs
-	dh_installman
 	dh_link
-	dh_strip
+	dh_perl
 	dh_compress
-	dh_fixperms -Xvar/www/emboss-explorer/output
-	dh_perl
+	dh_fixperms
 	dh_installdeb
-	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb




More information about the debian-med-commit mailing list