diff options
| author | Antti-Juhani Kaijanaho <ajk@debian.org> | 2012-06-07 12:06:15 +0300 |
|---|---|---|
| committer | Antti-Juhani Kaijanaho <ajk@debian.org> | 2012-06-07 12:06:15 +0300 |
| commit | 02d06de3d3e9a9b0a04473ed287b119df193cc5b (patch) | |
| tree | 6779e262384e360056cdd0ece5a0f2b21ee273a2 | |
| parent | a2c8be43b244119804f3108899bf3e1efb119a2f (diff) | |
| parent | 441f5db05065c7d36a9a7b7ef44c9fe061caae45 (diff) | |
| download | dctrl-tools-02d06de3d3e9a9b0a04473ed287b119df193cc5b.tar.gz | |
Merge tag '2.22.2'
Release 2.22.2.
* tag '2.22.2':
Release 2.22.2.
Fix #674836 (Builds with wrong CFLAGS)
Fix opening 2.22.2
Open 2.22.2.
Conflicts:
debian/changelog
| -rw-r--r-- | GNUmakefile | 4 | ||||
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 2 |
4 files changed, 18 insertions, 6 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 e4a6930..bd9404d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,20 @@ dctrl-tools (2.23) UNRELEASED; urgency=low - * Merge 2.22.1. + * Merge 2.22.1 and 2.22.2. - -- Antti-Juhani Kaijanaho <ajk@debian.org> Sun, 03 Jun 2012 20:51:27 +0300 + -- Antti-Juhani Kaijanaho <ajk@debian.org> Thu, 07 Jun 2012 12:06:05 +0300 + +dctrl-tools (2.22.2) unstable; urgency=low + + * 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> Thu, 07 Jun 2012 11:48:25 +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 |