[Pkg-ace-commits] [pkg-ace] r596 - trunk/debian

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-04-20 08:48:16 +0000 (Sun, 20 Apr 2008)
New Revision: 596

Modified:
   trunk/debian/control
   trunk/debian/rules
Log:
pass --enable-pthreads and use default Tcl/Tk path


Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2008-04-20 07:44:31 UTC (rev 595)
+++ trunk/debian/control	2008-04-20 08:48:16 UTC (rev 596)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian ACE+TAO maintainers <pkg-ace-devel at lists.alioth.debian.org>
 Uploaders: Konstantinos Margaritis <markos at debian.org>, Brian Nelson <pyro at debian.org>, Thomas Girard <thomas.g.girard at free.fr>
-Build-Depends: debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk8.4-dev (>= 8.4.7), libfox-1.6-dev, zlib1g-dev, libzzip-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev
+Build-Depends: debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), libfox-1.6-dev, zlib1g-dev, libzzip-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev
 Build-Conflicts: autoconf2.13, automake1.4
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ace/trunk
@@ -276,7 +276,7 @@
 Package: libace-tkreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tkreactor-5.6.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk8.4-dev (>= 8.4.7)
+Depends: libace-tkreactor-5.6.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.4.7)
 Description: ACE-GUI reactor integration for Tk development files
  This package contains header files and static library for the ACE-Tk
  reactor integration.

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-04-20 07:44:31 UTC (rev 595)
+++ trunk/debian/rules	2008-04-20 08:48:16 UTC (rev 596)
@@ -20,8 +20,8 @@
              --host $(DEB_HOST_GNU_TYPE)
 endif
 
-TCL_HOME := /usr/lib/tcl8.4
-TK_HOME  := /usr/lib/tk8.4
+TCL_HOME := /usr/lib
+TK_HOME  := /usr/lib
 
 ACE_SUBDIR := ACE_wrappers
 ACE_ARCHIVE := $(shell ls -1 ACE+TAO+CIAO-src-*.tar.bz2 2>/dev/null || echo ace-archive-missing)
@@ -267,6 +267,7 @@
            --with-tclconfig=$(TCL_HOME) --with-tkconfig=$(TK_HOME) \
            --with-zlib --with-zzip \
            --enable-inline \
+           --enable-pthreads \
            --enable-symbol-visibility \
            --enable-ace-reactor-notification-queue
 	echo '#define ACE_GPERF "gperf-ace"' >> $(CONFIG)