Merge branch 'dgit/sid'

Conflicts:
	debian/changelog
	debian/control

diff --git a/debian/changelog b/debian/changelog
index 1c0dec36ba0ad45f6a55b4c55471fac7bc80c550..92284f3e03528698bc048837f6a47f02cea81060 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,18 @@
 chiark-tcl (1.1.2~) unstable; urgency=low
 
+  * Reintroduce .gitignore which a build tool brokenly deleted.
   * Remove .cvsignore files from git repo.
 
  --
 
+chiark-tcl (1.1.1+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build against the default Tcl version instead of deprecated 8.4
+    (closes: #725248).
+
+ -- Sergei Golovan <sgolovan@debian.org>  Tue, 15 Oct 2013 21:12:46 +0400
+
 chiark-tcl (1.1.1) unstable; urgency=low
 
   Bugfix:

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