import changes from debian archive

diff --git a/base/chiark-tcl.h b/base/chiark-tcl.h
index 1ec2e4edbc1e5d91690c02fd31da1d28037a6beb..a4c073a27611f4cf2ff15e572029c832df566074 100644 (file)
--- a/base/chiark-tcl.h
+++ b/base/chiark-tcl.h
@@ -30,6 +30,7 @@
 #include <sys/uio.h>
 #include <sys/un.h>
 #include <arpa/inet.h>
+#include <limits.h>
 
 #ifndef _TCL /* if someone already included some tcl.h, use that */
 #include <tcl.h>

diff --git a/debian/changelog b/debian/changelog
index 1b84bb1651cd13fd94f6b1dbad24c088c7a9cb91..1d34c791ceb6e8c1290960d8fbcc57b7be8f9671 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+chiark-tcl (1.1.0+nmu2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules: add invocation of dh_makeshlibs and dh_installdeb, so
+    that ldconfig is invoked in postinst (Closes: #553122)
+  * debian/control: replace libnettle-dev by nettle-dev (which replaces
+    the former) in build-dependencies
+
+ -- Stefano Zacchiroli <zack@debian.org>  Thu, 19 Nov 2009 09:09:57 +0100
+
+chiark-tcl (1.1.0+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with gcc-4.3 by adding <limits.h> include to
+    base/chiark-tcl.h as suggested by Michael Bienia (Closes: #489901).
+  * Set urgency to “medium” as this bug affects testing too.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sun, 19 Jul 2009 18:23:54 +0200
+
 chiark-tcl (1.1.0) unstable; urgency=high
 
   New features:

diff --git a/debian/control b/debian/control
index 8310aaf91ee41e38951e5e9363b883ad41fbff6e..3cfae3a97383b6b12cb3bd8ba40013490abf823f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Ian Jackson <ian@davenant.greenend.org.uk>
 Priority: optional
 Section: interpreters
 Standards-Version: 3.6.2
-Build-Depends: libadns1-dev (>= 1.2), libnettle-dev, libcdb-dev | tinycdb (<= 0.75), tcl8.4-dev | tcl8.3-dev | tcl8.2-dev, debhelper (>= 3)
+Build-Depends: libadns1-dev (>= 1.2), nettle-dev, libcdb-dev | tinycdb (<= 0.75), tcl8.4-dev | tcl8.3-dev | tcl8.2-dev, debhelper (>= 3)
 
 Package: libtcl-chiark-1
 Architecture: any

diff --git a/debian/rules b/debian/rules
index 013cf5230fd4f546790e601a66fb836d43db27dd..a9f57a69f2a09307525d77e209e700cda25b4608 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -68,12 +68,14 @@ binary-arch:        checkroot build
        dh_installchangelogs
        dh_strip
 
+       dh_makeshlibs
        dh_shlibdeps -Xchiark_tcl_adns -Xchiark_tcl_crypto
 
        # be consistent about what we compress:
        dh_compress -X.c.txt -X.h.txt
 
        dh_fixperms
+       dh_installdeb
        dh_gencontrol
        dh_md5sums
        dh_builddeb