Hi Ole!

I've prepared a small patch which can help in porting skycat to 8.6
(it just replaces 8.5 by 8.6 here and there and adds a bit more
restrictive dependency on blt).

Cheers!
-- 
Sergei Golovan
diff -Nru skycat-3.1.2+starlink1~b/debian/changelog 
skycat-3.1.2+starlink1~b/debian/changelog
--- skycat-3.1.2+starlink1~b/debian/changelog   2014-04-14 13:48:11.000000000 
+0400
+++ skycat-3.1.2+starlink1~b/debian/changelog   2014-07-05 10:52:33.000000000 
+0400
@@ -1,3 +1,10 @@
+skycat (3.1.2+starlink1~b-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Switched to Tcl/Tk 8.6.
+
+ -- Sergei Golovan <sgolo...@debian.org>  Sat, 05 Jul 2014 10:52:01 +0400
+
 skycat (3.1.2+starlink1~b-6) unstable; urgency=low
 
   * Replace tclx8.4 dependency by tcl8.5 counterparts
diff -Nru skycat-3.1.2+starlink1~b/debian/control 
skycat-3.1.2+starlink1~b/debian/control
--- skycat-3.1.2+starlink1~b/debian/control     2014-04-14 13:38:08.000000000 
+0400
+++ skycat-3.1.2+starlink1~b/debian/control     2014-07-05 10:51:21.000000000 
+0400
@@ -3,15 +3,15 @@
 Priority: optional
 Maintainer: Debian Astronomy Maintainers 
<debian-astro-maintain...@lists.alioth.debian.org>
 Uploaders: Ole Streicher <deb...@liska.ath.cx>
-Build-Depends: blt-dev (>= 2.4z),
+Build-Depends: blt-dev (>= 2.5.3),
                debhelper (>= 9),
                dh-autoreconf,
                itcl3,
                itk3,
                libcfitsio3-dev,
                libwcstools-dev,
-               tcl8.5-dev,
-               tk8.5-dev
+               tcl8.6-dev,
+               tk8.6-dev
 Standards-Version: 3.9.5
 Homepage: http://archive.eso.org/cms/tools-documentation/skycat.html
 Vcs-Git: git://anonscm.debian.org/debian-astro/packages/skycat.git
@@ -19,12 +19,12 @@
 
 Package: skycat
 Architecture: any
-Depends: blt (>= 2.4z),
+Depends: blt (>= 2.5.3),
          itcl3,
          itk3,
          libtk-img,
-         tcl8.5,
-         tk8.5,
+         tcl8.6,
+         tk8.6,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Image visualization and access to catalogs and data for astronomy
diff -Nru skycat-3.1.2+starlink1~b/debian/patches/fhs.patch 
skycat-3.1.2+starlink1~b/debian/patches/fhs.patch
--- skycat-3.1.2+starlink1~b/debian/patches/fhs.patch   2014-03-17 
14:48:30.000000000 +0400
+++ skycat-3.1.2+starlink1~b/debian/patches/fhs.patch   2014-07-05 
11:02:54.000000000 +0400
@@ -315,7 +315,7 @@
  test -d $HOME/.skycat || mkdir $HOME/.skycat
  echo "`date`: Starting skycat with: $0 ${1+"$@"}" > $HOME/.skycat/log
 -exec wish8.4 $SKYCAT_BASE/lib/skycat@PACKAGE_VERSION@/main.tcl ${1+"$@"} | 
tee -a $HOME/.skycat/log 2>&1
-+exec wish8.5 /usr/share/skycat/skycat@PACKAGE_VERSION@/main.tcl ${1+"$@"} | 
tee -a $HOME/.skycat/log 2>&1
++exec wish8.6 /usr/share/skycat/skycat@PACKAGE_VERSION@/main.tcl ${1+"$@"} | 
tee -a $HOME/.skycat/log 2>&1
  
 --- a/skycat/configure.in
 +++ b/skycat/configure.in
@@ -359,7 +359,7 @@
  
  test -d $HOME/.rtd || mkdir $HOME/.rtd
 -exec wish8.4 $RTD_BASE/lib/rtd@PACKAGE_VERSION@/main.tcl ${1+"$@"} | tee 
$HOME/.skycat/log 2>&1
-+exec wish8.5 /usr/share/skycat/rtd@PACKAGE_VERSION@/main.tcl ${1+"$@"} | tee 
$HOME/.skycat/log 2>&1
++exec wish8.6 /usr/share/skycat/rtd@PACKAGE_VERSION@/main.tcl ${1+"$@"} | tee 
$HOME/.skycat/log 2>&1
  
 --- a/tclutil/configure.in
 +++ b/tclutil/configure.in
diff -Nru skycat-3.1.2+starlink1~b/debian/rules 
skycat-3.1.2+starlink1~b/debian/rules
--- skycat-3.1.2+starlink1~b/debian/rules       2014-03-17 16:28:18.000000000 
+0400
+++ skycat-3.1.2+starlink1~b/debian/rules       2014-07-05 10:54:21.000000000 
+0400
@@ -7,7 +7,7 @@
        dh  $@ --with autoreconf
 
 override_dh_auto_configure:
-       dh_auto_configure -- --with-tkinclude=/usr/include/tcl8.5 
--with-tcl=/usr/lib/tcl8.5 --with-tk=/usr/lib/tk8.5 --libdir=/usr/lib/ 
--libexecdir=/usr/lib
+       dh_auto_configure -- --with-tkinclude=/usr/include/tcl8.6 
--with-tcl=/usr/lib/tcl8.6 --with-tk=/usr/lib/tk8.6 --libdir=/usr/lib/ 
--libexecdir=/usr/lib
 
 
 override_dh_installchangelogs:

Reply via email to