[med-svn] r3574 - in trunk/packages/mummer/trunk/debian: . patches

Charles Plessy plessy at alioth.debian.org
Wed Jul 1 05:20:51 UTC 2009 

Author: plessy
Date: 2009-07-01 05:20:48 +0000 (Wed, 01 Jul 2009)
New Revision: 3574

Added:
   trunk/packages/mummer/trunk/debian/patches/series
Modified:
   trunk/packages/mummer/trunk/debian/changelog
   trunk/packages/mummer/trunk/debian/compat
   trunk/packages/mummer/trunk/debian/control
   trunk/packages/mummer/trunk/debian/mummer.install
   trunk/packages/mummer/trunk/debian/rules
Log:
Converted to Debhelper/Quilt as the peculiarities of the build system are not very suitable for CDBS.


Modified: trunk/packages/mummer/trunk/debian/changelog
===================================================================
--- trunk/packages/mummer/trunk/debian/changelog	2009-06-30 11:04:22 UTC (rev 3573)
+++ trunk/packages/mummer/trunk/debian/changelog	2009-07-01 05:20:48 UTC (rev 3574)
@@ -14,13 +14,18 @@
   * New upstream release (GCC compatibility fix.)
   * debian/get-orig-source: rename mutilated upstream tarball.
   * debian/control:
+    - incremented Standards-Version to reflect concordance with Debian Policy
+      3.8.2 (no changes needed).
+    - mummer-docs depends on ${misc:Depends}.
     - dropped versionned dependancies when they are even satisfied in oldstable.
-    - incremented Standards-Version to reflect concordance with
-      Debian Policy 3.8.2 (no changes needed).
-    - mummer-docs depends on ${misc:Depends}.
+    - dropped dependancy on CDBS and patchutils, and added dependancy on quilt.
+    - using Debhelper 7 (debian/compat).
   * debian/patches:
     - replaces some Makefile patches by environment variables in debian/rules.
     - replaced 02at_scripts.diff by separate files in sh-replacement-scripts.
+    - added a series file to use Quilt.
+  * debian/rules converted to debhelper (the build system is too odd to be
+    handled genlty by CDBS without patches).
 
  -- Charles Plessy <plessy at debian.org>  Mon, 19 Jan 2009 09:02:26 +0900
 

Modified: trunk/packages/mummer/trunk/debian/compat
===================================================================
--- trunk/packages/mummer/trunk/debian/compat	2009-06-30 11:04:22 UTC (rev 3573)
+++ trunk/packages/mummer/trunk/debian/compat	2009-07-01 05:20:48 UTC (rev 3574)
@@ -1 +1 @@
-5
+7

Modified: trunk/packages/mummer/trunk/debian/control
===================================================================
--- trunk/packages/mummer/trunk/debian/control	2009-06-30 11:04:22 UTC (rev 3573)
+++ trunk/packages/mummer/trunk/debian/control	2009-07-01 05:20:48 UTC (rev 3574)
@@ -4,7 +4,7 @@
 Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Steffen Moeller <moeller at debian.org>, Andreas Tille <tille at debian.org>, Charles Plessy <plessy at debian.org>
-Build-Depends: cdbs, patchutils, debhelper (>= 7), texlive-latex-base, texlive-latex-recommended, texlive-fonts-recommended
+Build-Depends: quilt, debhelper (>= 7), texlive-latex-base, texlive-latex-recommended, texlive-fonts-recommended
 Standards-Version: 3.8.2
 Homepage: http://mummer.sourceforge.net/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mummer/trunk/?rev=0&sc=0

