rev 5334 - in kde-extras/taskjuggler: tags tags/2.3.1~beta1-1/debian tags/2.3.1~beta1-1/debian/patches trunk/debian trunk/debian/patches

Fathi Boudra fboudra-guest at alioth.debian.org
Tue Jan 16 21:20:41 CET 2007


Author: fboudra-guest
Date: 2007-01-16 21:20:41 +0100 (Tue, 16 Jan 2007)
New Revision: 5334

Added:
   kde-extras/taskjuggler/tags/2.3.1~beta1-1/
Removed:
   kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/patches/10_add_autoconf2.60_support.diff
   kde-extras/taskjuggler/trunk/debian/patches/10_add_autoconf2.60_support.diff
Modified:
   kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/changelog
   kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/patches/02_autotools_update.diff
   kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/patches/03_libtool_update.diff
   kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/patches/11_fix_manpages_build.diff
   kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/rules
   kde-extras/taskjuggler/trunk/debian/changelog
   kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff
   kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff
   kde-extras/taskjuggler/trunk/debian/patches/11_fix_manpages_build.diff
   kde-extras/taskjuggler/trunk/debian/rules
Log:
tags taskjuggler 2.3.1~beta1-1

Copied: kde-extras/taskjuggler/tags/2.3.1~beta1-1 (from rev 5323, kde-extras/taskjuggler/trunk)

Modified: kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/changelog
===================================================================
--- kde-extras/taskjuggler/trunk/debian/changelog	2007-01-16 17:14:24 UTC (rev 5323)
+++ kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/changelog	2007-01-16 20:20:41 UTC (rev 5334)
@@ -1,8 +1,9 @@
-taskjuggler (2.3.0-2) UNRELEASED; urgency=low
+taskjuggler (2.3.1~beta1-1) experimental; urgency=low
 
