xterm: Changes to 'debian-unstable'
debian/changelog | 9 +++++++++
debian/control | 4 ++--
debian/copyright | 2 +-
debian/rules | 7 ++++---
4 files changed, 16 insertions(+), 6 deletions(-)
New commits:
commit c18d61b3feac0c5c63e5f022e8b4d1c2056947d7
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 16 19:46:42 2011 +0200
Remove David Nusinow from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index c760c4f..86d3abd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xterm (276-2) UNRELEASED; urgency=low
* Pass -DFOO in CPPFLAGS, not CFLAGS.
* Update copyright year in debian/copyright.
* Bump Standards-Version to 3.9.2, no changes needed.
+ * Remove David Nusinow from Uploaders.
-- Julien Cristau <jcristau@debian.org> Sat, 15 Oct 2011 20:54:36 +0200
diff --git a/debian/control b/debian/control
index 3cd236e..5fb0ab8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xterm
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
Standards-Version: 3.9.2
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xterm
commit 0cd124ed65198efa5b6b729786b6a8a2485a7b77
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 16 19:46:23 2011 +0200
Bump Standards-Version to 3.9.2, no changes needed.
diff --git a/debian/changelog b/debian/changelog
index 0f4bea5..c760c4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xterm (276-2) UNRELEASED; urgency=low
* Pass -DFOO in CPPFLAGS, not CFLAGS.
* Update copyright year in debian/copyright.
+ * Bump Standards-Version to 3.9.2, no changes needed.
-- Julien Cristau <jcristau@debian.org> Sat, 15 Oct 2011 20:54:36 +0200
diff --git a/debian/control b/debian/control
index 81924f2..3cd236e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xterm
Homepage: http://invisible-island.net/xterm/xterm.html
commit 0aa1e83596fe0dc6f6e31d2093ec54cc977e669b
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 15 20:56:03 2011 +0200
Update copyright year in debian/copyright.
diff --git a/debian/changelog b/debian/changelog
index b57629d..0f4bea5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xterm (276-2) UNRELEASED; urgency=low
* Pass -DFOO in CPPFLAGS, not CFLAGS.
+ * Update copyright year in debian/copyright.
-- Julien Cristau <jcristau@debian.org> Sat, 15 Oct 2011 20:54:36 +0200
diff --git a/debian/copyright b/debian/copyright
index 48740bc..c0d20a7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ This package was debianized by first time by David Martinez Moreno
Upstream sources: http://invisible-island.net/xterm/xterm.html
-Copyright 1997-2010 by Thomas E. Dickey
+Copyright 1997-2011 by Thomas E. Dickey
Copyright 1999-2000 by Steve Wall
All Rights Reserved
commit 78c64d94768c9d21ecac4376eb467a41766b70c1
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 15 20:54:46 2011 +0200
Pass -DFOO in CPPFLAGS, not CFLAGS.
diff --git a/debian/changelog b/debian/changelog
index 375e257..b57629d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (276-2) UNRELEASED; urgency=low
+
+ * Pass -DFOO in CPPFLAGS, not CFLAGS.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 15 Oct 2011 20:54:36 +0200
+
xterm (276-1) unstable; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/rules b/debian/rules
index 9c7697b..ab7c20c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ DESKTOP_FLAGS = --vendor debian \
--dir=$(DEBTREEDIR)/usr/share/applications
# disable some unsafe operations
-CFLAGS += \
+CPPFLAGS = \
-DDEF_ALLOW_FONT=False \
-DDEF_ALLOW_TCAP=False \
-DDEF_DISALLOWED_WINDOW=\\\"1,2,3,4,5,6,7,8,9,11,13,14,18,19,20,21,GetSelection,SetSelection,SetWinLines,SetXprop\\\"
@@ -66,8 +66,9 @@ $(STAMP_DIR)/configure: $(STAMP_DIR)/patch
$(confflags) \
DESKTOP_FLAGS="$(DESKTOP_FLAGS)" \
CFLAGS="$(CFLAGS)" \
+ CPPFLAGS="$(CPPFLAGS)" \
LUIT=/usr/bin/luit
- touch $@
+ >$@
.PHONY: build
@@ -75,7 +76,7 @@ build: $(STAMP_DIR)/build
$(STAMP_DIR)/build: $(STAMP_DIR)/configure debian/local/xterm.faq
dh_testdir
cd build && $(MAKE)
- touch $@
+ >$@
.PHONY: clean
clean: xsfclean
Reply to: