Author: plessy
Date: 2012-02-07 05:48:57 +0000 (Tue, 07 Feb 2012)
New Revision: 9605
Modified:
trunk/packages/mummer/trunk/debian/changelog
trunk/packages/mummer/trunk/debian/rules
Log:
Simplify debian/rules using dh.
Modified: trunk/packages/mummer/trunk/debian/changelog
===================================================================
--- trunk/packages/mummer/trunk/debian/changelog 2012-02-07 05:30:12 UTC
(rev 9604)
+++ trunk/packages/mummer/trunk/debian/changelog 2012-02-07 05:48:57 UTC
(rev 9605)
@@ -8,6 +8,7 @@
* Support DEB_BUILD_OPTIONS via Debhelper (debian/rules).
* Use dpkg source format 3.0 (quilt) as a patch system (debian/rules,
debian/control, debian/source/format).
+ * Simplify debian/rules using dh.
-- Charles Plessy <[email protected]> Thu, 02 Feb 2012 12:59:31 +0900
Modified: trunk/packages/mummer/trunk/debian/rules
===================================================================
--- trunk/packages/mummer/trunk/debian/rules 2012-02-07 05:30:12 UTC (rev
9604)
+++ trunk/packages/mummer/trunk/debian/rules 2012-02-07 05:48:57 UTC (rev
9605)
@@ -1,11 +1,7 @@
#!/usr/bin/make -f
+%:
+ dh $@
-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
@@ -16,16 +12,7 @@
FINAL_AUX_BIN_DIR = /usr/lib/mummer
FINAL_SCRIPT_DIR = /usr/share/perl5/
-build: build-stamp
-build-stamp:
-# Unfortunately the upstream makefile does not separate the build and install
steps.
-
-install: build
-# Unfortunately the upstream makefile does not separate the build and install
steps.
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
+override_dh_auto_build:
[ -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) \
@@ -33,25 +20,18 @@
FINAL_SCRIPT_DIR=$(FINAL_SCRIPT_DIR) \
CFLAGS="$(CFLAGS)"
$(MAKE) -C docs
+
+override_dh_auto_test:
$(MAKE) check
-# /usr/bin/annotate renamed /usr/bin/mummer-annotate for namespace and license
(Artistic) reasons.
- mv $(CURDIR)/debian/tmp/usr/bin/annotate
$(CURDIR)/debian/tmp/usr/bin/mummer-annotate
- dh_install
- touch build-stamp
-clean:
- dh clean
+override_dh_prep:
+# Unfortunately the upstream makefile does not separate the build and install
steps.
+ dh_prep -X debian/tmp
-binary-indep: build install
- dh binary-indep
+override_dh_auto_install:
+# /usr/bin/annotate renamed /usr/bin/mummer-annotate for namespace and license
(Artistic) reasons.
+ mv $(BIN_DIR)/annotate $(BIN_DIR)/mummer-annotate
-binary-arch: build install
- dh binary-arch
-
-override_dh_install:
- dh_install
- [ -f $(BIN_DIR)/annotate ] && mv $(BIN_DIR)/annotate
$(BIN_DIR)/mummer-annotate
-
override_dh_compress:
dh_compress -Xpdf
@@ -68,6 +48,3 @@
rm -vf `find . -maxdepth 4 -name [MX]*.pdf` ;\
GZIP="--best --no-name" tar -czf ../$(NAME)_$(VERSION)~dfsg.orig.tar.gz
*
rm -rf tmp
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
