debian/changelog | 6 +
debian/patches/01_xedit_mkdir_races.diff | 102 +++++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 109 insertions(+)
New commits:
commit cbb9ec36e0d88887db0493833248bfc2ccd98c42
Author: Brice Goglin <bgog...@debian.org>
Date: Tue Feb 23 21:51:46 2010 +0100
Prepare Changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 401965c..dde49c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-x11-apps (7.5+3) UNRELEASED; urgency=low
+x11-apps (7.5+3) unstable; urgency=low
* Add 01_xedit_mkdir_races.diff to fix FTBFS, closes: #569430.
- -- Brice Goglin <bgog...@debian.org> Tue, 23 Feb 2010 21:50:09 +0100
+ -- Brice Goglin <bgog...@debian.org> Tue, 23 Feb 2010 21:51:06 +0100
x11-apps (7.5+2) unstable; urgency=low
commit 0724efeb47e7c78f0c9a86aef57ca872e286c489
Author: Brice Goglin <bgog...@debian.org>
Date: Tue Feb 23 21:51:04 2010 +0100
Add 01_xedit_mkdir_races.diff to fix FTBFS
diff --git a/debian/changelog b/debian/changelog
index bf2c05e..401965c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-apps (7.5+3) UNRELEASED; urgency=low
+
+ * Add 01_xedit_mkdir_races.diff to fix FTBFS, closes: #569430.
+
+ -- Brice Goglin <bgog...@debian.org> Tue, 23 Feb 2010 21:50:09 +0100
+
x11-apps (7.5+2) unstable; urgency=low
[ Brice Goglin ]
diff --git a/debian/patches/01_xedit_mkdir_races.diff
b/debian/patches/01_xedit_mkdir_races.diff
new file mode 100644
index 0000000..cf8935f
--- /dev/null
+++ b/debian/patches/01_xedit_mkdir_races.diff
@@ -0,0 +1,102 @@
+Combination of two upstream patches (post 1.1.2) to fix #569430
+
+From 0ab2815743d89b1cd283abaf4d2cb77fed4a2df4 Mon Sep 17 00:00:00 2001
+From: Peter Breitenlohner <p...@mppmu.mpg.de>
+Date: Sun, 09 Nov 2008 13:24:10 +0000
+Subject: avoid race condition for parallel jobs
+
+From cfc78a1c2452362a5e7c88ed239c9d7ef0240a4d Mon Sep 17 00:00:00 2001
+From: Peter Breitenlohner <p...@mppmu.mpg.de>
+Date: Tue, 11 Nov 2008 09:52:18 +0000
+Subject: reorganize app default files
+
+
+diff --git a/xedit/Makefile.am b/xedit/Makefile.am
+index 1a32798..0fad032 100644
+--- a/xedit/Makefile.am
++++ b/xedit/Makefile.am
+@@ -161,33 +161,13 @@ lisp_re_tests_LDADD = -L. -lre
+ lisp_re_tests_SOURCES = lisp/re/tests.c
+
+
+-# App default files (*.ad)
++# App default files
+
+-APPDEFAULTFILES = \
++appdefaultdir = @appdefaultdir@
++appdefault_DATA = \
+ app-defaults/Xedit-color \
+ app-defaults/Xedit
+
+-if USE_XPRINT
+-app-defaults/Xedit.ad:
+- test -d app-defaults || mkdir app-defaults
+- cp $(top_srcdir)/app-defaults/Xedit-xprint.ad app-defaults/Xedit.ad
+-else
+-app-defaults/Xedit.ad:
+- test -d app-defaults || mkdir app-defaults
+- cp $(top_srcdir)/app-defaults/Xedit-noxprint.ad app-defaults/Xedit.ad
+-endif
+-
+-SUFFIXES = .ad
+-
+-.ad:
+- test -d app-defaults || mkdir app-defaults
+- cp $< $@
+-
+-appdefaultdir = @appdefaultdir@
+-appdefault_DATA = $(APPDEFAULTFILES)
+-
+-CLEANFILES = $(APPDEFAULTFILES) app-defaults/Xedit.ad
+-
+ lispdir = $(LISPDIR)
+ dist_lisp_DATA = ${srcdir}/lisp/modules/lisp.lsp \
+ ${srcdir}/lisp/modules/xedit.lsp \
+@@ -216,9 +196,9 @@ dist_progmodes_DATA = \
+ appman_PRE = xedit.man
+
+ EXTRA_DIST = \
+- app-defaults/Xedit-color.ad \
+- app-defaults/Xedit-xprint.ad \
+- app-defaults/Xedit-noxprint.ad \
++ app-defaults/Xedit-color \
++ app-defaults/Xedit-xprint \
++ app-defaults/Xedit-noxprint \
+ app-defaults/Xedit-sample \
+ lisp/README \
+ lisp/TODO \
+@@ -246,7 +226,7 @@ appmandir = $(APP_MAN_DIR)
+ appman_DATA = $(appman_PRE:m...@app_man_suffix@)
+
+ EXTRA_DIST += $(appman_PRE)
+-CLEANFILES += $(appman_DATA)
++CLEANFILES = $(appman_DATA)
+
+ SED = sed
+
+@@ -267,7 +247,7 @@ MAN_SUBSTS = \
+ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+-SUFFIXES += .$(APP_MAN_SUFFIX) .man
++SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+ .man.$(APP_MAN_SUFFIX):
+ sed $(MAN_SUBSTS) < $< > $@
+diff --git a/xedit/configure.ac b/xedit/configure.ac
+index 64fc0b1..dc3a947 100644
+--- a/xedit/configure.ac
++++ b/xedit/configure.ac
+@@ -41,9 +41,12 @@ AC_ARG_ENABLE(xprint,
+ AM_CONDITIONAL(USE_XPRINT, test x$enable_xprint = xyes)
+ if test x$enable_xprint = xyes; then
+ PKG_CHECK_MODULES(PKGDEPS, xprintutil xp xaw8)
++ print_noprint=xprint
+ else
+ PKG_CHECK_MODULES(PKGDEPS, xaw7)
++ print_noprint=noxprint
+ fi
++AC_CONFIG_LINKS([app-defaults/Xedit:app-defaults/Xedit-$print_noprint])
+
+ AC_ARG_WITH(lispdir, AS_HELP_STRING([--with-lispdir=PATH],
+ [Directory to install lisp files (default:
$libdir/X11/xedit/lisp)]),
diff --git a/debian/patches/series b/debian/patches/series
index a77af23..e94bd24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+01_xedit_mkdir_races.diff
#02_xedit_manpage_typos.diff
03_xconsole_implicit_pointer_conversion.diff
05_xmore_fix_segv_without_xprint.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1nk1tn-0001fk...@alioth.debian.org
