debian/changelog | 7 +++++++
debian/control | 5 ++++-
debian/xsfbs/xsfbs.mk | 29 +++++++++++------------------
3 files changed, 22 insertions(+), 19 deletions(-)
New commits:
commit b160e91ee1baf6b50d8e6d987945e57076115d91
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Jul 18 20:01:40 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 24df720..ab95e1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xutils-dev (1:7.4+3) UNRELEASED; urgency=low
+xutils-dev (1:7.4+3) unstable; urgency=low
* Add a mention of xorg-macros in the long description, so apt-cache search
can find them. Thanks, Eric Anholt!
- -- Julien Cristau <[EMAIL PROTECTED]> Fri, 18 Jul 2008 19:57:51 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Fri, 18 Jul 2008 20:01:34 +0200
xutils-dev (1:7.4+2) unstable; urgency=low
commit 469e00fc0492e9bc7fc481312f7d6fd91a6b387e
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Jul 18 20:00:41 2008 +0200
Add a mention of xorg-macros in the long description
This way 'apt-cache search xorg-macros' can find this package.
Thanks, Eric Anholt!
diff --git a/debian/changelog b/debian/changelog
index 34d55cd..24df720 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xutils-dev (1:7.4+3) UNRELEASED; urgency=low
+
+ * Add a mention of xorg-macros in the long description, so apt-cache search
+ can find them. Thanks, Eric Anholt!
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Fri, 18 Jul 2008 19:57:51 +0200
+
xutils-dev (1:7.4+2) unstable; urgency=low
* Extend 05_xaw_without_xp.diff to disable Xp from Xaw on hurd-i386
diff --git a/debian/control b/debian/control
index a0e283d..3ce310a 100644
--- a/debian/control
+++ b/debian/control
@@ -26,4 +26,7 @@ Description: X Window System utility programs for development
- lndir, a tool that creates a shadow directory of symbolic links to
another directory tree;
- makedepend, a tool to create dependencies in makefiles;
- - makeg, a tool for making debuggable executables;
+ - makeg, a tool for making debuggable executables.
+ .
+ This package also contains xorg-macros.m4, a set of macros used in configure
+ scripts of X.Org packages.
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]
