gregor herrmann [Fri, 30 Sep 2011 11:40:27 +0000 (13:40 +0200)]
Pass CFLAGS also to perl_build.
Closes: 497653
Joey Hess [Thu, 29 Sep 2011 20:26:33 +0000 (16:26 -0400)]
releasing version 8.9.8
Joey Hess [Thu, 29 Sep 2011 19:41:36 +0000 (15:41 -0400)]
perl_makemaker: In v9, pass CFLAGS to Makefile.PL using OPTIMIZE. Closes: #643702 Thanks, Steve Langasek.
Joey Hess [Thu, 29 Sep 2011 19:40:00 +0000 (15:40 -0400)]
update v9 docs
Joey Hess [Thu, 29 Sep 2011 19:37:31 +0000 (15:37 -0400)]
setting OPTIMIZE could in theory lead to breakage, so make it v9
Joey Hess [Thu, 29 Sep 2011 19:36:35 +0000 (15:36 -0400)]
fix indentation
Steve Langasek [Wed, 28 Sep 2011 19:37:42 +0000 (12:37 -0700)]
pass dpkg-buildflags to makemaker build system
The standard way to pass build flags to makemaker perl build systems is to
set the OPTIMIZE variable on the commandline; CFLAGS in the environment gets
ignored entirely. So pass the CFLAGS from the environment to Makefile.PL so
makemaker packages can also benefit from dpkg-buildflags.
Joey Hess [Tue, 27 Sep 2011 12:47:36 +0000 (08:47 -0400)]
wording
Joey Hess [Tue, 27 Sep 2011 03:02:14 +0000 (23:02 -0400)]
update
Joey Hess [Tue, 27 Sep 2011 00:49:08 +0000 (20:49 -0400)]
Mention in debhelper(7) that buildsystem options are typically passed to dh. Closes: #643069
Joey Hess [Sun, 25 Sep 2011 15:56:38 +0000 (11:56 -0400)]
Clarify description of dh_auto_* -- params. Closes: #642786
Joey Hess [Mon, 12 Sep 2011 22:52:42 +0000 (18:52 -0400)]
dh: Avoid compat deprecation warning before option parsing. Closes: #641361
Joey Hess [Mon, 12 Sep 2011 17:40:27 +0000 (13:40 -0400)]
dh_fixperms: Operate on .ali files throughout /usr/lib, including multiarch dirs. Closes: #641279
This is extra work, but querying dpkg-architecture for the multiarch lib
dir could easily take just as long.
Joey Hess [Mon, 12 Sep 2011 01:49:43 +0000 (21:49 -0400)]
releasing version 8.9.7
Joey Hess [Mon, 12 Sep 2011 01:39:56 +0000 (21:39 -0400)]
pod error
Joey Hess [Mon, 12 Sep 2011 00:26:11 +0000 (20:26 -0400)]
dh: Avoid running install sequence a third time in v9 when the rules file has explicit binary-indep and binary-arch targets.
Closes: #639341 Thanks, Yann Dirson for test case.
Joey Hess [Sun, 11 Sep 2011 18:28:34 +0000 (14:28 -0400)]
reorder
Joey Hess [Sun, 11 Sep 2011 18:06:27 +0000 (14:06 -0400)]
-arch and -indep overrides
* dh: Now you can use override_dh_command-arch and override_dh_command-indep
to run different overrides when building arch and indep packages. This
allows for a much simplified form of rules file in this situation, where
build-arch/indep and binary-arch/indep targets do not need to be manually
specified. See man page for examples.
* dh: Note that if a rules file has say, override_dh_fixperms-arch,
but no corresponding override_dh_fixperms-indep, then the unoverridden
dh_fixperms will be run on the indep packages.
* dh: Note that the old override_dh_command takes precidence over the new
overrides, because mixing the two types of overrides would have been
too complicated. In particular, it's difficult to ensure an
old override target will work if it's sometimes constrained to only
acting on half the packages it would normally run on. This would be
a source of subtle bugs, so is avoided.
Joey Hess [Sun, 11 Sep 2011 16:58:33 +0000 (12:58 -0400)]
simplify
Joey Hess [Sat, 10 Sep 2011 22:35:52 +0000 (18:35 -0400)]
refactor
Should be no behavior changes, although I did drop the comment when
skipping an empty override target.
Joey Hess [Fri, 9 Sep 2011 15:17:27 +0000 (11:17 -0400)]
Tighten parsing of DEB_BUILD_OPTIONS.
A future nostripexceptonfullmoon option seems unlikely, but sure,
let's be strict. More importantly, let's reuse good code.
Joey Hess [Thu, 8 Sep 2011 22:22:39 +0000 (18:22 -0400)]
wording
Joey Hess [Thu, 8 Sep 2011 20:25:49 +0000 (16:25 -0400)]
remove quilt example
3.0 (quilt) is presumably better
Joey Hess [Thu, 8 Sep 2011 20:25:26 +0000 (16:25 -0400)]
reorg man page to list deprecated options in a final section
Joey Hess [Mon, 5 Sep 2011 23:30:18 +0000 (19:30 -0400)]
Avoid writing debhelper log files in no-act mode. Closes: #640586
Joey Hess [Mon, 5 Sep 2011 19:48:48 +0000 (15:48 -0400)]
typo
Joey Hess [Tue, 30 Aug 2011 00:56:19 +0000 (20:56 -0400)]
fix pod breakage
Joey Hess [Tue, 30 Aug 2011 00:34:00 +0000 (20:34 -0400)]
Remove obsolete versioned dependency on perl-base.
5.10 is in stable, which is good enough for me.
(And this dependency was added for very unclear reasons in the first place.)
Joey Hess [Tue, 30 Aug 2011 00:29:11 +0000 (20:29 -0400)]
remove build-dep on file
It was only needed so dh_shlibdeps and dh_strip, which are no longer run
during build.
Joey Hess [Tue, 30 Aug 2011 00:26:23 +0000 (20:26 -0400)]
adh: Don't bother running dh_shlibdebs, dh_makeshelibs, or dh_strip for the binary target when all packages being acted on are indep.
This is a not particularly interesting optimisation, but it will allow my
next commit..
Joey Hess [Tue, 30 Aug 2011 00:20:08 +0000 (20:20 -0400)]
debhelper no longer build-depends on man-db, to ease bootstrapping.
The man page recode is not necessary as the man pages are utf-8 already.
Joey Hess [Tue, 23 Aug 2011 19:30:18 +0000 (15:30 -0400)]
releasing version 8.9.6
Gergely Nagy [Tue, 23 Aug 2011 18:36:57 +0000 (20:36 +0200)]
dh_installlogcheck: Add support for --name.
This patch makes dh_installlogcheck be similar to other helpers, like
dh_installlogrotate that already support a --name option: to install
the files as if they were installed by a different package.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Joey Hess [Tue, 23 Aug 2011 17:32:20 +0000 (13:32 -0400)]
releasing version 8.9.5
Jeroen Schot [Tue, 23 Aug 2011 08:12:35 +0000 (10:12 +0200)]
dh_ucf: fix test for ucf/ucfr availability and quote filenames
Joey Hess [Sat, 20 Aug 2011 19:13:56 +0000 (15:13 -0400)]
dh_compress: Don't compress _sources documentation subdirectory as used by python-sphinx. Closes: #637492 Thanks, Jakub Wilk
Joey Hess [Sat, 6 Aug 2011 23:07:12 +0000 (19:07 -0400)]
releasing version 8.9.4
Joey Hess [Sat, 6 Aug 2011 23:06:03 +0000 (19:06 -0400)]
hide deprecation notice
Can this test be written w/o using --after?
Joey Hess [Sat, 6 Aug 2011 22:58:55 +0000 (18:58 -0400)]
dpkg-buildflags is only used to set environment in v9
To avoid re-breaking packages that were already broken a first time by
dpkg-buildpackage unconditionally setting the environment, and unbroke it
by unsetting variables in the rules file. (Example: numpy)
Joey Hess [Fri, 5 Aug 2011 18:33:09 +0000 (14:33 -0400)]
changelog
Modestas Vainius [Fri, 2 Jul 2010 02:11:24 +0000 (05:11 +0300)]
Add support for running tests in parallel to the cmake build system.
Pass appropriate -jN option to ctest (via ARGS variable in the Makefile) to
enable support for running tests in parallel. Similarly to makefile build
system, ctest -j1 mode is enforced even when parallel mode in debhelper is not
explicitly enabled.
Unlike make, CTest does not have "unlimited parallel" setting (-j implies -j1).
So in order to simulate unlimited parallel, allow to fork a huge number of
threads instead.
Joey Hess [Fri, 5 Aug 2011 17:45:23 +0000 (13:45 -0400)]
changelog
Modestas Vainius [Thu, 21 Jul 2011 11:48:57 +0000 (14:48 +0300)]
makefile.pm: remove build directory even if Makefile does not exist yet.
Assume that the package can be cleaned (i.e. the build directory can be
removed) as long as it is built out-of-source tree and can be configured. This
is useful for derivative buildsystems which generate Makefiles.
Joey Hess [Fri, 5 Aug 2011 15:00:10 +0000 (11:00 -0400)]
dh: The --before --after --until and --remaining options are deprecated. Use override targets instead.
Joey Hess [Wed, 20 Jul 2011 03:33:39 +0000 (23:33 -0400)]
update
Joey Hess [Wed, 20 Jul 2011 03:32:21 +0000 (23:32 -0400)]
releasing version 8.9.3
Joey Hess [Wed, 20 Jul 2011 03:20:08 +0000 (23:20 -0400)]
doc tweak re target dependencies
If a rules file has a custom install or binary target, those targets
still need to explicitly depend on the build target. Unless dh is used
in such a target (which it probably is of course).
It's not possible to avoid the need for those dependencies. A rules file
with a hand-written binary target simply does not run dh, so dh can
do nothing to help it run the build target.
Reword the docs to not give the wrong impression that dh somehow
magically makes that work.
Joey Hess [Wed, 20 Jul 2011 02:31:24 +0000 (22:31 -0400)]
dh: Remove obsolete optimisation hack that caused sequence breakage in v9 with a rules file with an explict build target. Closes: #634784
This hack was necessary back when dh ran each target, and so recursively
invoked itself. If debian/rules binary ran debian/rules binary-arch ran
debian/rules install-arch ran debian/rules build-arch, then debhelper
commands would be running with -a throughout, and so for debian/rules
binary-indep it would have to re-run all the commands with -i. The hack
avoided this extra work (and expecially dh_auto_configure running twice) by
first running the common commands without -i or -a and only then following
through with running the explicit per-arch targets, which didn't run many
(if any) additional commands.
But now dh does not run implicit targets, so (unless targets
are explicit), it will instead just construct a sequence of debhelper
commands to run directly, and so the -a flag is avoided.
Joey Hess [Mon, 18 Jul 2011 21:59:24 +0000 (17:59 -0400)]
releasing version 8.9.2
Joey Hess [Mon, 18 Jul 2011 21:53:45 +0000 (17:53 -0400)]
Support make 3.82. Closes: #634385
Joey Hess [Sun, 17 Jul 2011 20:36:04 +0000 (16:36 -0400)]
releasing version 8.9.1
Joey Hess [Sun, 17 Jul 2011 20:23:08 +0000 (16:23 -0400)]
tweak
Joey Hess [Sun, 17 Jul 2011 20:20:46 +0000 (16:20 -0400)]
changelog
Joey Hess [Sun, 17 Jul 2011 20:18:35 +0000 (16:18 -0400)]
fix exit status propigation
Also simplified a lot by not special-casing the base case, at the cost of
always forking once.
Joey Hess [Sun, 17 Jul 2011 20:02:17 +0000 (16:02 -0400)]
no need to wait when parallel is disabled
Joey Hess [Sun, 17 Jul 2011 20:01:56 +0000 (16:01 -0400)]
minor
Gergely Nagy [Sun, 17 Jul 2011 18:48:05 +0000 (20:48 +0200)]
dh_builddeb: support for parallel builds of debs
Implement support for parallel deb builds, when DEB_BUILD_OPTIONS has
parallels=N - limiting the number of forked processes to N.
Requested-By: Kari Pahula <kaol@debian.org>
Signed-Off-By: Gergely Nagy <algernon@madhouse-project.org>
Joey Hess [Sun, 17 Jul 2011 17:32:18 +0000 (13:32 -0400)]
adjust test number for new build system
Joey Hess [Sun, 17 Jul 2011 17:13:10 +0000 (13:13 -0400)]
Remove debhelper.log in compat level 1. Closes: #634155
Joey Hess [Sun, 17 Jul 2011 02:21:51 +0000 (22:21 -0400)]
layut
Joey Hess [Sun, 17 Jul 2011 02:21:16 +0000 (22:21 -0400)]
oops, only force qt4 when it's enabled
Joey Hess [Sun, 17 Jul 2011 02:11:02 +0000 (22:11 -0400)]
Now the QT4 version of qmake can be explicitly selected by passing --buildsystem=qmake_qt4. Closes: #566840
There is that build system option patch that I suckily never applied,
and could be used here.. but this is at its core a different build system,
and so handling it as such makes the most sense.
It may make sense to have a qmake_qt3 build system, but perhaps QT 3
will instead just go away. I considered just waiting, but this is an easy
fix. ;)
Joey Hess [Sun, 17 Jul 2011 01:08:53 +0000 (21:08 -0400)]
reorg notes section
Joey Hess [Sun, 17 Jul 2011 00:40:42 +0000 (20:40 -0400)]
add bug closure
Joey Hess [Sat, 16 Jul 2011 20:09:31 +0000 (16:09 -0400)]
avoid undef when dh is run w/o a sequence
Joey Hess [Sat, 16 Jul 2011 20:08:16 +0000 (16:08 -0400)]
dh: In v9, do not enable any python support commands.
dh_pysupport has started emitting a deprecation warning, which is
very annoying since it clutters every build that uses dh -- even builds
where it doesn't do anything. Since there is not just a dh_python2, but
also a dh_python3 waiting in the wings, this is clearly too volatile
a situation for dh to try to support further.
I considered making dh_python detect and run the right dh_python[23] helper
-- a python helper helper as it were -- but 70-odd packages still use that
command.
Joey Hess [Sat, 9 Jul 2011 04:18:50 +0000 (00:18 -0400)]
typo
Joey Hess [Mon, 4 Jul 2011 16:17:03 +0000 (12:17 -0400)]
Typo fixes. Closes: #632662
Joey Hess [Tue, 28 Jun 2011 17:41:45 +0000 (13:41 -0400)]
some tweaks to mention dh_python2
Joey Hess [Fri, 24 Jun 2011 18:32:13 +0000 (14:32 -0400)]
releasing version 8.9.0
Joey Hess [Fri, 24 Jun 2011 18:25:35 +0000 (14:25 -0400)]
dh_auto_configure: If there is a problem with cmake, display the CMakeCache.txt.
Joey Hess [Mon, 20 Jun 2011 15:49:15 +0000 (11:49 -0400)]
Revert "Always respect DEB_${flag}_{APPEND,SET} envvars."
This reverts commit
fcfcd1298f6ea1fcfb2b2b5a529303270aa800d9.
Per Raphael's mail.
Joey Hess [Sun, 19 Jun 2011 22:01:59 +0000 (18:01 -0400)]
reorder
Modestas Vainius [Sun, 19 Jun 2011 20:53:14 +0000 (23:53 +0300)]
Always respect DEB_${flag}_{APPEND,SET} envvars.
Do that even when dpkg-buildpackage modifies environment variables. Also
document DEB_${flag}_{APPEND,SET} as recommended way to override standard build
flags.
Modestas Vainius [Sun, 19 Jun 2011 19:05:08 +0000 (22:05 +0300)]
In the unlikely case Dpkg::BuildFlags fails, don't do anything.
Joey Hess [Sun, 19 Jun 2011 18:20:30 +0000 (14:20 -0400)]
update
Modestas Vainius [Sat, 18 Jun 2011 20:02:42 +0000 (23:02 +0300)]
Use Dpkg::BuildFlags module directly in set_buildflags().
Dpkg::BuildFlags API is declared stable. It should be safe to use it directly
rather than dpkg-buildflags wrapper. In addition, do not do any
DEB_BUILD_OPTIONS=noopt handling in debhelper. Dpkg::BuildFlags already does it
for us.
Joey Hess [Fri, 17 Jun 2011 18:13:05 +0000 (14:13 -0400)]
Correct docs about multiarch and v9. Closes: #630826
Cyril Brulebois [Thu, 16 Jun 2011 08:32:34 +0000 (10:32 +0200)]
Fix =>/>= typo in dh_makeshlibs(1).
Joey Hess [Tue, 14 Jun 2011 21:25:24 +0000 (17:25 -0400)]
Merge branch 'master' into smarter-targets
Conflicts:
dh
Joey Hess [Tue, 14 Jun 2011 21:22:34 +0000 (17:22 -0400)]
dpkg-buildflags support
* dh_auto_build, dh_auto_configure, dh: Set environment variables
listed by dpkg-buildflags --export. Any environment variables that
are already set to other values will not be changed.
Closes: #544844
* Also, support DEB_BUILD_OPTIONS=noopt, by changing -O2 to -O0.
Joey Hess [Tue, 14 Jun 2011 20:17:09 +0000 (16:17 -0400)]
Merge branch 'master' into smarter-targets
Conflicts:
debhelper.pod
debian/changelog
Joey Hess [Tue, 14 Jun 2011 20:14:56 +0000 (16:14 -0400)]
dh_auto_configure: In v9, does not include the source package name in --libexecdir when using autoconf. Closes: #541458
Fixed rleigh's patch to be more correct in the edge case where there is
a non-multiarch dpkg (ie, backports).
Roger Leigh [Tue, 14 Jun 2011 19:43:03 +0000 (20:43 +0100)]
Don't add package name to libexecdir in v9
Roger Leigh [Tue, 14 Jun 2011 18:30:59 +0000 (19:30 +0100)]
dh: rules function joins array argument
Appending @_ to a string appends the array length rather than
the array contents, so join with separating whitespace.
Joey Hess [Tue, 14 Jun 2011 16:39:15 +0000 (12:39 -0400)]
remove internal rules:target stuff
Joey Hess [Tue, 14 Jun 2011 16:24:31 +0000 (12:24 -0400)]
avoid infinite recursion
The makefile parse causes dh to be run recursively.
Before, dh would just immediatly fail with "unknown sequence", but
now it has to run the makefile parse to calculate the sequences, so an
earlier bailout is needed.
Joey Hess [Mon, 13 Jun 2011 23:13:32 +0000 (19:13 -0400)]
honor empty targets
An empty explicit target in debian/rules should still be run,
to run its dependencies, and allow defining empty targets in order to
skip running what's nornally done by a sequence.
Joey Hess [Mon, 13 Jun 2011 21:51:51 +0000 (17:51 -0400)]
make standard targets support a v9 feature
Joey Hess [Mon, 13 Jun 2011 21:40:02 +0000 (17:40 -0400)]
changelog
Joey Hess [Mon, 13 Jun 2011 21:00:08 +0000 (17:00 -0400)]
inline sequences to optimize away recursive calls to make/dh for implicit targets
This assumes that all implicit rules file targets are owned by dh, so
it can just assume an implicit target can be optimized away to the commands
in its sequence.
I suppose this would break:
build:
dh build
install: build
dh install
binary-%: install
my-binary-builder-$@
my-binary-builder-arch:
echo "whee! I did something pointlessly complicated with make!"
dh binary-arch
my-binary-builder-indep:
dh binary-indep
But I can't imagine anyone does this, at least with a probability of 1 in
ten thousand, so hopefully it doesn't break any existing packages. :)
Joey Hess [Mon, 13 Jun 2011 20:41:21 +0000 (16:41 -0400)]
improve sequence logic
Reorder code so sequences can all be built before addons are loaded, so
addon interface can always affect all commands in any sequences. This fixes
a bug in the previous patch, where addons could not influence dh_testdir
and dh_testroot.
Joey Hess [Mon, 13 Jun 2011 20:31:15 +0000 (16:31 -0400)]
doc updates for recent changes
Joey Hess [Mon, 13 Jun 2011 20:14:59 +0000 (16:14 -0400)]
move dh_auto_configure out of @bd_minimal
Callers overriding build targets will need to configure by hand or by
calling dh_auto_configure, which should be the status quo. And moving
dh_auto_configure to build (and build-arch and build-indep) will not
make it run twice AFAICS (except for the edge case when it already did:
debian/rules build-arch build-indep)
Joey Hess [Mon, 13 Jun 2011 20:03:19 +0000 (16:03 -0400)]
remove calls to build-arch, install-arch, etc
These calls are no-ops, unless explicit targets exist, and in that case
later code rewrites the build and install sequences to include them.
Joey Hess [Mon, 13 Jun 2011 19:43:58 +0000 (15:43 -0400)]
minor cleanups, no substantial code changes
Roger Leigh [Sun, 12 Jun 2011 19:22:43 +0000 (20:22 +0100)]
dh: Use minimal sequences if delegating work
The build and install rules run a minimal sequence if the build-arch or
build-indep, or install-arch or install-indep targets, respectively,
are present in debian/rules. The purpose is to not do work ahead of
time, such as building before the build-arch or build-indep targets are
built, which could potentially lead to misbuilds. If the targets are
not defined, the sequences may be run directly which is faster due to
being able to run the arch and indep commands together.
Roger Leigh [Fri, 3 Jun 2011 19:41:30 +0000 (20:41 +0100)]
dh: Add sequence dependency support
Rather than dh sequences containing dependent sequences within
themselves, invoke the sub-sequence via debian/rules to permit
overriding and customisation using the policy-defined debian/rules
targets.
Signed-off-by: Roger Leigh <rleigh@debian.org>
Joey Hess [Mon, 30 May 2011 18:45:55 +0000 (14:45 -0400)]
dh_movefiles: Optimise use of xargs. Closes: #627737
Joey Hess [Fri, 27 May 2011 13:39:08 +0000 (09:39 -0400)]
Fix error message. Closes: #628053