Hi,
I just NMUd icon to fix the FTBFS bugs and also changed the
Build-Depends (#292864, #293472, #277660 and #249208). The patch is
attached.
cheers,
Michael
--
Michael Banck
Debian Developer
[EMAIL PROTECTED]
http://www.advogato.org/person/mbanck/diary.html
diff -u icon-9.4.2/config/gnu/Makedefs icon-9.4.2/config/gnu/Makedefs
--- icon-9.4.2/config/gnu/Makedefs
+++ icon-9.4.2/config/gnu/Makedefs
@@ -1,17 +1,19 @@
-# Makefile definitions from config/unix/gnu
-
# CC C compiler
# CFLAGS flags for building C files
# CFDYN additional flags for dynamic functions
# RLINK flags for linking run-time system
# RLIBS libraries to link with run-time system
+# TLIBS libraries to link for POSIX threads
# XLIBS libraries to link for graphics
# XPMDEFS definitions for building XPM library
+# GDIR directory of graphics helper library
CC = gcc
CFLAGS = -O2
CFDYN = -fPIC
RLINK = -Wl,-E
RLIBS = -lm -ldl
+TLIBS = -lpthread
XLIBS = -L/usr/X11R6/lib -lX11
XPMDEFS = -DZPIPE
+GDIR = xpm
diff -u icon-9.4.2/debian/control icon-9.4.2/debian/control
--- icon-9.4.2/debian/control
+++ icon-9.4.2/debian/control
@@ -3,7 +3,7 @@
Standards-Version: 3.1.1
Section: devel
Priority: optional
-Build-Depends: xlibs-dev
+Build-Depends: libx11-dev, libxt-dev
Package: icont
Architecture: any
diff -u icon-9.4.2/debian/changelog icon-9.4.2/debian/changelog
--- icon-9.4.2/debian/changelog
+++ icon-9.4.2/debian/changelog
@@ -1,3 +1,15 @@
+icon (9.4.2-2.2) unstable; urgency=low
+
+ * Non-maintainer upload during BSP
+ * Update config/gnu/Makeconf according to config/linux/Makeconf to
+ prevent an infinite loop/system hang. (closes: #292864)
+ * Force system to linux for k*BSD when configuring. (closes: #293472)
+ * Change Build-Depends from `xlibs-dev' to `libx11-dev, libxt-dev'.
+ (closes: #277660)
+ * Compile with -O0 on amd64. (closes: #249208)
+
+ -- Michael Banck <[EMAIL PROTECTED]> Sun, 6 Feb 2005 12:00:47 +0100
+
icon (9.4.2-2.1) unstable; urgency=low
* Non-maintainer upload during BSP
diff -u icon-9.4.2/debian/rules icon-9.4.2/debian/rules
--- icon-9.4.2/debian/rules
+++ icon-9.4.2/debian/rules
@@ -32,7 +32,15 @@
ifeq "$(DEB_HOST_GNU_CPU)" "sparc"
CFLAGS_OPT = -O0
endif
+ifeq "$(DEB_HOST_GNU_CPU)" "x86_64"
+CFLAGS_OPT = -O0
+endif
+ifneq (, $(filter $(DEB_HOST_GNU_SYSTEM), linux kfreebsd-gnu knetbsd-gnu))
+system = linux
+else
+system = $(DEB_HOST_GNU_SYSTEM)
+endif
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS_OPT = -O0
@@ -42,7 +50,7 @@
configure:
$(checkdir)
- $(MAKE) X-Configure name=$(DEB_HOST_GNU_SYSTEM)
+ $(MAKE) X-Configure name=$(system)
sed "s/CFLAGS = -O2/CFLAGS = $(CFLAGS)/" Makedefs > Makedefs.tmp
mv Makedefs.tmp Makedefs
touch configure
