Import Debian changes 1.4.7-2

mcu8051ide (1.4.7-2) unstable; urgency=low

  [ Fabricio Alcalde ]
  * Use tcl-signal instead of tclx.

  [ Andrew Shadura ]
  * Update the launcher script to use Tcl 8.6.
  * Bump the dependencies.

8 files changed, 73 insertions, 15 deletions

diff --git a/debian/changelog b/debian/changelog
index 374c77f..c2e5cbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,18 @@
+mcu8051ide (1.4.7-2) unstable; urgency=low
+
+  [ Fabricio Alcalde ]
+  * Use tcl-signal instead of tclx.
+
+  [ Andrew Shadura ]
+  * Update the launcher script to use Tcl 8.6.
+  * Bump the dependencies.
+
+ -- Andrew Shadura <andrewsh@debian.org>  Mon, 05 May 2014 01:22:13 +0200
+
 mcu8051ide (1.4.7-1) unstable; urgency=low
 
   * New upstream release.
-  * Fixed spelling error in the manpage.
+  * Fixed spelling error in manpage.
 
  -- Fabricio Alcalde <f@lcald.com.ar>  Sat, 27 Apr 2013 15:40:07 +0000
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 5c6bbd6..32f5b06 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,18 @@ Source: mcu8051ide
 Section: electronics
 Priority: extra
 Maintainer: Fabricio Alcalde <f@lcald.com.ar>
-Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.5
 Homepage: http://mcu8051ide.sf.net
+#Vcs-Git: git://git.debian.org/collab-maint/mcu8051ide.git
+#Vcs-Browser: http://git.debian.org/?p=collab-maint/mcu8051ide.git;a=summary
 
 Package: mcu8051ide
 Architecture: all
-Depends: ${misc:Depends}, bwidget (>= 1.8.0), itcl3, tdom (>= 0.8), tcllib (>= 1.10), tcl8.5, tk8.5, tclx8.4, libtk-img
-Suggests: rxvt-unicode, sdcc, doxygen, hunspell, make
+Depends: ${misc:Depends}, bwidget (>= 1.8.0), itcl3, tdom (>= 0.8), tcllib (>= 1.10), tk8.6, tcl-signal, libtk-img
+Suggests: rxvt-unicode, sdcc, doxygen, hunspell, make, tclsh
 Description: Graphical Integrated Development Environment for 8051
- MCU 8051 IDE is integrated development environment for microcontrollers based
- on 8051. Supported programming languages are C and assembly. It has its own
- assembler and support for 2 external assemblers. For C language it uses the
- SDCC compiler.
+ MCU 8051 IDE is an integrated development environment for microcontrollers
+ based on 8051. Supported programming languages are C and assembly. It has
+ its own assembler and it supports two other external assemblers. For C 
+ language it uses the SDCC compiler.
diff --git a/debian/copyright b/debian/copyright
index c63c9cb..d6496d3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,5 +21,5 @@ License:
 
 The Debian packaging is:
 
-    Copyright (C) 2010 Fabricio Alcalde <f@lcald.com.ar> and is licensed under
+    Copyright (C) 2014 Fabricio Alcalde <f@lcald.com.ar> and is licensed under
     the GPL, see "/usr/share/common-licenses/GPL-2".
diff --git a/debian/patches/addlaunchscript.patch b/debian/patches/addlaunchscript.patch
index 19339ec..64896ed 100644
--- a/debian/patches/addlaunchscript.patch
+++ b/debian/patches/addlaunchscript.patch
@@ -6,4 +6,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +++ b/mcu8051ide
 @@ -0,0 +1,2 @@
 +#!/bin/sh
-+exec tclsh8.5 /usr/share/mcu8051ide/lib/main.tcl "$@"
++exec tclsh8.6 /usr/share/mcu8051ide/lib/main.tcl "$@"
diff --git a/debian/patches/fixdesktopfile.patch b/debian/patches/fixdesktopfile.patch
index 81f6797..16d878a 100644
--- a/debian/patches/fixdesktopfile.patch
+++ b/debian/patches/fixdesktopfile.patch
@@ -1,5 +1,5 @@
-Description: Removed deprecated options in .desktop file
- Removed TerminalOptions and Encoding=UTF8.
+Description: Removed deprecated options and added Keywords
+ Removed TerminalOptions and Encoding=UTF8 and added some keywords
 Author: Fabricio Alcalde <f@lcald.com.ar>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
@@ -13,7 +13,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  Exec=mcu8051ide
  GenericName=MCU 8051 IDE
  GenericName[en_US]=MCU 8051 IDE
-@@ -12,7 +11,6 @@
+@@ -12,10 +11,10 @@
  Name[en_US]=MCU 8051 IDE
  StartupNotify=false
  Terminal=false
@@ -21,3 +21,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  TryExec=mcu8051ide
  Type=Application
  Version=1.0
+ X-DCOP-ServiceType=
+ X-KDE-SubstituteUID=false
+ X-KDE-Username=
++Keywords=mcu8051ide;8051;ide
diff --git a/debian/patches/series b/debian/patches/series
index c3f1811..9fd06a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fixdesktopfile.patch
 addlaunchscript.patch
+use-signal-not-tclx.patch
diff --git a/debian/patches/use-signal-not-tclx.patch b/debian/patches/use-signal-not-tclx.patch
new file mode 100644
index 0000000..55342eb
--- /dev/null
+++ b/debian/patches/use-signal-not-tclx.patch
@@ -0,0 +1,40 @@
+Description: Use signal package instead of tclx
+ Since tclx package is deprecated the tcl-signal package was used as
+ a replacement.
+Author: Andrew Shadura <bugzilla@tut.by>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/lib/main.tcl
++++ b/lib/main.tcl
+@@ -79,7 +79,7 @@
+ 	{Tk		8.5}
+ 	{img::png	1.3}
+ 	{tdom		0.8}
+-	{Tclx		8.0}
++	{Signal		1.4}
+ 	{Tcl		8.2}
+ }
+ 
+@@ -192,9 +192,9 @@
+ 		}
+ 
+ 	# Tclx workarond for Debian
+-	} elseif {$library == {Tclx}} {
++	} elseif {$library == {Signal}} {
+ 		set ::TCLX_AVAILABLE 0
+-		puts stderr "\nERROR: Unable to load Tclx library, functionality will be limited"
++		puts stderr "\nERROR: Unable to load Signal library, functionality will be limited"
+ 		return
+ 	}
+ 
+@@ -759,8 +759,8 @@
+ 		exit 1
+ 	}
+ 
+-	signal trap SIGINT	{signal_handler SIGINT}
+-	signal trap SIGTERM	{signal_handler SIGTERM}
++	signal add SIGINT	{signal_handler SIGINT}
++	signal add SIGTERM	{signal_handler SIGTERM}
+ }
+ 
+