rev 6341 - in kde-extras/taskjuggler/trunk/debian: . patches

Fathi Boudra fboudra-guest at alioth.debian.org
Thu May 24 23:31:22 UTC 2007 

Author: fboudra-guest
Date: 2007-05-24 23:31:22 +0000 (Thu, 24 May 2007)
New Revision: 6341

Removed:
   kde-extras/taskjuggler/trunk/debian/patches/01_taskjuggler_branch_r1380.diff
   kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff
   kde-extras/taskjuggler/trunk/debian/patches/13_glibc2.5_tzset.diff
Modified:
   kde-extras/taskjuggler/trunk/debian/changelog
   kde-extras/taskjuggler/trunk/debian/copyright
   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/patches/12_update_manpages.diff
Log:
* Update taskjuggler to 2.4.0~beta1
We must wait before uploading: docbook-utils/jadetex are broken.


Modified: kde-extras/taskjuggler/trunk/debian/changelog
===================================================================
--- kde-extras/taskjuggler/trunk/debian/changelog	2007-05-24 23:25:48 UTC (rev 6340)
+++ kde-extras/taskjuggler/trunk/debian/changelog	2007-05-24 23:31:22 UTC (rev 6341)
@@ -1,3 +1,12 @@
+taskjuggler (2.4.0~beta1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update Chris Schlaeger e-mail in copyright.
+  * Remove branch pull to r1380 and glibc2.5 tzset workaround patches.
+    Merged upstream.
+
+ -- Fathi Boudra <fboudra at free.fr>  Thu, 24 May 2007 17:43:31 +0200
+
 taskjuggler (2.3.1-4) unstable; urgency=low
 
   * Add workaround for new behaviour of tzset function in glibc 2.5.

Modified: kde-extras/taskjuggler/trunk/debian/copyright
===================================================================
--- kde-extras/taskjuggler/trunk/debian/copyright	2007-05-24 23:25:48 UTC (rev 6340)
+++ kde-extras/taskjuggler/trunk/debian/copyright	2007-05-24 23:31:22 UTC (rev 6341)
@@ -3,8 +3,8 @@
 
 It was downloaded from http://www.taskjuggler.org/download.php
 
-Copyright Holder: 
-   Chris Schlaeger <cs at suse.de>
+Copyright Holder:
+   Chris Schlaeger <cs at kde.org>
    Klass Freitag <freitag at suse.de>
    Remo Behn <ray at suse.de>
    Philippe Midol-Monnet <philippe at midol-monnet.org>

Deleted: kde-extras/taskjuggler/trunk/debian/patches/01_taskjuggler_branch_r1380.diff

Deleted: kde-extras/taskjuggler/trunk/debian/patches/02_autotools_update.diff

Modified: kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff	2007-05-24 23:25:48 UTC (rev 6340)
+++ kde-extras/taskjuggler/trunk/debian/patches/03_libtool_update.diff	2007-05-24 23:31:22 UTC (rev 6341)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- 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
+--- a/admin/libtool.m4.in	2007-05-23 13:28:54.000000000 +0200
++++ b/admin/libtool.m4.in	2007-05-24 17:52:45.000000000 +0200
 @@ -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	2007-01-15 10:30:07.000000000 +0100
-+++ b/admin/ltmain.sh	2007-01-16 18:46:15.000000000 +0100
+--- a/admin/ltmain.sh	2007-05-23 13:28:54.000000000 +0200
++++ b/admin/ltmain.sh	2007-05-24 17:52:45.000000000 +0200
 @@ -1,7 +1,7 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.

Modified: kde-extras/taskjuggler/trunk/debian/patches/11_fix_manpages_build.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/11_fix_manpages_build.diff	2007-05-24 23:25:48 UTC (rev 6340)
+++ kde-extras/taskjuggler/trunk/debian/patches/11_fix_manpages_build.diff	2007-05-24 23:31:22 UTC (rev 6341)
@@ -1,6 +1,6 @@
-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
+diff -Nur taskjuggler-2.4.0~beta1/configure taskjuggler-2.4.0~beta1.new/configure
+--- taskjuggler-2.4.0~beta1/configure	2007-05-23 13:29:07.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/configure	2007-05-25 00:59:03.000000000 +0200
 @@ -996,7 +996,7 @@
  KDE_LIBS
  LIBKCAL
@@ -10,7 +10,7 @@
  DB2HTML
  HTMLMANUAL
  DB2PS
-@@ -34928,15 +34928,15 @@
+@@ -35327,15 +35327,15 @@
  fi
  
  
@@ -31,7 +31,7 @@
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -34945,7 +34945,7 @@
+@@ -35344,7 +35344,7 @@
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -40,7 +40,7 @@
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -34953,13 +34953,13 @@
+@@ -35352,13 +35352,13 @@
  done
  IFS=$as_save_IFS
  
@@ -59,7 +59,7 @@
  else
    { echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6; }
-@@ -36259,7 +36259,7 @@
+@@ -36658,7 +36658,7 @@
  KDE_LIBS!$KDE_LIBS$ac_delim
  LIBKCAL!$LIBKCAL$ac_delim
  XSLTPROC!$XSLTPROC$ac_delim
@@ -68,7 +68,7 @@
  DB2HTML!$DB2HTML$ac_delim
  HTMLMANUAL!$HTMLMANUAL$ac_delim
  DB2PS!$DB2PS$ac_delim
-@@ -36870,7 +36870,7 @@
+@@ -37269,7 +37269,7 @@
  
    fi
  
@@ -77,7 +77,7 @@
      { 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"
-@@ -37985,7 +37985,7 @@
+@@ -38384,7 +38384,7 @@
  KDE_LIBS!$KDE_LIBS$ac_delim
  LIBKCAL!$LIBKCAL$ac_delim
  XSLTPROC!$XSLTPROC$ac_delim
@@ -86,10 +86,10 @@
  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 @@
+diff -Nur taskjuggler-2.4.0~beta1/configure.in taskjuggler-2.4.0~beta1.new/configure.in
+--- taskjuggler-2.4.0~beta1/configure.in	2007-05-23 13:28:59.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/configure.in	2007-05-25 00:59:03.000000000 +0200
+@@ -149,7 +149,7 @@
  if test "$tj_enable_docs" != "no" ; then
    dnl Check for the stuff needed to generate man pages
    AC_CHECK_PROG(XSLTPROC, xsltproc, xsltproc, no)
@@ -98,7 +98,7 @@
  
    dnl Check for the stuff needed to create the HTML manual
    if test "$XSLTPROC" = no ; then
-@@ -180,7 +180,7 @@
+@@ -189,7 +189,7 @@
      AC_OUTPUT(docs/en/taskjuggler.xml)
    fi
  
@@ -107,10 +107,10 @@
      AC_MSG_WARN([Man pages will not be generated])
      DO_NOT_COMPILE="${DO_NOT_COMPILE} man"
    fi  
-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 @@
+diff -Nur taskjuggler-2.4.0~beta1/configure.in.in taskjuggler-2.4.0~beta1.new/configure.in.in
+--- taskjuggler-2.4.0~beta1/configure.in.in	2007-05-23 13:28:56.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/configure.in.in	2007-05-25 00:59:03.000000000 +0200
+@@ -145,7 +145,7 @@
  if test "$tj_enable_docs" != "no" ; then
    dnl Check for the stuff needed to generate man pages
    AC_CHECK_PROG(XSLTPROC, xsltproc, xsltproc, no)
@@ -119,7 +119,7 @@
  
    dnl Check for the stuff needed to create the HTML manual
    if test "$XSLTPROC" = no ; then
-@@ -176,7 +176,7 @@
+@@ -185,7 +185,7 @@
      AC_OUTPUT(docs/en/taskjuggler.xml)
    fi
  
@@ -128,9 +128,177 @@
      AC_MSG_WARN([Man pages will not be generated])
      DO_NOT_COMPILE="${DO_NOT_COMPILE} man"
    fi  
-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
+diff -Nur taskjuggler-2.4.0~beta1/Contrib/kate/Makefile.in taskjuggler-2.4.0~beta1.new/Contrib/kate/Makefile.in
+--- taskjuggler-2.4.0~beta1/Contrib/kate/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/Contrib/kate/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -93,7 +93,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/Contrib/Makefile.in taskjuggler-2.4.0~beta1.new/Contrib/Makefile.in
+--- taskjuggler-2.4.0~beta1/Contrib/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/Contrib/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -99,7 +99,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/docs/en/Makefile.in taskjuggler-2.4.0~beta1.new/docs/en/Makefile.in
+--- taskjuggler-2.4.0~beta1/docs/en/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/docs/en/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -84,7 +84,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/docs/Makefile.in taskjuggler-2.4.0~beta1.new/docs/Makefile.in
+--- taskjuggler-2.4.0~beta1/docs/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/docs/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -99,7 +99,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/Examples/BigProject/Common/Makefile.in taskjuggler-2.4.0~beta1.new/Examples/BigProject/Common/Makefile.in
+--- taskjuggler-2.4.0~beta1/Examples/BigProject/Common/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/Examples/BigProject/Common/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -83,7 +83,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/Examples/BigProject/Makefile.in taskjuggler-2.4.0~beta1.new/Examples/BigProject/Makefile.in
+--- taskjuggler-2.4.0~beta1/Examples/BigProject/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/Examples/BigProject/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -99,7 +99,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/Examples/BigProject/Project1/Makefile.in taskjuggler-2.4.0~beta1.new/Examples/BigProject/Project1/Makefile.in
+--- taskjuggler-2.4.0~beta1/Examples/BigProject/Project1/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/Examples/BigProject/Project1/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -83,7 +83,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/Examples/BigProject/Project2/Makefile.in taskjuggler-2.4.0~beta1.new/Examples/BigProject/Project2/Makefile.in
+--- taskjuggler-2.4.0~beta1/Examples/BigProject/Project2/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/Examples/BigProject/Project2/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -83,7 +83,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/Examples/FirstProject/Makefile.in taskjuggler-2.4.0~beta1.new/Examples/FirstProject/Makefile.in
+--- taskjuggler-2.4.0~beta1/Examples/FirstProject/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/Examples/FirstProject/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -83,7 +83,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/Examples/Makefile.in taskjuggler-2.4.0~beta1.new/Examples/Makefile.in
+--- taskjuggler-2.4.0~beta1/Examples/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/Examples/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -99,7 +99,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/Examples/ShiftSchedule/Makefile.in taskjuggler-2.4.0~beta1.new/Examples/ShiftSchedule/Makefile.in
+--- taskjuggler-2.4.0~beta1/Examples/ShiftSchedule/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/Examples/ShiftSchedule/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -83,7 +83,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/i18n/Makefile.in taskjuggler-2.4.0~beta1.new/i18n/Makefile.in
+--- taskjuggler-2.4.0~beta1/i18n/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/i18n/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -99,7 +99,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/i18n/TaskJugglerUI/Makefile.in taskjuggler-2.4.0~beta1.new/i18n/TaskJugglerUI/Makefile.in
+--- taskjuggler-2.4.0~beta1/i18n/TaskJugglerUI/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/i18n/TaskJugglerUI/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -85,7 +85,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/Makefile.in taskjuggler-2.4.0~beta1.new/Makefile.in
+--- taskjuggler-2.4.0~beta1/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -127,7 +127,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/man/en/Makefile.am taskjuggler-2.4.0~beta1.new/man/en/Makefile.am
+--- taskjuggler-2.4.0~beta1/man/en/Makefile.am	2007-05-23 13:28:56.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/man/en/Makefile.am	2007-05-25 00:59:13.000000000 +0200
 @@ -2,8 +2,8 @@
  EXTRA_DIST = $(man_MANS)
  
@@ -142,9 +310,9 @@
  	fi  
  
  clean-local:
-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
+diff -Nur taskjuggler-2.4.0~beta1/man/en/Makefile.in taskjuggler-2.4.0~beta1.new/man/en/Makefile.in
+--- taskjuggler-2.4.0~beta1/man/en/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/man/en/Makefile.in	2007-05-25 00:59:13.000000000 +0200
 @@ -87,7 +87,7 @@
  DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
  DEFS = @DEFS@
@@ -165,9 +333,9 @@
  	fi  
  
  clean-local:
-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
+diff -Nur taskjuggler-2.4.0~beta1/man/Makefile.in taskjuggler-2.4.0~beta1.new/man/Makefile.in
+--- taskjuggler-2.4.0~beta1/man/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/man/Makefile.in	2007-05-25 00:59:13.000000000 +0200
 @@ -99,7 +99,7 @@
  DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
  DEFS = @DEFS@
@@ -177,3 +345,75 @@
  DVIPS = @DVIPS@
  ECHO = @ECHO@
  ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/taskjuggler/Makefile.in taskjuggler-2.4.0~beta1.new/taskjuggler/Makefile.in
+--- taskjuggler-2.4.0~beta1/taskjuggler/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/taskjuggler/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -190,7 +190,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/TaskJugglerUI/Makefile.in taskjuggler-2.4.0~beta1.new/TaskJugglerUI/Makefile.in
+--- taskjuggler-2.4.0~beta1/TaskJugglerUI/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/TaskJugglerUI/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -178,7 +178,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/TaskJugglerUI/pics/Makefile.in taskjuggler-2.4.0~beta1.new/TaskJugglerUI/pics/Makefile.in
+--- taskjuggler-2.4.0~beta1/TaskJugglerUI/pics/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/TaskJugglerUI/pics/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -83,7 +83,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/TaskJugglerUI/Templates/en_US/Makefile.in taskjuggler-2.4.0~beta1.new/TaskJugglerUI/Templates/en_US/Makefile.in
+--- taskjuggler-2.4.0~beta1/TaskJugglerUI/Templates/en_US/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/TaskJugglerUI/Templates/en_US/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -93,7 +93,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/TaskJugglerUI/Templates/Makefile.in taskjuggler-2.4.0~beta1.new/TaskJugglerUI/Templates/Makefile.in
+--- taskjuggler-2.4.0~beta1/TaskJugglerUI/Templates/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/TaskJugglerUI/Templates/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -99,7 +99,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+diff -Nur taskjuggler-2.4.0~beta1/TestSuite/Makefile.in taskjuggler-2.4.0~beta1.new/TestSuite/Makefile.in
+--- taskjuggler-2.4.0~beta1/TestSuite/Makefile.in	2007-05-23 13:29:15.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/TestSuite/Makefile.in	2007-05-25 00:59:13.000000000 +0200
+@@ -83,7 +83,7 @@
+ DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
++DOCBOOK2X_MAN = @DOCBOOK2X_MAN@
+ DVIPS = @DVIPS@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@

Modified: kde-extras/taskjuggler/trunk/debian/patches/12_update_manpages.diff
===================================================================
--- kde-extras/taskjuggler/trunk/debian/patches/12_update_manpages.diff	2007-05-24 23:25:48 UTC (rev 6340)
+++ kde-extras/taskjuggler/trunk/debian/patches/12_update_manpages.diff	2007-05-24 23:31:22 UTC (rev 6341)
@@ -1,19 +1,19 @@
-diff -Nur taskjuggler-2.3.0/man/en/TaskJugglerUI.xml taskjuggler-2.3.0.new/man/en/TaskJugglerUI.xml
---- taskjuggler-2.3.0/man/en/TaskJugglerUI.xml	2006-09-05 18:27:49.000000000 +0200
-+++ taskjuggler-2.3.0.new/man/en/TaskJugglerUI.xml	2006-10-16 14:52:01.000000000 +0200
+diff -Nur taskjuggler-2.4.0~beta1/man/en/TaskJugglerUI.xml taskjuggler-2.4.0~beta1.new/man/en/TaskJugglerUI.xml
+--- taskjuggler-2.4.0~beta1/man/en/TaskJugglerUI.xml	2007-05-23 13:28:56.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/man/en/TaskJugglerUI.xml	2007-05-24 17:56:32.000000000 +0200
 @@ -202,7 +202,7 @@
      </title>
      <para>
        <filename>
 -         /usr/share/doc/taskjuggler/index.html
-+         /usr/share/doc/kde/HTML/en/taskjuggler/index.html 
++         /usr/share/doc/kde/HTML/en/taskjuggler/index.html
        </filename>
         , taskjuggler(1)
      </para>
-diff -Nur taskjuggler-2.3.0/man/en/taskjuggler.xml taskjuggler-2.3.0.new/man/en/taskjuggler.xml
---- taskjuggler-2.3.0/man/en/taskjuggler.xml	2006-09-05 18:27:49.000000000 +0200
-+++ taskjuggler-2.3.0.new/man/en/taskjuggler.xml	2006-10-16 14:52:26.000000000 +0200
-@@ -238,7 +238,7 @@
+diff -Nur taskjuggler-2.4.0~beta1/man/en/taskjuggler.xml taskjuggler-2.4.0~beta1.new/man/en/taskjuggler.xml
+--- taskjuggler-2.4.0~beta1/man/en/taskjuggler.xml	2007-05-23 13:28:56.000000000 +0200
++++ taskjuggler-2.4.0~beta1.new/man/en/taskjuggler.xml	2007-05-24 17:57:32.000000000 +0200
+@@ -226,7 +226,7 @@
      </title>
      <para>
        <filename>

Deleted: kde-extras/taskjuggler/trunk/debian/patches/13_glibc2.5_tzset.diff

More information about the pkg-kde-commits mailing list