Author: plessy Date: 2010-12-31 14:33:28 +0000 (Fri, 31 Dec 2010) New Revision: 5636
Modified: trunk/packages/probcons/trunk/debian/changelog trunk/packages/probcons/trunk/debian/compat trunk/packages/probcons/trunk/debian/control trunk/packages/probcons/trunk/debian/rules Log: Use dh in debian/rules, hoping it solves #607729 because it does not allow parallel build by default. Modified: trunk/packages/probcons/trunk/debian/changelog =================================================================== --- trunk/packages/probcons/trunk/debian/changelog 2010-12-31 04:53:34 UTC (rev 5635) +++ trunk/packages/probcons/trunk/debian/changelog 2010-12-31 14:33:28 UTC (rev 5636) @@ -1,3 +1,11 @@ +probcons (1.12-7) UNRELEASED; urgency=low + + * Use dh for debian/rules, which will also switch off parallel building + (Closes: #607729). + * Switch to Debhelper 8 (debian/control, debian/compat). + + -- Charles Plessy <[email protected]> Mon, 27 Dec 2010 01:40:47 +0900 + probcons (1.12-6) unstable; urgency=low * Use proper C++ headers to fix gcc version 4.3 and higher Modified: trunk/packages/probcons/trunk/debian/compat =================================================================== --- trunk/packages/probcons/trunk/debian/compat 2010-12-31 04:53:34 UTC (rev 5635) +++ trunk/packages/probcons/trunk/debian/compat 2010-12-31 14:33:28 UTC (rev 5636) @@ -1 +1 @@ -7 +8 Modified: trunk/packages/probcons/trunk/debian/control =================================================================== --- trunk/packages/probcons/trunk/debian/control 2010-12-31 04:53:34 UTC (rev 5635) +++ trunk/packages/probcons/trunk/debian/control 2010-12-31 14:33:28 UTC (rev 5636) @@ -4,7 +4,7 @@ Maintainer: Debian Med Packaging Team <[email protected]> DM-Upload-Allowed: yes Uploaders: Charles Plessy <[email protected]>, Andreas Tille <[email protected]> -Build-Depends: debhelper (>= 7), quilt +Build-Depends: debhelper (>= 8), quilt Standards-Version: 3.9.1 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/probcons/trunk/?rev=0&sc=0 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/probcons/trunk/ Modified: trunk/packages/probcons/trunk/debian/rules =================================================================== --- trunk/packages/probcons/trunk/debian/rules 2010-12-31 04:53:34 UTC (rev 5635) +++ trunk/packages/probcons/trunk/debian/rules 2010-12-31 14:33:28 UTC (rev 5636) @@ -1,14 +1,23 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Build rules for the Debian package probcons -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# Modifications by Charles Plessy during the years 2006 and 2007can also -# be used without restriction. +%: + dh $@ + BINARIES = probcons probcons-RNA pc-project pc-compare pc-makegnuplot + +override_dh_auto_build: + cp Main.cc Main-RNA.cc + sed -i s/Defaults.h/Defaults-RNA.h/ Main-RNA.cc + cp debian/Defaults-RNA.h Defaults-RNA.h + dh_auto_build + +override_dh_link: + rm -rf $(CURDIR)/debian/probcons-extra/usr/share/doc/probcons-extra + dh_link -p probcons-extra usr/share/doc/probcons usr/share/doc/probcons-extra + +override_dh_clean: + dh_clean $(BINARIES) Main-RNA.cc Defaults-RNA.h + XP = xsltproc \ -''-nonet \ -''-param man.charmap.use.subset "0" \ @@ -16,67 +25,9 @@ -''-param make.single.year.ranges "1" \ -o debian/ -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) -endif -MAKEFLAGS += $(NUMJOBS) - -include /usr/share/quilt/quilt.make - -build: patch build-stamp -build-stamp: - dh_testdir - cp Main.cc Main-RNA.cc - sed -i s/Defaults.h/Defaults-RNA.h/ Main-RNA.cc - cp debian/Defaults-RNA.h Defaults-RNA.h - $(MAKE) $(MAKEFLAGS) - touch $@ - manpages: debian/probcons.1.xml debian/probcons-RNA.1.xml debian/pc-project.1.xml debian/pc-compare.1.xml debian/pc-makegnuplot.1.xml $(XP) debian/probcons.1.xml $(XP) debian/probcons-RNA.1.xml $(XP) debian/pc-project.1.xml $(XP) debian/pc-compare.1.xml $(XP) debian/pc-makegnuplot.1.xml - -clean: unpatch - dh_testdir - dh_testroot - dh_clean $(BINARIES) Main-RNA.cc Defaults-RNA.h build-stamp - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - ln -s probcons debian/probcons-extra/usr/share/doc/probcons-extra - -binary-indep: build install -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_install - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -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/mailman/listinfo/debian-med-commit
