Package: axe
Version: 6.1.2-16
Severity: serious
Tags: patch

Dear Maintainer,

We are about to drop Tcl/Tk 8.4 from Debian, and your axe package build
depends on tcl8.4-dev.

The attached patch replaces tcl8.4-dev by tcl-dev in build dependencies,
which makes it build successfully for unstable where tcl-dev pulls tcl8.5-dev,
but not in experimental where tcl-dev depends on tcl8.6-dev, so I had to
define USE_INTERP_RESULT macro also.

If you don't mind, I could do NMU with these changes.

-- System Information:
Debian Release: 7.3
  APT prefers proposed-updates
  APT policy: (500, 'proposed-updates'), (500, 'stable'), (100, 'unstable'), 
(1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.2.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u axe-6.1.2/Axe.tmpl axe-6.1.2/Axe.tmpl
--- axe-6.1.2/Axe.tmpl
+++ axe-6.1.2/Axe.tmpl
@@ -41,10 +41,10 @@
 #define Extension 
 
 /*  ...and state where the Tcl include files are */
-#define TclIncDir /usr/include/tcl8.4
+#define TclIncDir /usr/include/tcl
 
 /* ...and where the library is, i.e. TclLibDir/libtcl.a (or .so.?.?) exists */
-#define TclLibDir /usr/lib
+/* #define TclLibDir /usr/lib */
 
 
 
@@ -110,10 +110,10 @@
 #ifdef Extension
     EXTN_SRCS = Language.c
     EXTN_OBJS = Language.o
-EXTN_INCLUDES = -I/**/TclIncDir
+EXTN_INCLUDES = -I/**/TclIncDir -DUSE_INTERP_RESULT
  EXTN_LDFLAGS = -L/**/TclLibDir
 /*    EXTN_LIBS = -ltcl8.0 -lm */
-    EXTN_LIBS = -ltcl8.4 -lm
+    EXTN_LIBS = -ltcl -lm
     EXTENSION = -DEXTENSION
 #endif
     EXTN_DEPS = AxeEditor.o axe.o
diff -u axe-6.1.2/debian/changelog axe-6.1.2/debian/changelog
--- axe-6.1.2/debian/changelog
+++ axe-6.1.2/debian/changelog
@@ -1,3 +1,11 @@
+axe (6.1.2-16.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Replaced obsolete tcl8.4-dev build dependency by tcl-dev.
+  * Defined macro USE_INTERP_RESULT to make axe building with Tcl 8.6.
+
+ -- Sergei Golovan <sgolo...@debian.org>  Fri, 31 Jan 2014 10:32:14 +0400
+
 axe (6.1.2-16) unstable; urgency=low
 
   * Acknowledge NMU.
diff -u axe-6.1.2/debian/control axe-6.1.2/debian/control
--- axe-6.1.2/debian/control
+++ axe-6.1.2/debian/control
@@ -2,7 +2,7 @@
 Section: non-free/editors
 Priority: optional
 Maintainer: Hwei Sheng Teoh <hst...@debian.org>
-Build-Depends: debhelper (>=5.0.14), tcl8.4-dev, libx11-dev, libxmu-dev, libxt-dev, libsm-dev, libxpm-dev, libice-dev, libxaw7-dev, xutils-dev
+Build-Depends: debhelper (>=5.0.14), tcl-dev, libx11-dev, libxmu-dev, libxt-dev, libsm-dev, libxpm-dev, libice-dev, libxaw7-dev, xutils-dev
 Standards-Version: 3.9.4
 
 Package: axe

Reply via email to