diff options
| author | Antti-Juhani Kaijanaho <ajk@debian.org> | 2012-06-03 20:39:07 +0300 |
|---|---|---|
| committer | Antti-Juhani Kaijanaho <ajk@debian.org> | 2012-06-03 20:39:07 +0300 |
| commit | 8a554068a2ee23a713a587b70dff3a5679d7d584 (patch) | |
| tree | a8ba634d2e772d1b48da8c7b60ebbe5c3fe1a575 | |
| parent | d1ebdab6b71852190673ba1ce8b890f396a8c779 (diff) | |
| download | dctrl-tools-8a554068a2ee23a713a587b70dff3a5679d7d584.tar.gz | |
Fix #674836 (Builds with wrong CFLAGS)
- Upgrade debhelper mode to 9.
- Work around debhelper bug 674912 by defining the default CFLAGS
using ?= in GNUmakefile.
- As pointed out by Jonathan Nieder in private mail, -Werror is not
a good idea in package builds (it may cause unnecessary FTBFS
breakage in the future as the toolchain and libraries change).
Signed-off-by: Antti-Juhani Kaijanaho <ajk@debian.org>
| -rw-r--r-- | GNUmakefile | 4 | ||||
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 2 |
4 files changed, 13 insertions, 7 deletions
diff --git a/GNUmakefile b/GNUmakefile index 3a25b8e..ea3fd1d 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -14,8 +14,8 @@ man8dir = $(mandir)/man8 localedir = $(datarootdir)/locale CC = gcc -CFLAGS = -g -Wall -Werror -ALL_CFLAGS = $(CFLAGS) -std=gnu99 -Ilib \ +CFLAGS ?= -g -O2 -Wall -Werror +ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) -std=gnu99 -Ilib \ -DENABLE_L_DEBUG -D_GNU_SOURCE -DSYSCONF=\"$(sysconfdir)\" \ -DHAVE_GETTEXT -DPACKAGE=\"dctrl-tools\" -DLOCALEDIR=\"$(localedir)\" diff --git a/debian/changelog b/debian/changelog index 7a860e8..69749a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ dctrl-tools (2.22.2) UNRELEASED; urgency=low - * - - -- Antti-Juhani Kaijanaho <ajk@debian.org> Mon, 28 May 2012 18:05:31 +0300 + * Closes: #674836 (Builds with wrong CFLAGS), reported by me: + - Upgrade debhelper mode to 9. + - Work around debhelper bug 674912 by defining the default CFLAGS + using ?= in GNUmakefile. + - As pointed out by Jonathan Nieder in private mail, -Werror is not + a good idea in package builds (it may cause unnecessary FTBFS + breakage in the future as the toolchain and libraries change). + + -- Antti-Juhani Kaijanaho <ajk@debian.org> Mon, 28 May 2012 19:36:34 +0300 dctrl-tools (2.22.1) unstable; urgency=low diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 16b2d41..be23847 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: dctrl-tools developers <dctrl-tools-devel@lists.alioth.debian.org> Uploaders: Antti-Juhani Kaijanaho <ajk@debian.org> Standards-Version: 3.9.3 -Build-Depends: gettext (>= 0.11-0), gcc (>= 3.0), debhelper (>= 8), po4a (>= 0.40) +Build-Depends: gettext (>= 0.11-0), gcc (>= 3.0), debhelper (>= 9), po4a (>= 0.40) Vcs-Git: git://git.debian.org/git/collab-maint/dctrl-tools.git Vcs-Browser: http://git.debian.org/?p=collab-maint/dctrl-tools.git;a=summary |