Merge branch 'dgit/sid'

Conflicts:
	debian/changelog
	debian/control

diff --combined debian/changelog
index 1c0dec36ba0ad45f6a55b4c55471fac7bc80c550,5b97a5fe290ee97c8df3ab36e80617445f9ad88d..92284f3e03528698bc048837f6a47f02cea81060
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +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: