Joey Hess [Tue, 29 Dec 2009 20:13:48 +0000 (15:13 -0500)]
consistent indent
Joey Hess [Tue, 29 Dec 2009 20:11:44 +0000 (15:11 -0500)]
dh_installxfonts: Use new update-fonts-alias --include and --exclude options to better handle removal in the case where xfonts-utils is removed before a font package is purged. (#543512; thanks, Theppitak Karoonboonyanan)
Joey Hess [Tue, 29 Dec 2009 20:03:37 +0000 (15:03 -0500)]
typo
Joey Hess [Tue, 15 Dec 2009 21:28:41 +0000 (16:28 -0500)]
dhinstallman: Avoid doubled slashes in path. Closes: #561275
Joey Hess [Tue, 15 Dec 2009 00:36:21 +0000 (19:36 -0500)]
dh(1): Add an example of using an override target to avoid dh running several commands. Closes: #560600
Joey Hess [Tue, 15 Dec 2009 00:23:59 +0000 (19:23 -0500)]
dh(1): Minor rewording of documentation of override commands. Closes: #560421
Joey Hess [Wed, 9 Dec 2009 20:22:38 +0000 (15:22 -0500)]
releasing version 7.4.10
Joey Hess [Wed, 9 Dec 2009 20:08:59 +0000 (15:08 -0500)]
Revert "dh_makeshlibs: Make -X also exclude libraries from the symbols file. Closes: #557603 (Peter Samuelson)"
This reverts commit
a6d3e307da558f6bf455a0d21e1cb9ec1b4fef03.
Necessary because it caused a behavior change and broke some package
builds.
Joey Hess [Mon, 7 Dec 2009 19:35:38 +0000 (14:35 -0500)]
changelog and doc rewording
Modestas Vainius [Fri, 4 Dec 2009 20:31:14 +0000 (22:31 +0200)]
Typo in the code.
How perl didn't fail one this is beyond me.
Modestas Vainius [Thu, 3 Dec 2009 22:17:06 +0000 (00:17 +0200)]
Add --parallel option.
This patch adds --parallel option that enables parallel builds and does not
impose limits on maximum concurrent processes. --max-parallel (that implies
--parallel) can be used to specify that maximum limit.
Also make necessary adjustments to debhelper.pod and buildsystem_tests for
this option.
Modestas Vainius [Thu, 3 Dec 2009 22:11:00 +0000 (00:11 +0200)]
In my opinion, this way of putting it is more obvious.
$max is about upper limit. Make algorithm reflect that.
(cherry picked from commit
62d7dc07b97a12912cfe08483c6fb244161224f5)
Modestas Vainius [Thu, 3 Dec 2009 22:08:52 +0000 (00:08 +0200)]
Excess whitespace. Git complains about it.
(cherry picked from commit
11b0b2483302f8694d8c6a76c73df1eefca7ad1f)
Modestas Vainius [Thu, 3 Dec 2009 22:02:01 +0000 (00:02 +0200)]
Sometimes SIGINTing the test suite leaves Makefile behind.
So use -f for ln. It is safe.
(cherry picked from commit
d89a2c6d2c7148f6e890c0c11e64b92982d3f869)
Modestas Vainius [Thu, 3 Dec 2009 21:57:43 +0000 (23:57 +0200)]
Remove legacy punctuation hacks tests which no longer work by design.
I assume backwards compatibility in this area was broken by design. Adding
--max-parallel to these in
6dd27753803ae2091a9fc3aedc8e70548ea87675 was wrong
and negated their whole point, i.e. testing of backwards compatibility when
parallel options were not supported.
(cherry picked from commit
ca0ad4922ada7ae013b035cfe1550a257a330809)
Modestas Vainius [Thu, 3 Dec 2009 21:48:31 +0000 (23:48 +0200)]
Drop tests previously written for dpkg-buildpackage -jX detection.
dpkg-buildpackage -jX detection is gone so these tests were redundant.
(cherry picked from commit
fd6880eddac9bde6ecdec514a83a169f36316b6a)
Joey Hess [Mon, 30 Nov 2009 19:29:25 +0000 (14:29 -0500)]
releasing version 7.4.9
Joey Hess [Mon, 30 Nov 2009 19:21:02 +0000 (14:21 -0500)]
dh_installinit: Fix installation of defaults file when an upstart job is installed. Closes: #558782
Joey Hess [Sun, 29 Nov 2009 19:07:03 +0000 (14:07 -0500)]
Typo. Closes: #558654
Joey Hess [Mon, 23 Nov 2009 19:28:02 +0000 (14:28 -0500)]
releasing version 7.4.8
Joey Hess [Mon, 23 Nov 2009 19:18:32 +0000 (14:18 -0500)]
update for no-paralle-by-default change
Joey Hess [Mon, 23 Nov 2009 18:54:31 +0000 (13:54 -0500)]
Parallel building support is no longer enabled by default. It can still be enabled by using the --max-parallel option. This was necessary because some buildds build with -j2 by default.
Joey Hess [Mon, 23 Nov 2009 18:16:49 +0000 (13:16 -0500)]
dh_makeshlibs: Make -X also exclude libraries from the symbols file. Closes: #557603 (Peter Samuelson)
Joey Hess [Sun, 22 Nov 2009 18:33:11 +0000 (13:33 -0500)]
dh: Document --no-act. Closes: #557505
Joey Hess [Sat, 21 Nov 2009 18:40:07 +0000 (13:40 -0500)]
releasing version 7.4.7
Joey Hess [Sat, 21 Nov 2009 18:33:33 +0000 (13:33 -0500)]
make: Avoid infinite loop that occurrs when testing existence of a target in a certian horribly broken makefile
by making the test stop after it sees one line of output from make. (This
may be better replaced with dh's makefile parser in the future.)
Joey Hess [Sat, 21 Nov 2009 18:12:15 +0000 (13:12 -0500)]
releasing version 7.4.6
Modestas Vainius [Sat, 21 Nov 2009 15:16:45 +0000 (17:16 +0200)]
Fix deep recursive in cmake::test().
Joey Hess [Fri, 20 Nov 2009 22:38:03 +0000 (17:38 -0500)]
Remove last vestiages of support for /usr/X11R6.
Joey Hess [Thu, 19 Nov 2009 19:54:23 +0000 (14:54 -0500)]
use foreach instead of for when looping thru array
Modestas Vainius [Thu, 19 Nov 2009 18:58:39 +0000 (20:58 +0200)]
cmake build+ steps need Makefile.
The condition is not what dh_auto_* 7.0.x would have done. The
patch makes auto-selection to pass through cmake.pm if Makefile
was not created. This problem is not very dangerous though.
Joey Hess [Thu, 19 Nov 2009 19:48:26 +0000 (14:48 -0500)]
changelog
Modestas Vainius [Thu, 19 Nov 2009 18:45:14 +0000 (20:45 +0200)]
Make buildsystems_list() use updated auto-selection code.
In order to avoid code duplication, auto-selection code has been refactored
into separate subroutine autoselect_buildsystem(). Both load_buildsystem() and
buildsystem_list() use it.
Modestas Vainius [Thu, 19 Nov 2009 17:23:59 +0000 (19:23 +0200)]
Add tests for #557006 bug.
When sourcedir/builddir is empty, check if:
1) auto-selection does not select any build system;
2) check_auto_buildable() returns numeric 0 for all auto-selectable
build systems.
Joey Hess [Thu, 19 Nov 2009 16:57:14 +0000 (11:57 -0500)]
releasing version 7.4.5
Cyril Brulebois [Thu, 19 Nov 2009 02:33:52 +0000 (03:33 +0100)]
Fix build system auto-selection breakage.
Probably due to an overlook in
758ce0bb1f, the '-e' test on build.xml
disappeared, leading check_auto_buildable() to always return '1' for
the ant build system.
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Joey Hess [Wed, 18 Nov 2009 19:48:56 +0000 (14:48 -0500)]
releasing version 7.4.4
Joey Hess [Wed, 18 Nov 2009 19:28:47 +0000 (14:28 -0500)]
comment munging
Joey Hess [Wed, 18 Nov 2009 19:20:33 +0000 (14:20 -0500)]
changelog
Modestas Vainius [Wed, 18 Nov 2009 19:16:41 +0000 (14:16 -0500)]
Improve build system auto-selection process
This patch alters semantics of check_auto_buildable() a bit. Now it can
also indicate if the source has already been partitially built with the
build system and if so, such build system may be auto-selected over a less
specific its parent (in the inheritance tree) even if the latter is earlier
in the @BUILDSYSTEMS array.
However, this still leaves a requirement that a derivative build system
must not do anything that may break packages of the parent build system.
Otherwise, introduction of a new derivative build system might break
packages which already had that build system implemented via overrides...
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Joey Hess [Tue, 17 Nov 2009 02:17:13 +0000 (21:17 -0500)]
cute tail display of config.log, to include a header
Joey Hess [Tue, 17 Nov 2009 02:14:19 +0000 (21:14 -0500)]
credit
Joey Hess [Tue, 17 Nov 2009 02:13:21 +0000 (21:13 -0500)]
clarify
Joey Hess [Tue, 17 Nov 2009 02:10:45 +0000 (21:10 -0500)]
autoconf: If configure fails, cat config.log. Intended to make it easier to debug configure script failures on autobuilders. Closes: #556384
Joey Hess [Tue, 17 Nov 2009 02:07:33 +0000 (21:07 -0500)]
make error() throw a catchable error with die
exit cannot be caught with eval.. I used exit before because I thought it
was cute for erorr() to call warning(). Silly.
Modestas Vainius [Tue, 17 Nov 2009 01:40:26 +0000 (20:40 -0500)]
Enable verbose ctest output on test failure
When test fails, enable verbose ctest output. This allows to
get more details on a test failure from the build logs.
Auto-select cmake in further steps only if cmake was run in configure step.
CMake writes CMakeCache.txt to build directory when it is run. Depend on the
presence of this file for auto-selection in build, test, install and clean
steps.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Joey Hess [Thu, 12 Nov 2009 18:38:51 +0000 (13:38 -0500)]
cmake: Set CTEST_OUTPUT_ON_FAILURE when running test suite. Closes: #555807
Modestas Vainius [Thu, 12 Nov 2009 18:37:50 +0000 (13:37 -0500)]
Enable verbose ctest output on test failure
When test fails, enable verbose ctest output. This allows to
get more details on a test failure from the build logs.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Joey Hess [Thu, 12 Nov 2009 18:31:01 +0000 (13:31 -0500)]
Typo. Closes: #555659
Joey Hess [Thu, 12 Nov 2009 18:30:14 +0000 (13:30 -0500)]
dh_installdocs: Warn if a doc-base file cannot be parsed to find a document id. Closes: #555677
Joey Hess [Thu, 12 Nov 2009 18:21:37 +0000 (13:21 -0500)]
clarify
Joey Hess [Thu, 12 Nov 2009 18:11:38 +0000 (13:11 -0500)]
Adjust code to add deprecation warning for compatability level 4. (Man page already said it was deprecated.) Closes: #555899
Joey Hess [Thu, 5 Nov 2009 02:17:38 +0000 (21:17 -0500)]
Drop deprecated programs from the list of commands in debhelper(7). Closes: #548382
Joey Hess [Thu, 5 Nov 2009 01:52:06 +0000 (20:52 -0500)]
update
Joey Hess [Thu, 5 Nov 2009 01:47:13 +0000 (20:47 -0500)]
Add deprecation warnings for -u to the documentation, since putting options after -- is much more sane. (However, -u will not go away any time soon.) Closes: #554509
Joey Hess [Thu, 5 Nov 2009 01:39:07 +0000 (20:39 -0500)]
clarify changelog
Joey Hess [Thu, 5 Nov 2009 01:30:44 +0000 (20:30 -0500)]
--max-parallel requires a number
Joey Hess [Thu, 29 Oct 2009 23:45:06 +0000 (19:45 -0400)]
support unlimited parallel jobs
dpkg-buildpackage -j sets DEB_BUILD_OPTIONS=parallel=-1. Policy does not
cover this but the intent is to allow unlimited parallel jobs.
Also, there is no longer any way for parallel to be set to undef, so remove
code to handle that.
Joey Hess [Thu, 29 Oct 2009 20:32:29 +0000 (16:32 -0400)]
update test suite for implicit parallelisation and flag rename
Joey Hess [Thu, 29 Oct 2009 20:25:43 +0000 (16:25 -0400)]
logic error
Joey Hess [Thu, 29 Oct 2009 20:12:57 +0000 (16:12 -0400)]
implement the other option: parallel enabled implicitly by DEB_BUILD_OPTIONS
I renamed --parallel to --max-parallel to clarify that it doesn't enable
parallelism, but only controls how much of it is allowed.
Joey Hess [Wed, 28 Oct 2009 22:30:24 +0000 (18:30 -0400)]
remove implicit --parallel setting by dh
Joey Hess [Wed, 28 Oct 2009 22:22:44 +0000 (18:22 -0400)]
logic simplification
Joey Hess [Wed, 28 Oct 2009 22:22:22 +0000 (18:22 -0400)]
preliminary changelog
Joey Hess [Wed, 28 Oct 2009 21:57:33 +0000 (17:57 -0400)]
clarify wording
Joey Hess [Wed, 28 Oct 2009 21:46:45 +0000 (17:46 -0400)]
refactor --parallel processing
Use a function to set the value rather than post-processing.
Joey Hess [Wed, 28 Oct 2009 21:23:28 +0000 (17:23 -0400)]
reduce amount of MAKEFLAGS cleaning
Now clean_jobserver_makeflags will only remove --jobserver settings
from MAKEFLAGS. This is simpler and easier to understand than
the old behavior, which, if there was no --jobserver, removed
all -j and --jobs, while leaving those when removing --jobserver.
This relies on -j options passed to make overriding
-j settings in MAKEFLAGS. So we don't need to clean those out,
we can just override them.
Joey Hess [Wed, 28 Oct 2009 20:45:12 +0000 (16:45 -0400)]
split get_make_jobserver_status into two functions
I disliked the complexity of the return values, and the boilerplate
code that followed the two calls to the function, to clean/unset
MAKEFLAGS. To solve both, I refactored it into two functions, one simply
tests to see if a jobserver is specified but unavailable, while the other
cleans/unsets MAKEFLAGS.
This loses the ability to pull the jobs-N count out of MAKEFLAGS,
but that was not currently used.
Joey Hess [Wed, 28 Oct 2009 20:03:46 +0000 (16:03 -0400)]
move obscure function to EOF
Modestas Vainius [Wed, 28 Oct 2009 19:49:34 +0000 (15:49 -0400)]
Support parallel building in makefile buildsystem
1) Add routine to Dh_Lib (used by dh and makefile.pm) which is capable of
detecting make jobserver and job control options from the MAKEFLAGS environment
variable. It also generates and returns a clean up MAKEFLAGS from these
options.
2) Add --parallel option to build system framework which allows source packages
to specify that they support parallel building. Optional value for this option is
the number of maximum parallel process to allow. However, the actual number of
parallel process (if any) for the specific build is determined from
DEB_BUILD_OPTIONS env variable as specified by Debian Policy.
By default (no --parallel option) parallel is neither enabled nor disabled
(depends on the external environment). However, dh may pass --parallel to
dh_auto_* implicitly in case 4) described below.
3) Add parallel support for makefile buildsystem. This implementation
forcefully starts a new make job server (or disables parallel) for the number
of process requested. If --parallel was not passed to the build system at all,
the build system will only clean up MAKEFLAGS from stale jobserver options to
avoid pointless make warnings.
4) If dh detects that it is being run by dpkg-buildpackage -jX and it is NOT
run with "+" prefix from debian/rules (i.e. jobserver is not reachable), it
enables --parallel implicitly. This closes: #532805.
Signed-off-by: Modestas Vainius <modestas@vainius.eu>
Joey Hess [Mon, 19 Oct 2009 20:12:24 +0000 (16:12 -0400)]
Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
Joey Hess [Mon, 19 Oct 2009 20:05:47 +0000 (16:05 -0400)]
consistently print whole failing command line
Joey Hess [Mon, 12 Oct 2009 00:12:31 +0000 (20:12 -0400)]
Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
Joey Hess [Sun, 11 Oct 2009 23:53:47 +0000 (19:53 -0400)]
two more dh_install tests
Joey Hess [Thu, 1 Oct 2009 19:12:20 +0000 (15:12 -0400)]
Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
Joey Hess [Thu, 1 Oct 2009 18:47:15 +0000 (14:47 -0400)]
Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
Joey Hess [Thu, 1 Oct 2009 18:43:03 +0000 (14:43 -0400)]
releasing version 7.4.3
Joey Hess [Thu, 1 Oct 2009 18:20:59 +0000 (14:20 -0400)]
invert python ordering
--force allows doing so
Joey Hess [Thu, 1 Oct 2009 18:11:13 +0000 (14:11 -0400)]
indentation
Andrew Straw [Sun, 27 Sep 2009 00:26:01 +0000 (17:26 -0700)]
Pass --force option to Python distutils install command.
This command will prevent distutils from attempting to determine
whether a file should be installed based on the timestamp of the
to-be-overwritten file.
Joey Hess [Tue, 29 Sep 2009 22:12:04 +0000 (18:12 -0400)]
Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
valery perrin [Tue, 29 Sep 2009 21:17:13 +0000 (23:17 +0200)]
fix a spelling mistake in dh_makeshlibs man french translation (#494300 part 2)
Joey Hess [Mon, 28 Sep 2009 02:12:26 +0000 (22:12 -0400)]
Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
Joey Hess [Mon, 28 Sep 2009 01:24:09 +0000 (21:24 -0400)]
format
Joey Hess [Mon, 28 Sep 2009 01:23:46 +0000 (21:23 -0400)]
Allow dpkg-architecture to print errors to stderr. Closes: #548636
Joey Hess [Thu, 17 Sep 2009 21:12:31 +0000 (17:12 -0400)]
Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
valery perrin [Thu, 17 Sep 2009 20:44:04 +0000 (22:44 +0200)]
Add dh_lintian french translation
Joey Hess [Wed, 16 Sep 2009 00:12:05 +0000 (20:12 -0400)]
Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
Valéry Perrin [Tue, 15 Sep 2009 23:15:09 +0000 (01:15 +0200)]
* update french translation. Closes: #494300, #477703
* add --previous at po4a command into Makefile
* add dh, dh_auto_install, dh_auto_clean, dh_auto_configure,
dh_auto_install, dh_auto_test, dh_bugfiles, dh_icons,
dh_installifupdown, dh_installudev, dh_prep
into po4a.cfg manpages list
Valery.Perrin (valery.perrin.debian@free.fr)
Joey Hess [Tue, 15 Sep 2009 18:12:02 +0000 (14:12 -0400)]
Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
Joey Hess [Tue, 15 Sep 2009 17:19:00 +0000 (13:19 -0400)]
dh_perl: Do not look at perl scripts under /usr/share/doc. Closes: #546683
Joey Hess [Mon, 14 Sep 2009 21:12:12 +0000 (17:12 -0400)]
Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
Joey Hess [Mon, 14 Sep 2009 20:17:40 +0000 (16:17 -0400)]
releasing version 7.4.2
Joey Hess [Mon, 14 Sep 2009 18:12:22 +0000 (14:12 -0400)]
Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
Joey Hess [Mon, 14 Sep 2009 17:31:34 +0000 (13:31 -0400)]
dh_installudev: With --name, install debian/<package>.<name>.udev to rules.d/<priority>-<name>, the same as debian/<name>.udev is installed for the first package. Closes: #546337
Joey Hess [Mon, 14 Sep 2009 17:12:09 +0000 (13:12 -0400)]
Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
Joey Hess [Mon, 14 Sep 2009 17:11:07 +0000 (13:11 -0400)]
Reorder dh_pysupport call in dh sequence to come before dh_installinit, so the generated postinst script registers python modules before trying to use them. Closes: #546293
Joey Hess [Tue, 8 Sep 2009 22:12:19 +0000 (18:12 -0400)]
Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
Joey Hess [Tue, 8 Sep 2009 21:58:18 +0000 (17:58 -0400)]
dh_installdocs: Add --link-doc option that can be used to link documentation directories. This is easier to use and more flexible than the old method of running dh_link first to make a broken symlink. Closes: #545676 Thanks, Colin Watson
Colin Watson [Tue, 8 Sep 2009 11:17:02 +0000 (12:17 +0100)]
Bug#545676: dh_installdocs: option to link documentation directories
As discussed by e-mail, dh_installdocs could do with an option to make
the documentation directory a symlink, to clean up dh-using packages
that otherwise need to use override targets to arrange for dh_link to
run before dh_installdocs.
This turns out to be slightly involved due to the need to handle the
case where you want to do this *and* also install some extra
documentation in the symlink target, while also making a dangling
symlink and avoiding file conflicts in the simple case, so I had to
change dh_installchangelogs as well. I think this is right now; tested
on debconf ('dh_installdocs -Ndebconf-doc --link-doc=debconf;
dh_installdocs -pdebconf-doc') and groff ('dh_installdocs
--link-doc=groff-base').