debian/changelog | 12 ++++
debian/patches/06_xclock_geometry.diff | 92 +++++++++++++++++++++++++++++++++
debian/patches/series | 1
debian/rules | 44 +++++++--------
debian/xsfbs/xsfbs.mk | 29 +++-------
5 files changed, 138 insertions(+), 40 deletions(-)
New commits:
commit 39f9578dda821bd25de49e4501ad80c3ad103936
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Aug 3 00:25:39 2008 +0200
Support parallel builds
Add support for parallel=n in DEB_BUILD_OPTIONS, and for actually
building the apps in parallel. Install is still sequential, at
least for now.
diff --git a/debian/changelog b/debian/changelog
index aac04c7..4a95877 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
x11-apps (7.4+1) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* xwd 1.0.2.
+ [ Julien Cristau ]
+ * Add support for parallel=n in DEB_BUILD_OPTIONS, and for actually building
+ the apps in parallel. Install is still sequential, at least for now.
+
-- Brice Goglin <[EMAIL PROTECTED]> Tue, 01 Jul 2008 20:37:59 +0200
x11-apps (7.3+3) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 166e18d..a524e8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,15 +16,17 @@ include debian/xsfbs/xsfbs.mk
# subdirectory explicitly so that the build system knows what to build
DEF_SUBDIRS=bitmap oclock x11perf xbiff xcalc xclipboard xclock xconsole
xcursorgen xditview xedit xeyes xgc xload xlogo xmag xman xmore xwd xwud
SUBDIRS=$(DEF_SUBDIRS)
+BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -36,25 +38,23 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
-
build: build-stamp
-build-stamp: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
- dh_testdir
- for FILE in $(DEF_SUBDIRS); do \
- echo "$$FILE" ; \
- mkdir "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE); \
- (cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \
- ../"$$FILE"/configure --prefix=/usr
--mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info $(confflags) \
- --disable-xprint \
-
--with-sysmanpath=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man:/usr/X11R6/man:/opt/man
\
- CFLAGS="$(CFLAGS)" \
- RSH=rsh \
- MANCONF="/etc/manpath.config" && \
- $(MAKE)) || exit 1; \
- done
-
- touch build-stamp
+build-stamp: $(BUILD_STAMPS)
+ >$@
+
+$(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
+ mkdir -p $*-obj-$(DEB_BUILD_GNU_TYPE)
+
+ cd $*-obj-$(DEB_BUILD_GNU_TYPE) && \
+ ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info $(confflags) \
+ --disable-xprint \
+
--with-sysmanpath=/usr/man:/usr/share/man:/usr/local/man:/usr/local/share/man:/usr/X11R6/man:/opt/man
\
+ CFLAGS="$(CFLAGS)" \
+ RSH=rsh \
+ MANCONF="/etc/manpath.config"
+ cd $*-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ >$@
clean: xsfclean
dh_testdir
commit 783e192321607a27c3958635c9bbcb24b376c0e8
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat Aug 2 18:51:42 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index c42d4a0..b0c8ed5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-x11-apps (7.3+3) UNRELEASED; urgency=low
+x11-apps (7.3+3) unstable; urgency=low
* xclock: Fix geometry computation (closes: #443227).
* debian/rules, xsfbs: fix rules dependencies.
- -- Julien Cristau <[EMAIL PROTECTED]> Sat, 02 Aug 2008 18:23:52 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Sat, 02 Aug 2008 18:45:33 +0200
x11-apps (7.3+2) unstable; urgency=low
commit 14e9a4d5f9fe2b8a2c843a95d21ddbe70011776e
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat Aug 2 18:45:12 2008 +0200
debian/rules, xsfbs: fix rules dependencies.
diff --git a/debian/changelog b/debian/changelog
index a801cc3..c42d4a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11-apps (7.3+3) UNRELEASED; urgency=low
* xclock: Fix geometry computation (closes: #443227).
+ * debian/rules, xsfbs: fix rules dependencies.
-- Julien Cristau <[EMAIL PROTECTED]> Sat, 02 Aug 2008 18:23:52 +0200
diff --git a/debian/rules b/debian/rules
index c062727..166e18d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,8 +37,8 @@ else
endif
-build: genscripts patch build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
dh_testdir
for FILE in $(DEF_SUBDIRS); do \
echo "$$FILE" ; \
commit 94baff30db2cb4e6a16a2c8059b672cfc024f28f
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat Aug 2 18:41:49 2008 +0200
xclock: Fix geometry computation (closes: #443227).
diff --git a/debian/changelog b/debian/changelog
index b9d5f50..a801cc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-apps (7.3+3) UNRELEASED; urgency=low
+
+ * xclock: Fix geometry computation (closes: #443227).
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Sat, 02 Aug 2008 18:23:52 +0200
+
x11-apps (7.3+2) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/patches/06_xclock_geometry.diff
b/debian/patches/06_xclock_geometry.diff
new file mode 100644
index 0000000..9b14768
--- /dev/null
+++ b/debian/patches/06_xclock_geometry.diff
@@ -0,0 +1,92 @@
+From upstream commits 870ebb6762f63c6587ee75aba50ee93257fa610b and
+8c6739ba1179337c7f8fa25680871e0813ef5181.
+
+Index: x11-apps-7.3+1.0/xclock/Clock.c
+===================================================================
+--- x11-apps-7.3+1.0.orig/xclock/Clock.c 2008-05-12 19:43:06.000000000
-0400
++++ x11-apps-7.3+1.0/xclock/Clock.c 2008-05-12 20:29:19.000000000 -0400
+@@ -656,46 +656,48 @@
+ 2 * w->clock.padding;
+ }
+ else
++ {
+ #endif
+ #ifndef NO_I18N
+- if (!no_locale) {
+- XFontSetExtents *fse;
++ if (!no_locale) {
++ XFontSetExtents *fse;
+
+- if(w->clock.fontSet == NULL) {
+- char **missing, *default_str;
+- int n_missing;
+- w->clock.fontSet = XCreateFontSet( XtDisplay(w),
+- XtDefaultFontSet,
+- &missing,
+- &n_missing,
+- &default_str);
+- }
+- if (w->clock.fontSet != NULL)
+- {
+- /* don't free this... it's freed with the XFontSet. */
+- fse = XExtentsOfFontSet(w->clock.fontSet);
+-
+- min_width = XmbTextEscapement(w->clock.fontSet,str,
+- len)
+- + 2 * w->clock.padding;
+- min_height = fse->max_logical_extent.height +
+- 3 * w->clock.padding;
+- } else {
+- no_locale = True;
+- }
+- }
++ if(w->clock.fontSet == NULL) {
++ char **missing, *default_str;
++ int n_missing;
++ w->clock.fontSet = XCreateFontSet( XtDisplay(w),
++ XtDefaultFontSet,
++ &missing,
++ &n_missing,
++ &default_str);
++ }
++ if (w->clock.fontSet != NULL)
++ {
++ /* don't free this... it's freed with the XFontSet. */
++ fse = XExtentsOfFontSet(w->clock.fontSet);
++
++ min_width = XmbTextEscapement(w->clock.fontSet,str,
++ len)
++ + 2 * w->clock.padding;
++ min_height = fse->max_logical_extent.height +
++ 3 * w->clock.padding;
++ } else {
++ no_locale = True;
++ }
++ }
+
+- if (!no_locale)
+-#endif /* NO_I18N */
+- {
+- if (w->clock.font == NULL)
+- w->clock.font = XQueryFont( XtDisplay(w),
+- XGContextFromGC(
+- DefaultGCOfScreen(XtScreen(w))) );
+- min_width = XTextWidth(w->clock.font, str, len) +
+- 2 * w->clock.padding;
+- min_height = w->clock.font->ascent +
+- w->clock.font->descent + 2 * w->clock.padding;
++ if (no_locale)
++ #endif /* NO_I18N */
++ {
++ if (w->clock.font == NULL)
++ w->clock.font = XQueryFont( XtDisplay(w),
++ XGContextFromGC(
++ DefaultGCOfScreen(XtScreen(w)))
);
++ min_width = XTextWidth(w->clock.font, str, len) +
++ 2 * w->clock.padding;
++ min_height = w->clock.font->ascent +
++ w->clock.font->descent + 2 * w->clock.padding;
++ }
+ }
+ }
+ if (w->core.width == 0)
diff --git a/debian/patches/series b/debian/patches/series
index 6b25a97..fe8e424 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
03_xconsole_implicit_pointer_conversion.diff
04_SECURITY_setuid.diff
05_xmore_fix_segv_without_xprint.diff -p2
+06_xclock_geometry.diff
commit 86e7669f5d912824e341ea487a6257ec5433eb90
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jul 17 15:44:45 2008 +0200
xsfbs.mk: make 'log' a separate target
'prepare' runs genscripts, and we don't want that in unpatch,
so create stampdir/log in a separate target, and make unpatch
depend on that instead of prepare.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 984e81c..f0f8953 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
- mkdir -p $(STAMP_DIR)/log
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
>$@
+.PHONY: log
+stampdir_targets+=log
+log: $(STAMP_DIR)/log
+$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+ mkdir -p $(STAMP_DIR)/log
+
# Apply all patches to the upstream source.
.PHONY: patch
stampdir_targets+=patch
@@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/prepare
+unpatch: $(STAMP_DIR)/log
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 50619e730fcaf422ffa4451468520526b2a830b8
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Jul 16 18:42:14 2008 +0200
xsfbs.mk: update the list of releases, and drop some unused code
we haven't had a separate source tree since modularization.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2350f80..984e81c 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed
's/^.://')
BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo [EMAIL PROTECTED](cat
/etc/mailname 2>/dev/null))}})
# Find out if this is an official build; an official build has nothing but
-# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the
+# digits, dots, and/or the codename of a release in the Debian part of the
# version number. Anything else indicates an unofficial build.
-OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo
$${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null
2>&1; then echo yes; fi)
+OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo
$${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*"
>/dev/null 2>&1; then echo yes; fi)
# Set up parameters for the Debian build environment.
@@ -69,16 +69,6 @@ endif
# $(STAMP_DIR) houses stamp files for complex targets.
STAMP_DIR:=stampdir
-# $(SOURCE_DIR) houses one or more source trees.
-SOURCE_DIR:=build-tree
-
-# $(SOURCE_TREE) is the location of the source tree to be compiled. If there
-# is more than one, others are found using this name plus a suffix to indicate
-# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The
-# "setup" target is responsible for creating such trees.
-#SOURCE_TREE:=$(SOURCE_DIR)/xc
-#FIXME We need to define this in our debian/rules file
-
# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place
# their files.
DEBTREEDIR:=$(CURDIR)/debian/tmp
commit 6c29758eb1a2798f6b77516b7a75dc399769d217
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: more parallel make fixing
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index fa2431e..2350f80 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,8 +119,8 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
+prepare: $(STAMP_DIR)/prepare
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
mkdir -p $(STAMP_DIR)/log
>$@
commit 78b3958b14a5298165d8500d711342be1b7b6463
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: fix the prepare target for parallel make
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b871b3b..fa2431e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,11 +119,9 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- if [ ! -e $(STAMP_DIR)/log ]; then \
- mkdir $(STAMP_DIR)/log; \
- fi; \
+ mkdir -p $(STAMP_DIR)/log
>$@
# Apply all patches to the upstream source.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
