[Pkg-ace-commits] [pkg-ace] r597 - in trunk/debian: . patches

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-04-23 17:16:34 +0000 (Wed, 23 Apr 2008)
New Revision: 597

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/patches/05-autoconf-fox.dpatch
Log:
commit what was uploaded.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-20 08:48:16 UTC (rev 596)
+++ trunk/debian/changelog	2008-04-23 17:16:34 UTC (rev 597)
@@ -1,3 +1,20 @@
+ace (5.6.3-2) unstable; urgency=low
+
+  * Add missing libfox-1.6-dev build dependency. Thanks to Bastian Blank for
+    the report. Closes: #476822.
+  * Build depend on libqt4-dev (>= 4.4~rc1-4) to fix FTBFS. Thanks to
+    Martin Zobel-Helas for the report and to Sune Vuorela for the fix.
+    Closes: #476505.
+  * Add platform_macros.GNU.in and have autotools handle it so that it's
+    possible to ship rules.*.GNU. Closes: #469843, #469845.
+  * Remove doxygen-generated files we don't need.
+  * (Build-)Depend on tk-dev instead of tk8.4-dev.
+  * Rework debian/patches/05-autoconf-fox.dpatch not to link against too
+    many libs.
+  * Restore doxygen build-dependency.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 22 Apr 2008 18:23:46 +0000
+
 ace (5.6.3-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2008-04-20 08:48:16 UTC (rev 596)
+++ trunk/debian/control	2008-04-23 17:16:34 UTC (rev 597)
@@ -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), tk-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, doxygen
 Build-Conflicts: autoconf2.13, automake1.4
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ace/trunk

Modified: trunk/debian/patches/05-autoconf-fox.dpatch
===================================================================
--- trunk/debian/patches/05-autoconf-fox.dpatch	2008-04-20 08:48:16 UTC (rev 596)
+++ trunk/debian/patches/05-autoconf-fox.dpatch	2008-04-23 17:16:34 UTC (rev 597)
@@ -38,8 +38,8 @@
 +   fi
 + fi
 + if test X"${FOXCONFIG}" != X; then
-+   ACE_FOX_CPPFLAGS=`$FOXCONFIG --cflags 2>/dev/null`
-+   ACE_FOX_LIBS=`$FOXCONFIG --libs 2>/dev/null`
++   ACE_FOX_CPPFLAGS=-I/usr/include/fox-1.6
++   ACE_FOX_LIBS=-lFOX-1.6
 +   AC_SUBST(ACE_FOX_CPPFLAGS)
 +   AC_SUBST(ACE_FOX_LIBS)
 + fi