[qrouter] 01/01: Make sure that qrouter uses the tkcon version installed in debian.

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository qrouter.

commit 171a5ba15d62fdb7f6c85360b39905ac6191f2a7
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sat Sep 20 10:21:03 2014 +0200

    Make sure that qrouter uses the tkcon version installed in debian.
---
 debian/control                                |  2 +-
 debian/patches/02_use_tkcon_from_debian.patch | 35 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 0d36b9a..9ed27d1 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Homepage: http://opencircuitdesign.com/qrouter/
 
 Package: qrouter
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, tkcon
 Description: Multi-level, over-the-cell maze router
  Qrouter is a tool to generate metal layers and vias to physically connect
  together a netlist in a VLSI fabrication technology. It is a maze router,
diff --git a/debian/patches/02_use_tkcon_from_debian.patch b/debian/patches/02_use_tkcon_from_debian.patch
new file mode 100644
index 0000000..4d2d605
--- /dev/null
+++ b/debian/patches/02_use_tkcon_from_debian.patch
@@ -0,0 +1,35 @@
+Description: This patch makes sure that the tkcon
+  version from debian is used instead of the version
+  bundled with the source of qrouter.
+Author: Ruben Undheim <ruben.undheim at gmail.com>
+--- qrouter-1.2.32.orig/Makefile
++++ qrouter-1.2.32/Makefile
+@@ -95,7 +95,6 @@ install-tcl: qrouter.sh qrouter.tcl qrou
+ 	$(INSTALL) qrouter$(SHDLIB_EXT) $(DESTDIR)${LIBINSTALL}
+ 	$(INSTALL) qrouterexec$(EXEEXT) $(DESTDIR)${LIBINSTALL}
+ 	$(INSTALL) -m 0644 console.tcl $(DESTDIR)${LIBINSTALL}
+-	$(INSTALL) tkcon.tcl $(DESTDIR)${LIBINSTALL}
+ 	$(INSTALL) -m 0644 qrouter.tcl $(DESTDIR)${LIBINSTALL}
+ 
+ uninstall:
+--- qrouter-1.2.32.orig/Makefile.in
++++ qrouter-1.2.32/Makefile.in
+@@ -95,7 +95,6 @@ install-tcl: qrouter.sh qrouter.tcl qrou
+ 	$(INSTALL) qrouter$(SHDLIB_EXT) $(DESTDIR)${LIBINSTALL}
+ 	$(INSTALL) qrouterexec$(EXEEXT) $(DESTDIR)${LIBINSTALL}
+ 	$(INSTALL) -m 0644 console.tcl $(DESTDIR)${LIBINSTALL}
+-	$(INSTALL) tkcon.tcl $(DESTDIR)${LIBINSTALL}
+ 	$(INSTALL) -m 0644 qrouter.tcl $(DESTDIR)${LIBINSTALL}
+ 
+ uninstall:
+--- qrouter-1.2.32.orig/qrouter.sh.in
++++ qrouter-1.2.32/qrouter.sh.in
+@@ -40,7 +40,7 @@ done
+ 
+ if [ $TKCON ]; then
+ 
+-   exec ${loclibdir}/tkcon.tcl \
++   exec /usr/bin/tkcon \
+ 	-eval "source ${loclibdir}/console.tcl" \
+ 	-slave "package require Tk; set argc $#; set argv [list $*]; \
+ 	source ${loclibdir}/qrouter.tcl"
diff --git a/debian/patches/series b/debian/patches/series
index 5393cb8..eb0fbef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_chmod_executable.patch
+02_use_tkcon_from_debian.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qrouter.git