From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 2 Jun 2012 10:20:39 +0000 (+0100)
Subject: Merge branch 'nmus'
X-Git-Tag: debian/1.1.1~20
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=commitdiff_plain;h=6eaeb954a0224bf61f1f59521343ac491d7f7f7f

Merge branch 'nmus'

Conflicts:
	debian/changelog
---

6eaeb954a0224bf61f1f59521343ac491d7f7f7f
diff --cc debian/changelog
index ab07831,1d34c79..4bd4753
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,22 +1,28 @@@
 +chiark-tcl (1.1.1) unstable; urgency=low
 +
-   Portability fixes:
-   * #include <limits.h> (for INT_MAX).  Closes: #489901.
++  * 
 +
 + --
 +
+ 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: