[med-svn] r16974 - in trunk/packages/mcl/trunk/debian: . patches

Andreas Tille tille at moszumanska.debian.org
Tue May 20 14:48:14 UTC 2014


Author: tille
Date: 2014-05-20 14:48:14 +0000 (Tue, 20 May 2014)
New Revision: 16974

Added:
   trunk/packages/mcl/trunk/debian/mcl-doc.docs
   trunk/packages/mcl/trunk/debian/mcl-doc.manpages
   trunk/packages/mcl/trunk/debian/mcl.install
   trunk/packages/mcl/trunk/debian/mcl.manpages
Removed:
   trunk/packages/mcl/trunk/debian/docs
   trunk/packages/mcl/trunk/debian/patches/03-mayhem-io.patch
   trunk/packages/mcl/trunk/debian/patches/04-mayhem-vector.patch
Modified:
   trunk/packages/mcl/trunk/debian/changelog
   trunk/packages/mcl/trunk/debian/compat
   trunk/packages/mcl/trunk/debian/control
   trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.clmdist
   trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.clmformat
   trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcl
   trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mclfaq
   trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mclpipeline
   trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcx
   trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxassemble
   trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxio
   trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxload
   trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxsubs
   trunk/packages/mcl/trunk/debian/mcl-doc.install
   trunk/packages/mcl/trunk/debian/patches/02-wrong-interpreter-path.patch
   trunk/packages/mcl/trunk/debian/patches/05-manual-what-is.patch
   trunk/packages/mcl/trunk/debian/patches/series
   trunk/packages/mcl/trunk/debian/rules
Log:
Adapt patches to new upstream; Use short dh in debian/rules; debhelper 9


Modified: trunk/packages/mcl/trunk/debian/changelog
===================================================================
--- trunk/packages/mcl/trunk/debian/changelog	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/changelog	2014-05-20 14:48:14 UTC (rev 16974)
@@ -2,6 +2,11 @@
 
   * New upstream version
   * Moved debian/upstream to debian/upstream/metadata
+  * debian/control:
+     - cme fix dpkg-control
+     - debhelper 9
+  * debian/rules: short dh
+  * html docs are now installed into html subdirectory
 
  -- Andreas Tille <tille at debian.org>  Tue, 20 May 2014 15:50:29 +0200
 

Modified: trunk/packages/mcl/trunk/debian/compat
===================================================================
--- trunk/packages/mcl/trunk/debian/compat	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/compat	2014-05-20 14:48:14 UTC (rev 16974)
@@ -1 +1 @@
-5
+9

Modified: trunk/packages/mcl/trunk/debian/control
===================================================================
--- trunk/packages/mcl/trunk/debian/control	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/control	2014-05-20 14:48:14 UTC (rev 16974)
@@ -1,20 +1,27 @@
 Source: mcl
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Uploaders: Philipp Benner <philipp at debian.org>,
+           Andreas Tille <tille at debian.org>
 Section: math
 Priority: optional
-Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Philipp Benner <philipp at debian.org>,
- Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.16.1~), autotools-dev, quilt, zoem, tidy, aephea
-Standards-Version: 3.9.4
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mcl/
-Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/mcl/
+Build-Depends: debhelper (>= 9),
+               autotools-dev,
+               zoem,
+               tidy,
+               aephea
+Standards-Version: 3.9.5
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/mcl/
+Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/mcl/
 Homepage: http://micans.org/mcl/
 
 Package: mcl
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Suggests: mcl-doc
-Enhances: blast2, ncbi-tools-bin, bioperl-run
+Enhances: blast2,
+          ncbi-tools-bin,
+          bioperl-run
 Description: Markov Cluster algorithm
  The MCL package is an implementation of the MCL algorithm, and offers
  utilities for manipulating sparse matrices (the essential data
@@ -26,8 +33,8 @@
 
 Package: mcl-doc
 Architecture: all
+Section: doc
 Depends: ${misc:Depends}
-Section: doc
 Suggests: mcl
 Description: documentation for mcl
  The MCL package is an implementation of the Markov Cluster algorithm,

Deleted: trunk/packages/mcl/trunk/debian/docs
===================================================================
--- trunk/packages/mcl/trunk/debian/docs	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/docs	2014-05-20 14:48:14 UTC (rev 16974)
@@ -1,3 +0,0 @@
-AUTHORS
-README
-THANKS

Modified: trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.clmdist
===================================================================
--- trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.clmdist	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.clmdist	2014-05-20 14:48:14 UTC (rev 16974)
@@ -9,5 +9,5 @@
 Files: /usr/share/doc/mcl/clmdist.ps.gz
 
 Format: HTML
-Index: /usr/share/doc/mcl/clmdist.html
-Files: /usr/share/doc/mcl/clmdist.html
+Index: /usr/share/doc/mcl/html/clmdist.html
+Files: /usr/share/doc/mcl/html/clmdist.html

Modified: trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.clmformat
===================================================================
--- trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.clmformat	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.clmformat	2014-05-20 14:48:14 UTC (rev 16974)
@@ -8,5 +8,5 @@
 Files: /usr/share/doc/mcl/clmformat.ps.gz
 
 Format: HTML
-Index: /usr/share/doc/mcl/clmformat.html
-Files: /usr/share/doc/mcl/clmformat.html
+Index: /usr/share/doc/mcl/html/clmformat.html
+Files: /usr/share/doc/mcl/html/clmformat.html

Modified: trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcl
===================================================================
--- trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcl	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcl	2014-05-20 14:48:14 UTC (rev 16974)
@@ -8,5 +8,5 @@
 Files: /usr/share/doc/mcl/mcl.ps.gz
 
 Format: HTML
-Index: /usr/share/doc/mcl/mcl.html
-Files: /usr/share/doc/mcl/mcl.html
+Index: /usr/share/doc/mcl/html/mcl.html
+Files: /usr/share/doc/mcl/html/mcl.html

Modified: trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mclfaq
===================================================================
--- trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mclfaq	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mclfaq	2014-05-20 14:48:14 UTC (rev 16974)
@@ -10,5 +10,5 @@
 Files: /usr/share/doc/mcl/mclfaq.ps.gz
 
 Format: HTML
-Index: /usr/share/doc/mcl/mclfaq.html
-Files: /usr/share/doc/mcl/mclfaq.html
+Index: /usr/share/doc/mcl/html/mclfaq.html
+Files: /usr/share/doc/mcl/html/mclfaq.html

Modified: trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mclpipeline
===================================================================
--- trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mclpipeline	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mclpipeline	2014-05-20 14:48:14 UTC (rev 16974)
@@ -9,5 +9,5 @@
 Files: /usr/share/doc/mcl/mclpipeline.ps.gz
 
 Format: HTML
-Index: /usr/share/doc/mcl/mclpipeline.html
-Files: /usr/share/doc/mcl/mclpipeline.html
+Index: /usr/share/doc/mcl/html/mclpipeline.html
+Files: /usr/share/doc/mcl/html/mclpipeline.html

Modified: trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcx
===================================================================
--- trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcx	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcx	2014-05-20 14:48:14 UTC (rev 16974)
@@ -8,5 +8,5 @@
 Files: /usr/share/doc/mcl/mcx.ps.gz
 
 Format: HTML
-Index: /usr/share/doc/mcl/mcx.html
-Files: /usr/share/doc/mcl/mcx.html
+Index: /usr/share/doc/mcl/html/mcx.html
+Files: /usr/share/doc/mcl/html/mcx.html

Modified: trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxassemble
===================================================================
--- trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxassemble	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxassemble	2014-05-20 14:48:14 UTC (rev 16974)
@@ -8,5 +8,5 @@
 Files: /usr/share/doc/mcl/mcxassemble.ps.gz
 
 Format: HTML
-Index: /usr/share/doc/mcl/mcxassemble.html
-Files: /usr/share/doc/mcl/mcxassemble.html
+Index: /usr/share/doc/mcl/html/mcxassemble.html
+Files: /usr/share/doc/mcl/html/mcxassemble.html

Modified: trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxio
===================================================================
--- trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxio	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxio	2014-05-20 14:48:14 UTC (rev 16974)
@@ -9,5 +9,5 @@
 Files: /usr/share/doc/mcl/mcxio.ps.gz
 
 Format: HTML
-Index: /usr/share/doc/mcl/mcxio.html
-Files: /usr/share/doc/mcl/mcxio.html
+Index: /usr/share/doc/mcl/html/mcxio.html
+Files: /usr/share/doc/mcl/html/mcxio.html

Modified: trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxload
===================================================================
--- trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxload	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxload	2014-05-20 14:48:14 UTC (rev 16974)
@@ -8,5 +8,5 @@
 Files: /usr/share/doc/mcl/mcxload.ps.gz
 
 Format: HTML
-Index: /usr/share/doc/mcl/mcxload.html
-Files: /usr/share/doc/mcl/mcxload.html
+Index: /usr/share/doc/mcl/html/mcxload.html
+Files: /usr/share/doc/mcl/html/mcxload.html

Modified: trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxsubs
===================================================================
--- trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxsubs	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/mcl-doc.doc-base.mcxsubs	2014-05-20 14:48:14 UTC (rev 16974)
@@ -9,5 +9,5 @@
 Files: /usr/share/doc/mcl/mcxsubs.ps.gz
 
 Format: HTML
-Index: /usr/share/doc/mcl/mcxsubs.html
-Files: /usr/share/doc/mcl/mcxsubs.html
+Index: /usr/share/doc/mcl/html/mcxsubs.html
+Files: /usr/share/doc/mcl/html/mcxsubs.html

Added: trunk/packages/mcl/trunk/debian/mcl-doc.docs
===================================================================
--- trunk/packages/mcl/trunk/debian/mcl-doc.docs	                        (rev 0)
+++ trunk/packages/mcl/trunk/debian/mcl-doc.docs	2014-05-20 14:48:14 UTC (rev 16974)
@@ -0,0 +1,4 @@
+AUTHORS
+README
+THANKS
+TODO

Modified: trunk/packages/mcl/trunk/debian/mcl-doc.install
===================================================================
--- trunk/packages/mcl/trunk/debian/mcl-doc.install	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/mcl-doc.install	2014-05-20 14:48:14 UTC (rev 16974)
@@ -1,9 +1,3 @@
-usr/share/doc/mcl/AUTHORS
-usr/share/doc/mcl/README
-usr/share/doc/mcl/THANKS
-usr/share/doc/mcl/*.html
-usr/share/doc/mcl/*.ps
-usr/share/doc/mcl/minimcl
-usr/share/doc/mcl/examples
-usr/share/man/man5
-usr/share/man/man7
+usr/share/doc/mcl/*.html	usr/share/doc/mcl/html
+usr/share/doc/mcl/*.ps		usr/share/doc/mcl/
+usr/share/doc/mcl/minimcl	usr/share/doc/mcl/

Added: trunk/packages/mcl/trunk/debian/mcl-doc.manpages
===================================================================
--- trunk/packages/mcl/trunk/debian/mcl-doc.manpages	                        (rev 0)
+++ trunk/packages/mcl/trunk/debian/mcl-doc.manpages	2014-05-20 14:48:14 UTC (rev 16974)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man[57]/*

Added: trunk/packages/mcl/trunk/debian/mcl.install
===================================================================
--- trunk/packages/mcl/trunk/debian/mcl.install	                        (rev 0)
+++ trunk/packages/mcl/trunk/debian/mcl.install	2014-05-20 14:48:14 UTC (rev 16974)
@@ -0,0 +1,2 @@
+usr/bin
+scripts/clx*	usr/share/doc/mcl/scripts

Added: trunk/packages/mcl/trunk/debian/mcl.manpages
===================================================================
--- trunk/packages/mcl/trunk/debian/mcl.manpages	                        (rev 0)
+++ trunk/packages/mcl/trunk/debian/mcl.manpages	2014-05-20 14:48:14 UTC (rev 16974)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/*

Modified: trunk/packages/mcl/trunk/debian/patches/02-wrong-interpreter-path.patch
===================================================================
--- trunk/packages/mcl/trunk/debian/patches/02-wrong-interpreter-path.patch	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/patches/02-wrong-interpreter-path.patch	2014-05-20 14:48:14 UTC (rev 16974)
@@ -1,8 +1,8 @@
 Author: Philipp Benner <philipp at debian.org>
 Purpose: Fix wrong path of perl interpreter
 
---- mcl-10-201.orig/src/alien/oxygen/src/mcxdeblast
-+++ mcl-10-201/src/alien/oxygen/src/mcxdeblast
+--- a/src/alien/oxygen/src/mcxdeblast
++++ b/src/alien/oxygen/src/mcxdeblast
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl -w
 +#!/usr/bin/perl -w

Deleted: trunk/packages/mcl/trunk/debian/patches/03-mayhem-io.patch
===================================================================
--- trunk/packages/mcl/trunk/debian/patches/03-mayhem-io.patch	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/patches/03-mayhem-io.patch	2014-05-20 14:48:14 UTC (rev 16974)
@@ -1,37 +0,0 @@
---- a/src/impala/io.c
-+++ b/src/impala/io.c
-@@ -380,6 +380,7 @@
- )
-    {  unsigned char format = '0'
-    ;  mclxIOinfo* info = mclxIOinfofy(xf)
-+   ;  mclp ivp
-    
-    ;  if (!info || mcxIOtestOpen(xf, RETURN_ON_FAIL) != STATUS_OK)
-       {  if (!info)
-@@ -395,9 +396,23 @@
- 
-       if (mcxIOtryCookie(xf, mclxCookie))
-       {  format = 'b'
--      ;  fread(pn_cols, sizeof(long), 1, xf->fp)
--      ;  fread(pn_rows, sizeof(long), 1, xf->fp)
--      ;  info->n_read += 2 * sizeof(long)
-+      ;  if
-+         (  1 != fread(pn_cols, sizeof(long), 1, xf->fp)
-+         || 1 != fread(pn_rows, sizeof(long), 1, xf->fp)
-+         || pn_cols[0] < 0
-+         || DIM_MAX / sizeof ivp < pn_cols[0]
-+         || pn_rows[0] < 0
-+         || DIM_MAX / sizeof ivp < pn_rows[0]
-+         )
-+         {  mcxErr
-+            (  "mclxReadDimensions"
-+            ,  "dimensions corrupt or too large (have %ld %ld)"
-+            ,  (long) pn_cols[0]
-+            ,  (long) pn_rows[0]
-+            )
-+         ;  return STATUS_FAIL
-+      ;  }
-+         info->n_read += 2 * sizeof(long)
-    ;  }
-       else if (mclxa_read_dimpart(xf, pn_cols, pn_rows) == STATUS_OK)
-       format = 'a'

Deleted: trunk/packages/mcl/trunk/debian/patches/04-mayhem-vector.patch
===================================================================
--- trunk/packages/mcl/trunk/debian/patches/04-mayhem-vector.patch	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/patches/04-mayhem-vector.patch	2014-05-20 14:48:14 UTC (rev 16974)
@@ -1,13 +0,0 @@
---- a/src/impala/vector.c	2013-07-09 11:05:22.084990745 +0100
-+++ b/src/impala/vector.c	2013-07-09 11:05:51.940525340 +0100
-@@ -139,7 +139,9 @@
-                                     /* I've had a suspicion that some reallocs might be too lazy
-                                      * to reuse shrunk array space.
-                                     */
--   ;  if (old_n_ivps / 2 > new_n_ivps)
-+   ;  if (DIM_MAX / sizeof new_ivps[0] < new_n_ivps)
-+   /*  DO NOTHING, enter mcxMemDenied below */
-+   ;  else if (old_n_ivps / 2 > new_n_ivps)
-       {  new_ivps = mcxAlloc(new_n_ivps * sizeof new_ivps[0], ENQUIRE_ON_FAIL)
-       ;  if (new_ivps && !src_ivps)
-          memcpy(new_ivps, dst_vec->ivps, new_n_ivps * sizeof new_ivps[0])

Modified: trunk/packages/mcl/trunk/debian/patches/05-manual-what-is.patch
===================================================================
--- trunk/packages/mcl/trunk/debian/patches/05-manual-what-is.patch	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/patches/05-manual-what-is.patch	2014-05-20 14:48:14 UTC (rev 16974)
@@ -130,17 +130,6 @@
  
  \sec{synopsis}{SYNOPSIS}
  \par{
---- a/doc/mcxctty.azm
-+++ b/doc/mcxctty.azm
-@@ -15,7 +15,7 @@
- \${html}{\"pud::man::maketoc"}
- 
- \sec{name}{NAME}
--\NAME{mcx ctty}{compute betweenness centrality for network nodes}
-+\NAME{mcx_ctty}{compute betweenness centrality for network nodes}
- 
- \sec{synopsis}{SYNOPSIS}
- \par{
 --- a/doc/mcxdiameter.azm
 +++ b/doc/mcxdiameter.azm
 @@ -15,7 +15,7 @@

Modified: trunk/packages/mcl/trunk/debian/patches/series
===================================================================
--- trunk/packages/mcl/trunk/debian/patches/series	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/patches/series	2014-05-20 14:48:14 UTC (rev 16974)
@@ -1,5 +1,3 @@
-01-restrict-variables.patch
+# 01-restrict-variables.patch
 02-wrong-interpreter-path.patch
-03-mayhem-io.patch
-04-mayhem-vector.patch
 05-manual-what-is.patch

Modified: trunk/packages/mcl/trunk/debian/rules
===================================================================
--- trunk/packages/mcl/trunk/debian/rules	2014-05-20 13:52:49 UTC (rev 16973)
+++ trunk/packages/mcl/trunk/debian/rules	2014-05-20 14:48:14 UTC (rev 16974)
@@ -1,32 +1,13 @@
 #!/usr/bin/make -f
 
-# based upon sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+pkg:= $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 
-pkg=mcl
-
 # allow bashism's in commandlines
 SHELL = /bin/bash
 
-# Debian Policy 10.1
-CFLAGS = -g -Wall
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
-INSTALL = install
-INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-INSTALL_PROGRAM += -s
-endif
-
 # variables to be used in configure invocation. see
 # autotools-dev/README.Debian.gz
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -76,118 +57,22 @@
 
 # confflags += --disable-helpful-reminder
 
-config: config-stamp
-config-stamp:
-	dh_testdir
+docbackupdir:=$(CURDIR)/debian/doc.bak
 
-#	# Make sure we have fresh config.{sub,guess}, in order to make life
-#	# more easy for porters to new architectures. See
-#	# autotools-dev/README.Debian.gz
-	if [ -r /usr/share/misc/config.sub ] && [ ! -f autofoo/config.sub.backup ]; then \
-		mv -v autofoo/config.sub autofoo/config.sub.backup; \
-		cp -f /usr/share/misc/config.sub autofoo/config.sub; \
-	fi
+%:
+	dh $@ --with autotools_dev
 
-	if [ -r /usr/share/misc/config.guess ] && [ ! -f autofoo/config.guess.backup ]; then \
-		mv -v autofoo/config.guess autofoo/config.guess.backup; \
-		cp -f /usr/share/misc/config.guess autofoo/config.guess; \
+override_dh_auto_clean:
+	dh_auto_clean
+	if [ -d $(docbackupdir) ] ; then \
+	    rm -rf doc ; \
+	    mv $(docbackupdir) doc ; \
 	fi
 
-	touch $@
-
-config-clean:
-	dh_testdir
-	dh_testroot
-
-	if [ -f autofoo/config.sub.backup ]; then \
-		mv -fv autofoo/config.sub.backup autofoo/config.sub; \
-	fi
-
-	if [ -f autofoo/config.guess.backup ]; then \
-		mv -fv autofoo/config.guess.backup autofoo/config.guess; \
-	fi
-
-	$(RM) config-stamp
-
-
-configure: config configure-stamp
-configure-stamp:
-	dh_testdir
-
+override_dh_auto_configure:
+	cp -a doc $(docbackupdir)
 	./configure \
            $(confflags) \
            --prefix=/usr \
            --mandir=\$${prefix}/share/man \
            --infodir=\$${prefix}/share/info
-
-	touch configure-stamp
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: configure $(QUILT_STAMPFN)
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
-
-clean: config-clean
-	dh_testdir
-	dh_testroot
-	$(RM) -f build-stamp configure-stamp
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/mcl
-#	# install some extra stuff not installed by upstream
-	install -c -m 644 $(CURDIR)/{AUTHORS,README,THANKS} $(CURDIR)/debian/mcl/usr/share/doc/mcl/
-	mkdir $(CURDIR)/debian/mcl/usr/share/doc/mcl/scripts
-	install -c -m 644 $(CURDIR)/scripts/clx* $(CURDIR)/debian/mcl/usr/share/doc/mcl/scripts/
-#	# clean up unneeded docs
-	$(RM) $(CURDIR)/debian/mcl/usr/share/doc/mcl/*txt
-#	# process mcl-doc.install
-	dh_install --sourcedir=debian/mcl
-	dh_installdocs
-#	# clean up files just copied to mcl-doc
-	$(RM) $(CURDIR)/debian/mcl/usr/share/doc/mcl/{AUTHORS,README,THANKS}
-	$(RM) $(CURDIR)/debian/mcl/usr/share/doc/mcl/*{html,ps,minimcl}
-	$(RM) -r $(CURDIR)/debian/mcl/usr/share/doc/mcl/examples
-	$(RM) -r $(CURDIR)/debian/mcl/usr/share/man/man[5,7]
-
-binary-indep: build install
-	dh_installman
-	dh_installchangelogs ChangeLog
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb -pmcl-doc
-
-
-binary-arch: build install
-#	no need to call dh_installexamples: upstream takes care of
-#        this in 'make install'
-	dh_installman
-	dh_installchangelogs ChangeLog
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb -pmcl
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure config config-clean




More information about the debian-med-commit mailing list