-  * Update documentation path reference in man page
+  * Update documentation path reference in man page (Closes: #387947).
+  * Remove 10_add_autoconf2.60_support.diff, merged upstream.
 
- -- Fathi Boudra <fboudra at free.fr>  Mon, 16 Oct 2006 14:55:00 +0200
+ -- Fathi Boudra <fboudra at free.fr>  Tue, 16 Jan 2007 18:45:29 +0100
 
 taskjuggler (2.3.0-1) unstable; urgency=low
 

Modified: kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff	2007-01-16 17:14:24 UTC (rev 5323)
+++ kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/patches/02_autotools_update.diff	2007-01-16 20:20:41 UTC (rev 5334)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/compile b/admin/compile
---- a/admin/compile	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/compile	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/compile	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/compile	2007-01-16 18:46:15.000000000 +0100
 @@ -1,8 +1,9 @@
  #! /bin/sh
 -
@@ -183,8 +183,8 @@
 +# time-stamp-end: "$"
 +# End:
 diff -Nrua a/admin/depcomp b/admin/depcomp
---- a/admin/depcomp	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/depcomp	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/depcomp	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/depcomp	2007-01-16 18:46:15.000000000 +0100
 @@ -1,7 +1,9 @@
  #! /bin/sh
 -
@@ -669,8 +669,8 @@
 +# time-stamp-end: "$"
 +# End:
 diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/install-sh	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/install-sh	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/install-sh	2007-01-16 18:46:15.000000000 +0100
 @@ -1,19 +1,38 @@
  #!/bin/sh
 -#
@@ -1221,8 +1221,8 @@
 +# time-stamp-end: "$"
 +# End:
 diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/missing	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/missing	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/missing	2007-01-16 18:46:15.000000000 +0100
 @@ -1,6 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -1498,8 +1498,8 @@
 +# time-stamp-end: "$"
 +# End:
 diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
---- a/admin/mkinstalldirs	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/mkinstalldirs	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/mkinstalldirs	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/mkinstalldirs	2007-01-16 18:46:15.000000000 +0100
 @@ -1,21 +1,33 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy
@@ -1657,8 +1657,8 @@
  # End:
 -# mkinstalldirs ends here
 diff -Nrua a/admin/ylwrap b/admin/ylwrap
---- a/admin/ylwrap	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/ylwrap	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/ylwrap	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/ylwrap	2007-01-16 18:46:15.000000000 +0100
 @@ -1,6 +1,11 @@
  #! /bin/sh
  # ylwrap - wrapper for lex/yacc invocations.

Modified: kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff	2007-01-16 17:14:24 UTC (rev 5323)
+++ kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/patches/03_libtool_update.diff	2007-01-16 20:20:41 UTC (rev 5334)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/libtool.m4.in	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/libtool.m4.in	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/libtool.m4.in	2007-01-16 18:46:15.000000000 +0100
 @@ -1,28 +1,13 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -3762,8 +3762,8 @@
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
 diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/ltmain.sh	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/ltmain.sh	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/ltmain.sh	2007-01-16 18:46:15.000000000 +0100
 @@ -1,7 +1,7 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.

Deleted: kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/patches/10_add_autoconf2.60_support.diff

Modified: kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/patches/11_fix_manpages_build.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/11_fix_manpages_build.diff	2007-01-16 17:14:24 UTC (rev 5323)
+++ kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/patches/11_fix_manpages_build.diff	2007-01-16 20:20:41 UTC (rev 5334)
@@ -1,25 +1,25 @@
-diff -Nur taskjuggler-2.3.0/configure taskjuggler-2.3.0.new/configure
---- taskjuggler-2.3.0/configure	2006-09-06 19:35:16.000000000 +0200
-+++ taskjuggler-2.3.0.new/configure	2006-09-06 20:22:16.000000000 +0200
-@@ -464,7 +464,7 @@
- # include <unistd.h>
- #endif"
+diff -Nur taskjuggler-2.3.1~beta1/configure taskjuggler-2.3.1~beta1.new/configure
+--- taskjuggler-2.3.1~beta1/configure	2007-01-15 10:30:21.000000000 +0100
++++ taskjuggler-2.3.1~beta1.new/configure	2007-01-16 19:27:40.000000000 +0100
+@@ -996,7 +996,7 @@
+ KDE_LIBS
+ LIBKCAL
+ XSLTPROC
+-DOCBOOK_TO_MAN
++DOCBOOK2X_MAN
+ DB2HTML
+ HTMLMANUAL
+ DB2PS
+@@ -34928,15 +34928,15 @@
+ fi
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_NEW_DTAGS LDFLAGS_AS_NEEDED KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN PACKAGES_DIR MSGFMT GMSGFMT XGETTEXT include_KDE_TRUE include_KDE_FALSE include_ARTS_TRUE include_ARTS_FALSE LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM KDE_LIBS LIBKCAL XSLTPROC DOCBOOK_TO_MAN DB2HTML HTMLMANUAL DB2PS DB2PDF JADE JADETEX DVIPS PSMANUAL LIBOBJS LTLIBOBJS TOPSUBDIRS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_NEW_DTAGS LDFLAGS_AS_NEEDED KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN PACKAGES_DIR MSGFMT GMSGFMT XGETTEXT include_KDE_TRUE include_KDE_FALSE include_ARTS_TRUE include_ARTS_FALSE LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM KDE_LIBS LIBKCAL XSLTPROC DOCBOOK2X_MAN DB2HTML HTMLMANUAL DB2PS DB2PDF JADE JADETEX DVIPS PSMANUAL LIBOBJS LTLIBOBJS TOPSUBDIRS'
- ac_subst_files=''
  
- # Initialize some variables set by options.
-@@ -32037,15 +32037,15 @@
- echo "${ECHO_T}no" >&6
- fi
- 
 -  # Extract the first word of "docbook-to-man", so it can be a program name with args.
 -set dummy docbook-to-man; ac_word=$2
 +  # Extract the first word of "docbook2x-man", so it can be a program name with args.
 +set dummy docbook2x-man; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 -if test "${ac_cv_prog_DOCBOOK_TO_MAN+set}" = set; then
 +if test "${ac_cv_prog_DOCBOOK2X_MAN+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31,17 +31,18 @@
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -32054,20 +32054,20 @@
+@@ -34945,7 +34945,7 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
-   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_DOCBOOK_TO_MAN="docbook-to-man"
 +    ac_cv_prog_DOCBOOK2X_MAN="docbook2x-man"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
+@@ -34953,13 +34953,13 @@
  done
- done
+ IFS=$as_save_IFS
  
 -  test -z "$ac_cv_prog_DOCBOOK_TO_MAN" && ac_cv_prog_DOCBOOK_TO_MAN="no"
 +  test -z "$ac_cv_prog_DOCBOOK2X_MAN" && ac_cv_prog_DOCBOOK2X_MAN="no"
@@ -49,25 +50,25 @@
  fi
 -DOCBOOK_TO_MAN=$ac_cv_prog_DOCBOOK_TO_MAN
 -if test -n "$DOCBOOK_TO_MAN"; then
--  echo "$as_me:$LINENO: result: $DOCBOOK_TO_MAN" >&5
--echo "${ECHO_T}$DOCBOOK_TO_MAN" >&6
+-  { echo "$as_me:$LINENO: result: $DOCBOOK_TO_MAN" >&5
+-echo "${ECHO_T}$DOCBOOK_TO_MAN" >&6; }
 +DOCBOOK2X_MAN=$ac_cv_prog_DOCBOOK2X_MAN
 +if test -n "$DOCBOOK2X_MAN"; then
-+  echo "$as_me:$LINENO: result: $DOCBOOK2X_MAN" >&5
-+echo "${ECHO_T}$DOCBOOK2X_MAN" >&6
++  { echo "$as_me:$LINENO: result: $DOCBOOK2X_MAN" >&5
++echo "${ECHO_T}$DOCBOOK2X_MAN" >&6; }
  else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-@@ -33242,7 +33242,7 @@
- s, at KDE_LIBS@,$KDE_LIBS,;t t
- s, at LIBKCAL@,$LIBKCAL,;t t
- s, at XSLTPROC@,$XSLTPROC,;t t
--s, at DOCBOOK_TO_MAN@,$DOCBOOK_TO_MAN,;t t
-+s, at DOCBOOK2X_MAN@,$DOCBOOK2X_MAN,;t t
- s, at DB2HTML@,$DB2HTML,;t t
- s, at HTMLMANUAL@,$HTMLMANUAL,;t t
- s, at DB2PS@,$DB2PS,;t t
-@@ -33975,7 +33975,7 @@
+   { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+@@ -36259,7 +36259,7 @@
+ KDE_LIBS!$KDE_LIBS$ac_delim
+ LIBKCAL!$LIBKCAL$ac_delim
+ XSLTPROC!$XSLTPROC$ac_delim
+-DOCBOOK_TO_MAN!$DOCBOOK_TO_MAN$ac_delim
++DOCBOOK2X_MAN!$DOCBOOK2X_MAN$ac_delim
+ DB2HTML!$DB2HTML$ac_delim
+ HTMLMANUAL!$HTMLMANUAL$ac_delim
+ DB2PS!$DB2PS$ac_delim
+@@ -36870,7 +36870,7 @@
  
    fi
  
@@ -76,18 +77,18 @@
      { echo "$as_me:$LINENO: WARNING: Man pages will not be generated" >&5
  echo "$as_me: WARNING: Man pages will not be generated" >&2;}
      DO_NOT_COMPILE="${DO_NOT_COMPILE} man"
-@@ -34981,7 +34981,7 @@
- s, at KDE_LIBS@,$KDE_LIBS,;t t
- s, at LIBKCAL@,$LIBKCAL,;t t
- s, at XSLTPROC@,$XSLTPROC,;t t
--s, at DOCBOOK_TO_MAN@,$DOCBOOK_TO_MAN,;t t
-+s, at DOCBOOK2X_MAN@,$DOCBOOK2X_MAN,;t t
- s, at DB2HTML@,$DB2HTML,;t t
- s, at HTMLMANUAL@,$HTMLMANUAL,;t t
- s, at DB2PS@,$DB2PS,;t t
-diff -Nur taskjuggler-2.3.0/configure.in taskjuggler-2.3.0.new/configure.in
---- taskjuggler-2.3.0/configure.in	2006-09-06 19:35:28.000000000 +0200
-+++ taskjuggler-2.3.0.new/configure.in	2006-09-06 20:22:16.000000000 +0200
+@@ -37985,7 +37985,7 @@
+ KDE_LIBS!$KDE_LIBS$ac_delim
+ LIBKCAL!$LIBKCAL$ac_delim
+ XSLTPROC!$XSLTPROC$ac_delim
+-DOCBOOK_TO_MAN!$DOCBOOK_TO_MAN$ac_delim
++DOCBOOK2X_MAN!$DOCBOOK2X_MAN$ac_delim
+ DB2HTML!$DB2HTML$ac_delim
+ HTMLMANUAL!$HTMLMANUAL$ac_delim
+ DB2PS!$DB2PS$ac_delim
+diff -Nur taskjuggler-2.3.1~beta1/configure.in taskjuggler-2.3.1~beta1.new/configure.in
+--- taskjuggler-2.3.1~beta1/configure.in	2007-01-15 10:30:11.000000000 +0100
++++ taskjuggler-2.3.1~beta1.new/configure.in	2007-01-16 19:27:57.000000000 +0100
 @@ -140,7 +140,7 @@
  if test "$tj_enable_docs" != "no" ; then
    dnl Check for the stuff needed to generate man pages
@@ -106,9 +107,9 @@
      AC_MSG_WARN([Man pages will not be generated])
      DO_NOT_COMPILE="${DO_NOT_COMPILE} man"
    fi  
-diff -Nur taskjuggler-2.3.0/configure.in.in taskjuggler-2.3.0.new/configure.in.in
---- taskjuggler-2.3.0/configure.in.in	2006-09-06 19:38:33.000000000 +0200
-+++ taskjuggler-2.3.0.new/configure.in.in	2006-09-06 20:22:16.000000000 +0200
+diff -Nur taskjuggler-2.3.1~beta1/configure.in.in taskjuggler-2.3.1~beta1.new/configure.in.in
+--- taskjuggler-2.3.1~beta1/configure.in.in	2007-01-15 10:30:09.000000000 +0100
++++ taskjuggler-2.3.1~beta1.new/configure.in.in	2007-01-16 19:28:11.000000000 +0100
 @@ -136,7 +136,7 @@
  if test "$tj_enable_docs" != "no" ; then
    dnl Check for the stuff needed to generate man pages
@@ -127,9 +128,9 @@
      AC_MSG_WARN([Man pages will not be generated])
      DO_NOT_COMPILE="${DO_NOT_COMPILE} man"
    fi  
-diff -Nur taskjuggler-2.3.0/man/en/Makefile.am taskjuggler-2.3.0.new/man/en/Makefile.am
---- taskjuggler-2.3.0/man/en/Makefile.am	2006-09-06 19:34:12.000000000 +0200
-+++ taskjuggler-2.3.0.new/man/en/Makefile.am	2006-09-06 20:22:59.000000000 +0200
+diff -Nur taskjuggler-2.3.1~beta1/man/en/Makefile.am taskjuggler-2.3.1~beta1.new/man/en/Makefile.am
+--- taskjuggler-2.3.1~beta1/man/en/Makefile.am	2007-01-15 10:30:09.000000000 +0100
++++ taskjuggler-2.3.1~beta1.new/man/en/Makefile.am	2007-01-16 19:28:48.000000000 +0100
 @@ -2,8 +2,8 @@
  EXTRA_DIST = $(man_MANS)
  
@@ -141,9 +142,9 @@
  	fi  
  
  clean-local:
-diff -Nur taskjuggler-2.3.0/man/en/Makefile.in taskjuggler-2.3.0.new/man/en/Makefile.in
---- taskjuggler-2.3.0/man/en/Makefile.in	2006-09-06 19:34:12.000000000 +0200
-+++ taskjuggler-2.3.0.new/man/en/Makefile.in	2006-09-06 20:22:59.000000000 +0200
+diff -Nur taskjuggler-2.3.1~beta1/man/en/Makefile.in taskjuggler-2.3.1~beta1.new/man/en/Makefile.in
+--- taskjuggler-2.3.1~beta1/man/en/Makefile.in	2007-01-15 10:30:29.000000000 +0100
++++ taskjuggler-2.3.1~beta1.new/man/en/Makefile.in	2007-01-16 19:29:02.000000000 +0100
 @@ -87,7 +87,7 @@
  DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
  DEFS = @DEFS@
@@ -153,7 +154,7 @@
  DVIPS = @DVIPS@
  ECHO = @ECHO@
  ECHO_C = @ECHO_C@
-@@ -539,8 +539,8 @@
+@@ -545,8 +545,8 @@
  
  
  .xml.1:
@@ -164,9 +165,9 @@
  	fi  
  
  clean-local:
-diff -Nur taskjuggler-2.3.0/man/Makefile.in taskjuggler-2.3.0.new/man/Makefile.in
---- taskjuggler-2.3.0/man/Makefile.in	2006-09-06 19:34:14.000000000 +0200
-+++ taskjuggler-2.3.0.new/man/Makefile.in	2006-09-06 20:22:55.000000000 +0200
+diff -Nur taskjuggler-2.3.1~beta1/man/Makefile.in taskjuggler-2.3.1~beta1.new/man/Makefile.in
+--- taskjuggler-2.3.1~beta1/man/Makefile.in	2007-01-15 10:30:29.000000000 +0100
++++ taskjuggler-2.3.1~beta1.new/man/Makefile.in	2007-01-16 19:29:19.000000000 +0100
 @@ -99,7 +99,7 @@
  DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
  DEFS = @DEFS@

Modified: kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/rules
===================================================================
--- kde-extras/taskjuggler/trunk/debian/rules	2007-01-16 17:14:24 UTC (rev 5323)
+++ kde-extras/taskjuggler/tags/2.3.1~beta1-1/debian/rules	2007-01-16 20:20:41 UTC (rev 5334)
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_BUILDDIR = .
 DEB_CONFIGURE_EXTRA_FLAGS := --with-docdir=/usr/share/doc/kde/HTML/en/taskjuggler/
@@ -11,7 +12,6 @@
 	install -D -p -m644 debian/taskjuggler.lintian-overrides \
 	  debian/taskjuggler/usr/share/lintian/overrides/taskjuggler
 
-
 get-orig-source:
 	 @@dh_testdir
 	 @@[ -d ../tarballs/. ]

Modified: kde-extras/taskjuggler/trunk/debian/changelog
===================================================================
--- kde-extras/taskjuggler/trunk/debian/changelog	2007-01-16 19:20:01 UTC (rev 5333)
+++ kde-extras/taskjuggler/trunk/debian/changelog	2007-01-16 20:20:41 UTC (rev 5334)
@@ -1,8 +1,9 @@
-taskjuggler (2.3.0-2) UNRELEASED; urgency=low
+taskjuggler (2.3.1~beta1-1) experimental; urgency=low
 
-  * Update documentation path reference in man page
+  * Update documentation path reference in man page (Closes: #387947).
+  * Remove 10_add_autoconf2.60_support.diff, merged upstream.
 
- -- Fathi Boudra <fboudra at free.fr>  Mon, 16 Oct 2006 14:55:00 +0200
+ -- Fathi Boudra <fboudra at free.fr>  Tue, 16 Jan 2007 18:45:29 +0100
 
 taskjuggler (2.3.0-1) unstable; urgency=low
 

Modified: kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff	2007-01-16 19:20:01 UTC (rev 5333)
+++ kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff	2007-01-16 20:20:41 UTC (rev 5334)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/compile b/admin/compile
---- a/admin/compile	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/compile	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/compile	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/compile	2007-01-16 18:46:15.000000000 +0100
 @@ -1,8 +1,9 @@
  #! /bin/sh
 -
@@ -183,8 +183,8 @@
 +# time-stamp-end: "$"
 +# End:
 diff -Nrua a/admin/depcomp b/admin/depcomp
---- a/admin/depcomp	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/depcomp	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/depcomp	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/depcomp	2007-01-16 18:46:15.000000000 +0100
 @@ -1,7 +1,9 @@
  #! /bin/sh
 -
@@ -669,8 +669,8 @@
 +# time-stamp-end: "$"
 +# End:
 diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/install-sh	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/install-sh	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/install-sh	2007-01-16 18:46:15.000000000 +0100
 @@ -1,19 +1,38 @@
  #!/bin/sh
 -#
@@ -1221,8 +1221,8 @@
 +# time-stamp-end: "$"
 +# End:
 diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/missing	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/missing	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/missing	2007-01-16 18:46:15.000000000 +0100
 @@ -1,6 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -1498,8 +1498,8 @@
 +# time-stamp-end: "$"
 +# End:
 diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
---- a/admin/mkinstalldirs	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/mkinstalldirs	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/mkinstalldirs	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/mkinstalldirs	2007-01-16 18:46:15.000000000 +0100
 @@ -1,21 +1,33 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy
@@ -1657,8 +1657,8 @@
  # End:
 -# mkinstalldirs ends here
 diff -Nrua a/admin/ylwrap b/admin/ylwrap
---- a/admin/ylwrap	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/ylwrap	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/ylwrap	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/ylwrap	2007-01-16 18:46:15.000000000 +0100
 @@ -1,6 +1,11 @@
  #! /bin/sh
  # ylwrap - wrapper for lex/yacc invocations.

Modified: kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff	2007-01-16 19:20:01 UTC (rev 5333)
+++ kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff	2007-01-16 20:20:41 UTC (rev 5334)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/libtool.m4.in	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/libtool.m4.in	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/libtool.m4.in	2007-01-16 18:46:15.000000000 +0100
 @@ -1,28 +1,13 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -3762,8 +3762,8 @@
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
 diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh	2006-09-05 18:27:44.000000000 +0200
-+++ b/admin/ltmain.sh	2006-09-06 17:12:26.000000000 +0200
+--- a/admin/ltmain.sh	2007-01-15 10:30:07.000000000 +0100
++++ b/admin/ltmain.sh	2007-01-16 18:46:15.000000000 +0100
 @@ -1,7 +1,7 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.

Deleted: kde-extras/taskjuggler/trunk/debian/patches/10_add_autoconf2.60_support.diff

Modified: kde-extras/taskjuggler/trunk/debian/patches/11_fix_manpages_build.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/11_fix_manpages_build.diff	2007-01-16 19:20:01 UTC (rev 5333)
+++ kde-extras/taskjuggler/trunk/debian/patches/11_fix_manpages_build.diff	2007-01-16 20:20:41 UTC (rev 5334)
@@ -1,25 +1,25 @@
-diff -Nur taskjuggler-2.3.0/configure taskjuggler-2.3.0.new/configure
---- taskjuggler-2.3.0/configure	2006-09-06 19:35:16.000000000 +0200
-+++ taskjuggler-2.3.0.new/configure	2006-09-06 20:22:16.000000000 +0200
-@@ -464,7 +464,7 @@
- # include <unistd.h>
- #endif"
+diff -Nur taskjuggler-2.3.1~beta1/configure taskjuggler-2.3.1~beta1.new/configure
+--- taskjuggler-2.3.1~beta1/configure	2007-01-15 10:30:21.000000000 +0100
++++ taskjuggler-2.3.1~beta1.new/configure	2007-01-16 19:27:40.000000000 +0100
+@@ -996,7 +996,7 @@
+ KDE_LIBS
+ LIBKCAL
+ XSLTPROC
+-DOCBOOK_TO_MAN
++DOCBOOK2X_MAN
+ DB2HTML
+ HTMLMANUAL
+ DB2PS
+@@ -34928,15 +34928,15 @@
+ fi
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_NEW_DTAGS LDFLAGS_AS_NEEDED KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN PACKAGES_DIR MSGFMT GMSGFMT XGETTEXT include_KDE_TRUE include_KDE_FALSE include_ARTS_TRUE include_ARTS_FALSE LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM KDE_LIBS LIBKCAL XSLTPROC DOCBOOK_TO_MAN DB2HTML HTMLMANUAL DB2PS DB2PDF JADE JADETEX DVIPS PSMANUAL LIBOBJS LTLIBOBJS TOPSUBDIRS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_NEW_DTAGS LDFLAGS_AS_NEEDED KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN PACKAGES_DIR MSGFMT GMSGFMT XGETTEXT include_KDE_TRUE include_KDE_FALSE include_ARTS_TRUE include_ARTS_FALSE LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM KDE_LIBS LIBKCAL XSLTPROC DOCBOOK2X_MAN DB2HTML HTMLMANUAL DB2PS DB2PDF JADE JADETEX DVIPS PSMANUAL LIBOBJS LTLIBOBJS TOPSUBDIRS'
- ac_subst_files=''
  
- # Initialize some variables set by options.
-@@ -32037,15 +32037,15 @@
- echo "${ECHO_T}no" >&6
- fi
- 
 -  # Extract the first word of "docbook-to-man", so it can be a program name with args.
 -set dummy docbook-to-man; ac_word=$2
 +  # Extract the first word of "docbook2x-man", so it can be a program name with args.
 +set dummy docbook2x-man; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 -if test "${ac_cv_prog_DOCBOOK_TO_MAN+set}" = set; then
 +if test "${ac_cv_prog_DOCBOOK2X_MAN+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31,17 +31,18 @@
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -32054,20 +32054,20 @@
+@@ -34945,7 +34945,7 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
-   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_DOCBOOK_TO_MAN="docbook-to-man"
 +    ac_cv_prog_DOCBOOK2X_MAN="docbook2x-man"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
+@@ -34953,13 +34953,13 @@
  done
- done
+ IFS=$as_save_IFS
  
 -  test -z "$ac_cv_prog_DOCBOOK_TO_MAN" && ac_cv_prog_DOCBOOK_TO_MAN="no"
 +  test -z "$ac_cv_prog_DOCBOOK2X_MAN" && ac_cv_prog_DOCBOOK2X_MAN="no"
@@ -49,25 +50,25 @@
  fi
 -DOCBOOK_TO_MAN=$ac_cv_prog_DOCBOOK_TO_MAN
 -if test -n "$DOCBOOK_TO_MAN"; then
--  echo "$as_me:$LINENO: result: $DOCBOOK_TO_MAN" >&5
--echo "${ECHO_T}$DOCBOOK_TO_MAN" >&6
+-  { echo "$as_me:$LINENO: result: $DOCBOOK_TO_MAN" >&5
+-echo "${ECHO_T}$DOCBOOK_TO_MAN" >&6; }
 +DOCBOOK2X_MAN=$ac_cv_prog_DOCBOOK2X_MAN
 +if test -n "$DOCBOOK2X_MAN"; then
-+  echo "$as_me:$LINENO: result: $DOCBOOK2X_MAN" >&5
-+echo "${ECHO_T}$DOCBOOK2X_MAN" >&6
++  { echo "$as_me:$LINENO: result: $DOCBOOK2X_MAN" >&5
++echo "${ECHO_T}$DOCBOOK2X_MAN" >&6; }
  else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-@@ -33242,7 +33242,7 @@
- s, at KDE_LIBS@,$KDE_LIBS,;t t
- s, at LIBKCAL@,$LIBKCAL,;t t
- s, at XSLTPROC@,$XSLTPROC,;t t
--s, at DOCBOOK_TO_MAN@,$DOCBOOK_TO_MAN,;t t
-+s, at DOCBOOK2X_MAN@,$DOCBOOK2X_MAN,;t t
- s, at DB2HTML@,$DB2HTML,;t t
- s, at HTMLMANUAL@,$HTMLMANUAL,;t t
- s, at DB2PS@,$DB2PS,;t t
-@@ -33975,7 +33975,7 @@
+   { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+@@ -36259,7 +36259,7 @@
+ KDE_LIBS!$KDE_LIBS$ac_delim
+ LIBKCAL!$LIBKCAL$ac_delim
+ XSLTPROC!$XSLTPROC$ac_delim
+-DOCBOOK_TO_MAN!$DOCBOOK_TO_MAN$ac_delim
++DOCBOOK2X_MAN!$DOCBOOK2X_MAN$ac_delim
+ DB2HTML!$DB2HTML$ac_delim
+ HTMLMANUAL!$HTMLMANUAL$ac_delim
+ DB2PS!$DB2PS$ac_delim
+@@ -36870,7 +36870,7 @@
  
    fi
  
@@ -76,18 +77,18 @@
      { echo "$as_me:$LINENO: WARNING: Man pages will not be generated" >&5
  echo "$as_me: WARNING: Man pages will not be generated" >&2;}
      DO_NOT_COMPILE="${DO_NOT_COMPILE} man"
-@@ -34981,7 +34981,7 @@
- s, at KDE_LIBS@,$KDE_LIBS,;t t
- s, at LIBKCAL@,$LIBKCAL,;t t
- s, at XSLTPROC@,$XSLTPROC,;t t
--s, at DOCBOOK_TO_MAN@,$DOCBOOK_TO_MAN,;t t
-+s, at DOCBOOK2X_MAN@,$DOCBOOK2X_MAN,;t t
- s, at DB2HTML@,$DB2HTML,;t t
- s, at HTMLMANUAL@,$HTMLMANUAL,;t t
- s, at DB2PS@,$DB2PS,;t t
-diff -Nur taskjuggler-2.3.0/configure.in taskjuggler-2.3.0.new/configure.in
---- taskjuggler-2.3.0/configure.in	2006-09-06 19:35:28.000000000 +0200
-+++ taskjuggler-2.3.0.new/configure.in	2006-09-06 20:22:16.000000000 +0200
+@@ -37985,7 +37985,7 @@
+ KDE_LIBS!$KDE_LIBS$ac_delim
+ LIBKCAL!$LIBKCAL$ac_delim
+ XSLTPROC!$XSLTPROC$ac_delim
+-DOCBOOK_TO_MAN!$DOCBOOK_TO_MAN$ac_delim
++DOCBOOK2X_MAN!$DOCBOOK2X_MAN$ac_delim
+ DB2HTML!$DB2HTML$ac_delim
+ HTMLMANUAL!$HTMLMANUAL$ac_delim
+ DB2PS!$DB2PS$ac_delim
+diff -Nur taskjuggler-2.3.1~beta1/configure.in taskjuggler-2.3.1~beta1.new/configure.in
+--- taskjuggler-2.3.1~beta1/configure.in	2007-01-15 10:30:11.000000000 +0100
++++ taskjuggler-2.3.1~beta1.new/configure.in	2007-01-16 19:27:57.000000000 +0100
 @@ -140,7 +140,7 @@
  if test "$tj_enable_docs" != "no" ; then
    dnl Check for the stuff needed to generate man pages
@@ -106,9 +107,9 @@
      AC_MSG_WARN([Man pages will not be generated])
      DO_NOT_COMPILE="${DO_NOT_COMPILE} man"
    fi  
-diff -Nur taskjuggler-2.3.0/configure.in.in taskjuggler-2.3.0.new/configure.in.in
---- taskjuggler-2.3.0/configure.in.in	2006-09-06 19:38:33.000000000 +0200
-+++ taskjuggler-2.3.0.new/configure.in.in	2006-09-06 20:22:16.000000000 +0200
+diff -Nur taskjuggler-2.3.1~beta1/configure.in.in taskjuggler-2.3.1~beta1.new/configure.in.in
+--- taskjuggler-2.3.1~beta1/configure.in.in	2007-01-15 10:30:09.000000000 +0100
++++ taskjuggler-2.3.1~beta1.new/configure.in.in	2007-01-16 19:28:11.000000000 +0100
 @@ -136,7 +136,7 @@
  if test "$tj_enable_docs" != "no" ; then
    dnl Check for the stuff needed to generate man pages
@@ -127,9 +128,9 @@
      AC_MSG_WARN([Man pages will not be generated])
      DO_NOT_COMPILE="${DO_NOT_COMPILE} man"
    fi  
-diff -Nur taskjuggler-2.3.0/man/en/Makefile.am taskjuggler-2.3.0.new/man/en/Makefile.am
---- taskjuggler-2.3.0/man/en/Makefile.am	2006-09-06 19:34:12.000000000 +0200
-+++ taskjuggler-2.3.0.new/man/en/Makefile.am	2006-09-06 20:22:59.000000000 +0200
+diff -Nur taskjuggler-2.3.1~beta1/man/en/Makefile.am taskjuggler-2.3.1~beta1.new/man/en/Makefile.am
+--- taskjuggler-2.3.1~beta1/man/en/Makefile.am	2007-01-15 10:30:09.000000000 +0100
++++ taskjuggler-2.3.1~beta1.new/man/en/Makefile.am	2007-01-16 19:28:48.000000000 +0100
 @@ -2,8 +2,8 @@
  EXTRA_DIST = $(man_MANS)
  
@@ -141,9 +142,9 @@
  	fi  
  
  clean-local:
-diff -Nur taskjuggler-2.3.0/man/en/Makefile.in taskjuggler-2.3.0.new/man/en/Makefile.in
---- taskjuggler-2.3.0/man/en/Makefile.in	2006-09-06 19:34:12.000000000 +0200
-+++ taskjuggler-2.3.0.new/man/en/Makefile.in	2006-09-06 20:22:59.000000000 +0200
+diff -Nur taskjuggler-2.3.1~beta1/man/en/Makefile.in taskjuggler-2.3.1~beta1.new/man/en/Makefile.in
+--- taskjuggler-2.3.1~beta1/man/en/Makefile.in	2007-01-15 10:30:29.000000000 +0100
++++ taskjuggler-2.3.1~beta1.new/man/en/Makefile.in	2007-01-16 19:29:02.000000000 +0100
 @@ -87,7 +87,7 @@
  DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
  DEFS = @DEFS@
@@ -153,7 +154,7 @@
  DVIPS = @DVIPS@
  ECHO = @ECHO@
  ECHO_C = @ECHO_C@
-@@ -539,8 +539,8 @@
+@@ -545,8 +545,8 @@
  
  
  .xml.1:
@@ -164,9 +165,9 @@
  	fi  
  
  clean-local:
-diff -Nur taskjuggler-2.3.0/man/Makefile.in taskjuggler-2.3.0.new/man/Makefile.in
---- taskjuggler-2.3.0/man/Makefile.in	2006-09-06 19:34:14.000000000 +0200
-+++ taskjuggler-2.3.0.new/man/Makefile.in	2006-09-06 20:22:55.000000000 +0200
+diff -Nur taskjuggler-2.3.1~beta1/man/Makefile.in taskjuggler-2.3.1~beta1.new/man/Makefile.in
+--- taskjuggler-2.3.1~beta1/man/Makefile.in	2007-01-15 10:30:29.000000000 +0100
++++ taskjuggler-2.3.1~beta1.new/man/Makefile.in	2007-01-16 19:29:19.000000000 +0100
 @@ -99,7 +99,7 @@
  DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
  DEFS = @DEFS@

Modified: kde-extras/taskjuggler/trunk/debian/rules
===================================================================
--- kde-extras/taskjuggler/trunk/debian/rules	2007-01-16 19:20:01 UTC (rev 5333)
+++ kde-extras/taskjuggler/trunk/debian/rules	2007-01-16 20:20:41 UTC (rev 5334)
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_BUILDDIR = .
 DEB_CONFIGURE_EXTRA_FLAGS := --with-docdir=/usr/share/doc/kde/HTML/en/taskjuggler/
@@ -11,7 +12,6 @@
 	install -D -p -m644 debian/taskjuggler.lintian-overrides \
 	  debian/taskjuggler/usr/share/lintian/overrides/taskjuggler
 
-
 get-orig-source:
 	 @@dh_testdir
 	 @@[ -d ../tarballs/. ]




More information about the pkg-kde-commits mailing list