MANIFEST | 2 +-
debian/changelog | 10 ++++++++--
debian/control | 2 +-
debian/rules | 12 +++++++-----
debian/xterm.install | 1 -
debian/xterm.menu | 6 ++++--
fontutils.c | 7 +------
minstall.sh | 9 ++++++++-
version.h | 5 ++---
xterm.log.html | 14 ++++++++++++--
10 files changed, 44 insertions(+), 24 deletions(-)
New commits:
commit b69a1f84cf7f6bec1087933c53ac7dc6f6196e1a
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Aug 13 12:00:55 2007 +0200
Use a separate build dir.
diff --git a/debian/changelog b/debian/changelog
index 756818a..c2f0bfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ xterm (229-1) UNRELEASED; urgency=low
(closes: #435858).
* Stop installing the .desktop files and adapt xterm.menu to the new menu
structure.
+ * Use a separate build dir.
- -- Julien Cristau <[EMAIL PROTECTED]> Mon, 13 Aug 2007 02:11:11 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Mon, 13 Aug 2007 12:00:25 +0200
xterm (228-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index ae98c18..91fcad8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,7 +98,9 @@ unpatch:
configure: $(STAMP_DIR)/patch $(STAMP_DIR)/configure
$(STAMP_DIR)/configure: $(STAMP_DIR)/patch
dh_testdir
- ./configure --enable-logging --enable-wide-chars --enable-luit \
+ [ -d obj-$(DEB_BUILD_GNU_TYPE) ] || mkdir obj-$(DEB_BUILD_GNU_TYPE)
+ cd obj-$(DEB_BUILD_GNU_TYPE) && \
+ ../configure --enable-logging --enable-wide-chars --enable-luit \
--with-tty-group=tty --enable-256-color \
--prefix=/usr --exec-prefix=/usr --mandir=/usr/share/man \
--with-app-defaults=/etc/X11/app-defaults \
@@ -111,7 +113,7 @@ $(STAMP_DIR)/configure: $(STAMP_DIR)/patch
build: $(STAMP_DIR)/build
$(STAMP_DIR)/build: $(STAMP_DIR)/configure debian/local/xterm.faq.gz
dh_testdir
- $(MAKE)
+ cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
touch $@
.PHONY: clean
@@ -120,7 +122,7 @@ clean: unpatch
dh_testroot
rm -f .pc patches
rm -rf $(STAMP_DIR)
- -$(MAKE) distclean
+ rm -rf obj-$(DEB_BUILD_GNU_TYPE)
dh_clean debian/local/xterm.faq.gz
.PHONY: install
@@ -130,6 +132,7 @@ install: build
dh_clean -k
dh_installdirs
# General installation
+ cd obj-$(DEB_BUILD_GNU_TYPE) && \
$(MAKE) install mandir=/usr/share/man/man1 libdir=/etc
DESTDIR=$(DEBINSTALLTREE)
## Install lxterm command and manual page.
commit cc68a12d6f88899971b450f0c9505e62a367d5c4
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Aug 13 11:42:47 2007 +0200
Drop .desktop files; migrate to new menu structure.
diff --git a/debian/changelog b/debian/changelog
index 78b2bd6..756818a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ xterm (229-1) UNRELEASED; urgency=low
* New upstream release
+ undo an incorrect fix for a memory leak in patch #209
(closes: #435858).
+ * Stop installing the .desktop files and adapt xterm.menu to the new menu
+ structure.
- -- Julien Cristau <[EMAIL PROTECTED]> Mon, 13 Aug 2007 01:59:47 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Mon, 13 Aug 2007 02:11:11 +0200
xterm (228-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ac7b51f..a920812 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David MartÃnez Moreno <[EMAIL PROTECTED]>, David Nusinow <[EMAIL
PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>
Standards-Version: 3.7.2
-Build-Depends: libncurses5-dev | libncurses-dev, libxft-dev (>> 2.1.2),
libxrender-dev (>> 1:0.9.0), libxaw7-dev, debhelper (>= 4.1.16), quilt, lynx,
desktop-file-utils
+Build-Depends: libncurses5-dev | libncurses-dev, libxft-dev (>> 2.1.2),
libxrender-dev (>> 1:0.9.0), libxaw7-dev, debhelper (>= 4.1.16), quilt, lynx
# Reasons for Build-Depends:
#
diff --git a/debian/rules b/debian/rules
index a06375e..ae98c18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -130,7 +130,7 @@ install: build
dh_clean -k
dh_installdirs
# General installation
- $(MAKE) install install-desktop mandir=/usr/share/man/man1 libdir=/etc
DESTDIR=$(DEBINSTALLTREE)
+ $(MAKE) install mandir=/usr/share/man/man1 libdir=/etc
DESTDIR=$(DEBINSTALLTREE)
## Install lxterm command and manual page.
install -m 755 debian/local/lxterm $(DEBINSTALLTREE)/usr/bin
@@ -150,7 +150,6 @@ install: build
dh_installchangelogs
dh_installmenu
dh_install --sourcedir=debian/tmp --list-missing
- dh_desktop
# Lintian overrides.
cp debian/xterm.overrides
$(CURDIR)/debian/xterm/usr/share/lintian/overrides/xterm
diff --git a/debian/xterm.install b/debian/xterm.install
index af07cd8..e620391 100644
--- a/debian/xterm.install
+++ b/debian/xterm.install
@@ -2,4 +2,3 @@ etc/X11/app-defaults/*
usr/bin/*
usr/share/man/man1/*
usr/share/pixmaps
-usr/share/applications
diff --git a/debian/xterm.menu b/debian/xterm.menu
index 67f8d87..9bb0dd6 100644
--- a/debian/xterm.menu
+++ b/debian/xterm.menu
@@ -2,13 +2,15 @@
?package(xterm):\
needs="x11"\
- section="XShells"\
+ section="Applications/Terminal Emulators"\
longtitle="XTerm: terminal emulator for X"\
title="XTerm"\
+ icon="/usr/share/pixmaps/xterm-color_32x32.xpm"\
command="xterm"
?package(xterm):\
needs="x11"\
- section="XShells"\
+ section="Applications/Terminal Emulators"\
longtitle="XTerm: terminal emulator for X with Unicode support"\
title="XTerm (Unicode)"\
+ icon="/usr/share/pixmaps/xterm-color_32x32.xpm"\
command="uxterm"
commit 4b570708aa3ef11b01f2d71326edd9015a46d148
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Aug 13 02:01:27 2007 +0200
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index a9b9f12..78b2bd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-xterm (228-2) UNRELEASED; urgency=low
+xterm (229-1) UNRELEASED; urgency=low
* Fix typo in uxterm(1) (LP: #128136).
+ * New upstream release
+ + undo an incorrect fix for a memory leak in patch #209
+ (closes: #435858).
- -- Julien Cristau <[EMAIL PROTECTED]> Sat, 28 Jul 2007 23:08:10 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Mon, 13 Aug 2007 01:59:47 +0200
xterm (228-1) unstable; urgency=low
commit dbdf13b65a972064129c00623e5b5adc999c6961
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon Aug 13 01:55:24 2007 +0200
Import xterm 229.
diff --git a/MANIFEST b/MANIFEST
index cc11697..ba5965c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-228, version xterm-228
+MANIFEST for xterm-229, version xterm-229
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/fontutils.c b/fontutils.c
index db8839c..d03dbab 100644
--- a/fontutils.c
+++ b/fontutils.c
@@ -1,8 +1,4 @@
-/* $XTermId: fontutils.c,v 1.249 2007/06/17 12:50:22 tom Exp $ */
-
-/*
- * $XFree86: xc/programs/xterm/fontutils.c,v 1.60 2006/04/30 21:55:39 dickey
Exp $
- */
+/* $XTermId: fontutils.c,v 1.251 2007/08/05 00:11:55 tom Exp $ */
/************************************************************
@@ -850,7 +846,6 @@ xtermLoadFont(XtermWidget xw,
fnts[fWBold] = xtermCloseFont(xw, fnts[fWBold]);
}
if (fnts[fWBold] == 0) {
- free(myfonts.f_wb);
myfonts.f_wb = myfonts.f_w;
fnts[fWBold] = fnts[fWide];
TRACE(("...cannot load wide-bold, use wide %s\n",
NonNull(myfonts.f_w)));
diff --git a/minstall.sh b/minstall.sh
index dd9635e..89e17da 100755
--- a/minstall.sh
+++ b/minstall.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $XTermId: minstall.sh,v 1.11 2007/05/24 22:10:42 tom Exp $
+# $XTermId: minstall.sh,v 1.12 2007/08/12 15:29:02 tom Exp $
#
# Install manpages, substituting a reasonable section value since XFree86 4.x
# and derived imakes do not use constants...
@@ -11,6 +11,13 @@
# $4 = app-defaults directory
#
+# override locale...
+LANG=C; export LANG
+LANGUAGE=C; export LANGUAGE
+LC_ALL=C; export LC_ALL
+LC_CTYPE=C; export LC_CTYPE
+
+# get parameters
MINSTALL="$1"
OLD_FILE="$2"
END_FILE="$3"
diff --git a/version.h b/version.h
index 5b35cf6..3a608a0 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,4 @@
-/* $XTermId: version.h,v 1.283 2007/07/07 15:29:25 tom Exp $ */
-/* $XFree86: xc/programs/xterm/version.h,v 3.126 2006/06/20 00:42:38 dickey
Exp $ */
+/* $XTermId: version.h,v 1.285 2007/08/12 15:37:19 tom Exp $ */
/*
* These definitions are used to build the string that's printed in response to
@@ -7,7 +6,7 @@
* version of X to which this version of xterm has been built. The number in
* parentheses is my patch number (Thomas E. Dickey).
*/
-#define XTERM_PATCH 228
+#define XTERM_PATCH 229
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index bb3204e..83fd700 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -20,8 +20,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.596 2007/07/22 23:12:38 tom Exp $
- $XFree86: xc/programs/xterm/xterm.log.html,v 1.151 2006/06/20 00:42:38
dickey Exp $
+ $XTermId: xterm.log.html,v 1.600 2007/08/12 17:32:04 tom Exp $
-->
<HTML>
<HEAD>
@@ -46,6 +45,7 @@ Most of these are summarized in the XFree86 CHANGELOG
is the latest version of this file.
<UL>
+<LI><A HREF="#xterm_229">Patch #229 - 2008/8/12</A>
<LI><A HREF="#xterm_228">Patch #228 - 2007/7/22</A>
<LI><A HREF="#xterm_227">Patch #227 - 2007/6/27</A>
<LI><A HREF="#xterm_226">Patch #226 - 2007/6/17</A>
@@ -277,6 +277,16 @@ is the latest version of this file.
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+<H1><A NAME="xterm_229">Patch #229 - 2008/8/12</A></H1>
+<ul>
+ <li>override locale in minstall.sh;
+ change in <a href="#xterm_226">patch #226</a>
+ does not work in UTF-8 locale (report by Zdenek Sekera).
+
+ <li>undo an incorrect fix for a memory leak
+ in <a href="#xterm_209">patch #209</a> (Debian #435858).
+</ul>
+
<H1><A NAME="xterm_228">Patch #228 - 2007/7/22</A></H1>
<ul>
<li>modify configure script to permit combining
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
