Package: erlang
Version: 1:10.b.7-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my erlang 1:10.b.7-1.1 NMU.
--
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u erlang-10.b.7/erts/configure.in erlang-10.b.7/erts/configure.in
--- erlang-10.b.7/erts/configure.in
+++ erlang-10.b.7/erts/configure.in
@@ -69,7 +69,7 @@
AC_CONFIG_HEADER($host/config.h:config.h.in
include/internal/$host/ethread_header_config.h:include/internal/ethread_header_config.h.in)
case $host_os in
- linux*) AC_DEFINE(_GNU_SOURCE, 1, \
+ *gnu*) AC_DEFINE(_GNU_SOURCE, 1, \
[Define if you want to turn on some gnu features.]) ;;
*) ;;
esac
@@ -464,7 +464,7 @@
ENABLE_ALLOC_TYPE_VARS="$ENABLE_ALLOC_TYPE_VARS threads"
case $host_os in
solaris*) AC_DEFINE(ENABLE_CHILD_WAITER_THREAD) ;;
- linux*) AC_DEFINE(USE_RECURSIVE_MALLOC_MUTEX) ;;
+ *gnu*) AC_DEFINE(USE_RECURSIVE_MALLOC_MUTEX) ;;
*) ;;
esac
fi
diff -u erlang-10.b.7/debian/control erlang-10.b.7/debian/control
--- erlang-10.b.7/debian/control
+++ erlang-10.b.7/debian/control
@@ -3,13 +3,13 @@
Section: interpreters
Priority: optional
Standards-Version: 3.6.2.1
-Build-Depends: debhelper (>= 4.0.0), autoconf2.13, gawk | awk, openssl,
libssl-dev, m4, xlibs-dev, libncurses5-dev
+Build-Depends: debhelper (>= 4.0.0), autoconf2.13, gawk | awk, openssl,
libssl-dev, m4, libncurses5-dev
Package: erlang
Architecture: all
Pre-Depends: dpkg (>= 1.4.1.17)
Depends: debianutils (>= 1.13.1), ${erlang:Depends}, erlang-base
(=${Source-Version}), tk8.4
-Conflicts: erlang-base (<< ${Source-Version}) erlang-jams, erlang-jams-erl,
erlang-dev, erlang-mode, erlang-manpages (<< 1:10.b.1a), elastic-base,
libxmerl-erlang
+Conflicts: erlang-base (<< ${Source-Version}), erlang-jams, erlang-jams-erl,
erlang-dev, erlang-mode, erlang-manpages (<< 1:10.b.1a), elastic-base,
libxmerl-erlang
Replaces: erlang-base (<< ${Source-Version})
Suggests: erlang-manpages (= 1:10.b.7), erlang-doc-html (=1:10.b.7)
Description: A real-time, concurrent and distributed functional language
@@ -54,7 +54,7 @@
Package: erlang-base
Architecture: any
Recommends: erlang
-Depends: debconf (>=0.4.00), ${shlibs:Depends}
+Depends: debconf (>=0.4.00) | debconf-2.0, ${shlibs:Depends}
Conflicts: erlang (<< ${Source-Version})
Replaces: erlang (<< ${Source-Version})
Description: Erlang base system (virtual machine)
diff -u erlang-10.b.7/debian/changelog erlang-10.b.7/debian/changelog
--- erlang-10.b.7/debian/changelog
+++ erlang-10.b.7/debian/changelog
@@ -1,3 +1,13 @@
+erlang (1:10.b.7-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Remove xlibs-dev build-dep (Closes: #346655).
+ * Add comma in Conflicts (Closes: #344118).
+ * Fix FTBFS on GNU/kFreeBSD (Closes: #345204).
+ * Add debconf-2.0 alternative (Closes: #331817).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Wed, 15 Mar 2006 17:44:19 +0100
+
erlang (1:10.b.7-1) unstable; urgency=low
* new upstream version (Closes: #317456, #310741)
diff -u erlang-10.b.7/Makefile erlang-10.b.7/Makefile
--- erlang-10.b.7/Makefile
+++ erlang-10.b.7/Makefile
@@ -25,7 +25,7 @@
SHELL = /bin/sh
# The top directory in which Erlang is unpacked
-ERL_TOP = /home/neumann/Debian/erlang-10.b.7/erlang-10.b.7
+ERL_TOP = /home/luk/tmp/erlang-10.b.7
# erts (Erlang RunTime System) version
ERTS = erts-5.4.9
