[Dctrl-tools-devel] [SCM] Debian control file query tools branch, master, updated. 2.12-4-g6ae63fa
Antti-Juhani Kaijanaho
ajk at debian.org
Wed Oct 31 20:26:05 UTC 2007
The branch, master has been updated
via 6ae63faa4c01293aa91c077590770638df6c7f49 (commit)
via 8838be868d1d47ba0772f36df8ec1039df0da1f4 (commit)
from 49852f5cfeaf67e285d9d236eaff4d10177cd2f0 (commit)
- Shortlog ------------------------------------------------------------
6ae63fa Add topic branch rules of conduct
8838be8 Actually use -O2 when compiling
Summary of changes:
GNUmakefile | 14 +++++++++-----
debian/README | 14 ++++++++++++++
debian/rules | 2 +-
3 files changed, 24 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 6ae63faa4c01293aa91c077590770638df6c7f49
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date: Wed Oct 31 22:25:25 2007 +0200
Add topic branch rules of conduct
Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>
diff --git a/debian/README b/debian/README
index 7e1aaf7..d181bd0 100644
--- a/debian/README
+++ b/debian/README
@@ -51,6 +51,20 @@ Rules of conduct for people with push access to the repository:
least on the committer or merger's development machine; use topic
branches for instable development.
+ - Topic branches in the collab-maint repository should be named
+ USERNAME/DESCRIPTIVE-NAME, where USERNAME is the Alioth username
+ of the user creating the topic branch, and DESCRIPTIVE-NAME is a
+ something descriptive to distinguish the branch from the user's
+ other topic branches. A topic branch is owned by the user whose
+ username is encoded in the branch name.
+
+ - Topic branches may (and should) be rebased at will by the branch
+ owner while it hasn't been merged to any other public branch. New
+ public branches should never be forked off a topic branch, and
+ only the owner of the branch should merge the branch to master
+ (after review, if possible). A topic branch that is no longer
+ needed should be deleted.
+
- Include an update of debian/changelog in your commits. One-line
summary of the commit is sufficient, as you can elaborate in the
commit log and in comments you might add to the source.
commit 8838be868d1d47ba0772f36df8ec1039df0da1f4
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date: Wed Oct 31 21:01:41 2007 +0200
Actually use -O2 when compiling
We separate out the mandatory options from CFLAGS into
ALL_CFLAGS in GNUmakefile, and then pass -O2 from debian/rules
(so that development-time builds don't get -O2 unnecessarily).
Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>
diff --git a/GNUmakefile b/GNUmakefile
index bc76ec7..d6959b3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -3,13 +3,14 @@ sysconfdir = /etc
localedir = /usr/share/locale
version := $(shell dpkg-parsechangelog | grep '^Version' | cut -b10-)
-CC = gcc -std=gnu99
-CFLAGS = -g -Wall -Werror -Ilib \
+CC = gcc
+CFLAGS = -g -Wall -Werror
+ALL_CFLAGS = $(CFLAGS) -std=gnu99 -Ilib \
-DENABLE_L_DEBUG -D_GNU_SOURCE -DSYSCONF=\"$(sysconfdir)\" \
-DHAVE_GETTEXT -DPACKAGE=\"dctrl-tools\" -DLOCALEDIR=\"$(localedir)\"
-CFLAGS += -DVERSION=\"$(version)\"
-CFLAGS += -DMAINTAINER='"$(shell grep ^Maintainer: debian/control | cut -b13-)"'
+ALL_CFLAGS += -DVERSION=\"$(version)\"
+ALL_CFLAGS += -DMAINTAINER='"$(shell grep ^Maintainer: debian/control | cut -b13-)"'
#CFLAGS += -DNDEBUG
@@ -60,8 +61,11 @@ join-dctrl/join-dctrl : join-dctrl/join-dctrl.o libdctrl.a
% : %.o
$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+%.o : %.c
+ $(CC) $(ALL_CFLAGS) -c -o $@ $<
+
%.d: %.c
- $(CC) -M $(CFLAGS) $< > $@.$$$$; \
+ $(CC) -M $(ALL_CFLAGS) $< > $@.$$$$; \
sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
rm -f $@.$$$$
diff --git a/debian/rules b/debian/rules
index e915dff..1825a77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include debian/librules.mk
include langs.mk
debian/stamp/build: #debian/stamp/build-configure
- $(MAKE)
+ $(MAKE) CC=gcc CFLAGS="-O2 -g -Wall"
-$(MAKE) test
touch $@
--
Debian control file query tools
More information about the Dctrl-tools-devel
mailing list