Modified: trunk/packages/mummer/trunk/debian/mummer.install
===================================================================
--- trunk/packages/mummer/trunk/debian/mummer.install	2009-06-30 11:04:22 UTC (rev 3573)
+++ trunk/packages/mummer/trunk/debian/mummer.install	2009-07-01 05:20:48 UTC (rev 3574)
@@ -1,3 +1,3 @@
-debian/tmp/usr/bin/*	usr/bin
-debian/tmp/lib/mummer/*	usr/lib/mummer
-scripts/Foundation.pm 	usr/share/perl5
+debian/tmp/usr/bin/*		usr/bin
+debian/tmp/usr/lib/mummer/*	usr/lib/mummer
+scripts/Foundation.pm 		usr/share/perl5

Added: trunk/packages/mummer/trunk/debian/patches/series
===================================================================
--- trunk/packages/mummer/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/mummer/trunk/debian/patches/series	2009-07-01 05:20:48 UTC (rev 3574)
@@ -0,0 +1,2 @@
+01sm_src_tigr.diff
+02at_docs_web.diff

Modified: trunk/packages/mummer/trunk/debian/rules
===================================================================
--- trunk/packages/mummer/trunk/debian/rules	2009-06-30 11:04:22 UTC (rev 3573)
+++ trunk/packages/mummer/trunk/debian/rules	2009-07-01 05:20:48 UTC (rev 3574)
@@ -1,38 +1,75 @@
 #!/usr/bin/make -f
-# debian/rules for mummer using cdbs
-# Andreas Tille <tille at debian.org>, GPL
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/debhelper.mk  
-include /usr/share/cdbs/1/class/makefile.mk  
+include /usr/share/quilt/quilt.make
 
-# prevent compression of PDF docs
-DEB_COMPRESS_EXCLUDE := .pdf
+# Pasted from Policy §10.1
+CC = gcc
+CFLAGS = -O2 -g -Wall # sane warning options vary between programs
+LDFLAGS = # none
+INSTALL = install -s # (or use strip on the files in debian/tmp)
 
+# Pasted from Policy §4.9.1
+CFLAGS = -Wall -g
+INSTALL = install
+INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
+INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
+INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
+INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
+
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+    CFLAGS += -O0
+else
+    CFLAGS += -O2
+endif
+ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+    INSTALL_PROGRAM += -s
+endif
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+build:
+	# ...
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	# Code to run the package test suite.
+endif
+
 # src/kurtz/mm3src/Makefile and src/kurtz/streesrc/Makefile make a use of CFLAGS that does not allow to override it, hence the following is added:
 CFLAGS += -DSTREEHUGE -I$(CURDIR)/src/kurtz/libbasedir -I$(CURDIR)/src/kurtz/streesrc
 
-MUMMER_DIRS = BIN_DIR=$(CURDIR)/debian/mummer/usr/bin AUX_BIN_DIR=$(CURDIR)/debian/mummer/usr/lib/mummer
+TMPDIR      = $(CURDIR)/debian/tmp
+BIN_DIR     = $(TMPDIR)/usr/bin
+AUX_BIN_DIR = $(TMPDIR)/usr/lib/mummer
 
-# Install in a debian/tmp directory.
-DEB_MAKE_BUILD_TARGET = all $MUMMER_DIRS
-DEB_MAKE_INSTALL_TARGET = install $MUMMER_DIRS
-DEB_MAKE_CHECK_TARGET = check
+build: $(QUILT_STAMPFN) build-stamp
+build-stamp:
+# Unfortunately the upstream makefile does not separate the build and install steps.
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+	[ -d $(BIN_DIR) ] || mkdir -p $(BIN_DIR)
+	[ -d $(AUX_BIN_DIR) ] || mkdir -p $(AUX_BIN_DIR)
+	$(MAKE) BIN_DIR=$(BIN_DIR) AUX_BIN_DIR=$(AUX_BIN_DIR) CFLAGS="$(CFLAGS)"
+	$(MAKE) -C docs
+	$(MAKE) check
+	dh_install
+	touch build-stamp
 
-build/mummer-doc::
-	cd doc; make
+clean: unpatch
+	dh clean
 
-clean::
-	rm -f src/tigr/aux_bin
-	rm -rf bin
-	rm -rf $(CURDIR)/debian/tmp
+install:
+install: build
+# Unfortunately the upstream makefile does not separate the build and install steps.
 
-# post installation
-install/mummer::
-	# install desktop file
-	# dh_desktop 
-	# prevent name space pollution because libgd-tools contains /usr/bin/annotate
-	mv bin/annotate bin/mummer-annotate
+binary-indep: build install
+	dh binary-indep -Xpdf
 
-get-orig-source:
-	sh debian/get-orig-source
+binary-arch: build install
+	dh binary-arch -Xpdf
+#	mv bin/annotate bin/mummer-annotate
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

More information about the debian-med-commit mailing list