Author: mkoch Date: 2008-02-13 08:57:51 +0000 (Wed, 13 Feb 2008) New Revision: 5683
Removed: trunk/gjdoc/debian/patches/00list trunk/gjdoc/debian/patches/02classpath_copyright.dpatch trunk/gjdoc/debian/patches/03dtd.dpatch trunk/gjdoc/debian/patches/06_no1.4classpath.dpatch trunk/gjdoc/debian/patches/07_default_out_dir.dpatch trunk/gjdoc/debian/patches/08_encoding.dpatch trunk/gjdoc/debian/patches/09_no_code_tag_in_param.dpatch Modified: trunk/gjdoc/debian/ trunk/gjdoc/debian/changelog trunk/gjdoc/debian/control trunk/gjdoc/debian/copyright Log: gjdoc (0.7.8-9) UNRELEASED; urgency=low * Fixed debian/copyright. * Removed debian/manpages/gjdoc.1. Not needed anymore. * Removed debian/patches/02classpath_copyright.dpatch. Obsolete. * Removed debian/patches/03dtd.dpatch. Obsolete. * Removed debian/patches/06_no1.4classpath.dpatch. Obsolete. * Removed debian/patches/07_default_out_dir.dpatch. Obsolete. * Removed debian/patches/08_encoding.dpatch. Obsolete. * Removed debian/patches/09_no_code_tag_in_param.dpatch. Obsolete. * Add Homepage field. -- Michael Koch <[EMAIL PROTECTED]> Wed, 13 Feb 2008 00:09:35 +0100 Property changes on: trunk/gjdoc/debian ___________________________________________________________________ Name: svn:ignore - files gjdoc links stamp-* *.debhelper *.substvars + files gjdoc links stamp-* *.debhelper *.pyc *.substvars Modified: trunk/gjdoc/debian/changelog =================================================================== --- trunk/gjdoc/debian/changelog 2008-02-13 08:56:25 UTC (rev 5682) +++ trunk/gjdoc/debian/changelog 2008-02-13 08:57:51 UTC (rev 5683) @@ -1,3 +1,17 @@ +gjdoc (0.7.8-9) UNRELEASED; urgency=low + + * Fixed debian/copyright. + * Removed debian/manpages/gjdoc.1. Not needed anymore. + * Removed debian/patches/02classpath_copyright.dpatch. Obsolete. + * Removed debian/patches/03dtd.dpatch. Obsolete. + * Removed debian/patches/06_no1.4classpath.dpatch. Obsolete. + * Removed debian/patches/07_default_out_dir.dpatch. Obsolete. + * Removed debian/patches/08_encoding.dpatch. Obsolete. + * Removed debian/patches/09_no_code_tag_in_param.dpatch. Obsolete. + * Add Homepage field. + + -- Michael Koch <[EMAIL PROTECTED]> Wed, 13 Feb 2008 00:09:35 +0100 + gjdoc (0.7.8-8) unstable; urgency=low * Build using gcj-4.3 on all architectures except alpha. Modified: trunk/gjdoc/debian/control =================================================================== --- trunk/gjdoc/debian/control 2008-02-13 08:56:25 UTC (rev 5682) +++ trunk/gjdoc/debian/control 2008-02-13 08:57:51 UTC (rev 5683) @@ -10,6 +10,7 @@ Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/gjdoc Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/gjdoc +Homepage: http://www.gnu.org/software/cp-tools/ Package: gjdoc Architecture: any @@ -25,6 +26,3 @@ . This package also includes dh_javadoc, a debhelper style script for handing javadoc generation in Debian packages. - . - This tool is part of the GNU classpath project. - http://www.gnu.org/software/cp-tools/ Modified: trunk/gjdoc/debian/copyright =================================================================== --- trunk/gjdoc/debian/copyright 2008-02-13 08:56:25 UTC (rev 5682) +++ trunk/gjdoc/debian/copyright 2008-02-13 08:57:51 UTC (rev 5683) @@ -3,10 +3,28 @@ It was downloaded from ftp://ftp.gnu.org/gnu/classpath. -Upstream Authors: (C) 2001-2005 Free Software Foundation +Upstream Authors: + Alex Lancaster ([EMAIL PROTECTED]) + Andrew John Hughes ([EMAIL PROTECTED]) + Andrew Overholt ([EMAIL PROTECTED]) + Arnaud Vandyck ([EMAIL PROTECTED]) + Casey Marshall ([EMAIL PROTECTED]) + Christopher Oezbek ([EMAIL PROTECTED]) + Dalibor Topic ([EMAIL PROTECTED]) + Jerry Haltom ([EMAIL PROTECTED]) + Julian Scheid ([EMAIL PROTECTED]) + Kalle Olavi Niemitalo ([EMAIL PROTECTED]) + Mark Howard ([EMAIL PROTECTED]) + Mark Wielaard ([EMAIL PROTECTED]) + Michael Koch ([EMAIL PROTECTED]) + Ross Burton ([EMAIL PROTECTED]) + Shayne Steele ([EMAIL PROTECTED]) + Ville Skytta ([EMAIL PROTECTED]) -Copyright: +Copyright: (C) 2001-2005 Free Software Foundation +License: + This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 dated June, 1991. Deleted: trunk/gjdoc/debian/patches/00list =================================================================== --- trunk/gjdoc/debian/patches/00list 2008-02-13 08:56:25 UTC (rev 5682) +++ trunk/gjdoc/debian/patches/00list 2008-02-13 08:57:51 UTC (rev 5683) @@ -1,8 +0,0 @@ -01xml_catalog -02classpath_copyright -03dtd -06_no1.4classpath -07_default_out_dir -08_encoding -09_no_code_tag_in_param -09_saxon Deleted: trunk/gjdoc/debian/patches/02classpath_copyright.dpatch =================================================================== --- trunk/gjdoc/debian/patches/02classpath_copyright.dpatch 2008-02-13 08:56:25 UTC (rev 5682) +++ trunk/gjdoc/debian/patches/02classpath_copyright.dpatch 2008-02-13 08:57:51 UTC (rev 5683) @@ -1,24 +0,0 @@ -#! /bin/sh -e -## DP: create classpath-copyright.xml file on advice of upstream. - -if [ $# -ne 1 ]; then echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"; exit 1; fi - -case "$1" in - -patch) - patch -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - rm classpath-copyright.xml - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 - ;; -esac - -exit 0 - ---- classpath-copyright.xml.c 2002-12-18 19:13:06.000000000 +0000 -+++ classpath-copyright.xml 2002-12-18 19:13:01.000000000 +0000 -@@ -0,0 +1 @@ -+<p>Copyright (c) 2002 Free Software Foundation</p> Deleted: trunk/gjdoc/debian/patches/03dtd.dpatch =================================================================== --- trunk/gjdoc/debian/patches/03dtd.dpatch 2008-02-13 08:56:25 UTC (rev 5682) +++ trunk/gjdoc/debian/patches/03dtd.dpatch 2008-02-13 08:57:51 UTC (rev 5683) @@ -1,19 +0,0 @@ -#! /bin/sh -e -## DP: create empty dtd file... upstream haven't written a proper one yet. - -if [ $# -ne 1 ]; then echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"; exit 1; fi - -case "$1" in - -patch) - touch gjdoc.dtd - ;; - -unpatch) - rm gjdoc.dtd - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 - ;; -esac - -exit 0 Deleted: trunk/gjdoc/debian/patches/06_no1.4classpath.dpatch =================================================================== --- trunk/gjdoc/debian/patches/06_no1.4classpath.dpatch 2008-02-13 08:56:25 UTC (rev 5682) +++ trunk/gjdoc/debian/patches/06_no1.4classpath.dpatch 2008-02-13 08:57:51 UTC (rev 5683) @@ -1,35 +0,0 @@ -#! /bin/sh -e -## DP: don't use 1.4 classpath - -if [ $# -ne 1 ]; then echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"; exit 1; fi - -case "$1" in - -patch) - patch -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 - ;; -esac - -exit 0 - ---- src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.javai.orig 2003-03-07 14:32:15.000000000 +0000 -+++ src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java 2003-06-28 14:27:21.000000000 +0100 -@@ -27,10 +27,10 @@ - } - - public DocTransletException(String msg, Throwable cause) { -- super(msg, cause); -+ super(msg + " - caused by - "+cause.toString()); - } - - public DocTransletException(Throwable cause) { -- super(cause); -+ super( "Caused by - "+cause.toString() ); - } - } Deleted: trunk/gjdoc/debian/patches/07_default_out_dir.dpatch =================================================================== --- trunk/gjdoc/debian/patches/07_default_out_dir.dpatch 2008-02-13 08:56:25 UTC (rev 5682) +++ trunk/gjdoc/debian/patches/07_default_out_dir.dpatch 2008-02-13 08:57:51 UTC (rev 5683) @@ -1,37 +0,0 @@ -#! /bin/sh -e -## DP: set a default output directory - -if [ $# -ne 1 ]; then echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"; exit 1; fi - -case "$1" in - -patch) - patch -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 - ;; -esac - -exit 0 - ---- src/gnu/classpath/tools/doclets/xmldoclet/Driver.java.orig 2003-06-28 19:00:47.000000000 +0100 -+++ src/gnu/classpath/tools/doclets/xmldoclet/Driver.java 2003-06-28 19:04:22.000000000 +0100 -@@ -866,6 +866,14 @@ - return false; - } - } -+ -+ // if not set, use current directory. -+ if (null == targetDirectory) { -+ targetDirectory = new File( System.getProperty("user.dir") ); -+ } -+ if (null != targetContext) { -+ targetContext.setTargetDirectory(new File( System.getProperty("user.dir") )); -+ } - } - - // It is illegal to specify targets AND -xmlonly. Deleted: trunk/gjdoc/debian/patches/08_encoding.dpatch =================================================================== --- trunk/gjdoc/debian/patches/08_encoding.dpatch 2008-02-13 08:56:25 UTC (rev 5682) +++ trunk/gjdoc/debian/patches/08_encoding.dpatch 2008-02-13 08:57:51 UTC (rev 5683) @@ -1,158 +0,0 @@ -#! /bin/sh -e -## DP: set encoding - -if [ $# -ne 1 ]; then echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"; exit 1; fi - -case "$1" in - -patch) - patch -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 - ;; -esac - -exit 0 - -diff -uNr src.orig/resources/doctranslets/html/allclasses.xsl src/resources/doctranslets/html/allclasses.xsl ---- src.orig/resources/doctranslets/html/allclasses.xsl 2003-03-18 21:53:45.000000000 +0900 -+++ src/resources/doctranslets/html/allclasses.xsl 2004-01-16 23:02:38.000000000 +0900 -@@ -33,7 +33,7 @@ - <xsl:include href="html_common.xsl"/> - - <xsl:output method="xml" -- encoding="UTF8" -+ encoding="utf-8" - indent="no"/> - - <xsl:strip-space elements="*"/> -diff -uNr src.orig/resources/doctranslets/html/allpackages.xsl src/resources/doctranslets/html/allpackages.xsl ---- src.orig/resources/doctranslets/html/allpackages.xsl 2003-03-18 21:53:45.000000000 +0900 -+++ src/resources/doctranslets/html/allpackages.xsl 2004-01-16 23:02:50.000000000 +0900 -@@ -33,7 +33,7 @@ - <xsl:include href="html_common.xsl"/> - - <xsl:output method="xml" -- encoding="UTF8" -+ encoding="utf-8" - indent="no"/> - - <xsl:strip-space elements="*"/> -diff -uNr src.orig/resources/doctranslets/html/classdoc.xsl src/resources/doctranslets/html/classdoc.xsl ---- src.orig/resources/doctranslets/html/classdoc.xsl 2003-03-18 21:53:45.000000000 +0900 -+++ src/resources/doctranslets/html/classdoc.xsl 2004-01-16 23:03:01.000000000 +0900 -@@ -33,7 +33,7 @@ - <xsl:include href="html_common.xsl"/> - - <xsl:output method="html" -- encoding="iso-8859-1" -+ encoding="utf-8" - indent="no"/> - - <xsl:strip-space elements="*"/> -diff -uNr src.orig/resources/doctranslets/html/descriptor.xsl src/resources/doctranslets/html/descriptor.xsl ---- src.orig/resources/doctranslets/html/descriptor.xsl 2003-03-18 21:53:45.000000000 +0900 -+++ src/resources/doctranslets/html/descriptor.xsl 2004-01-16 23:03:18.000000000 +0900 -@@ -34,7 +34,7 @@ - <xsl:include href="html_common.xsl"/> - - <xsl:output method="xml" -- encoding="UTF8" -+ encoding="utf-8" - indent="no"/> - - <xsl:strip-space elements="*"/> -diff -uNr src.orig/resources/doctranslets/html/doctranslet.xsl src/resources/doctranslets/html/doctranslet.xsl ---- src.orig/resources/doctranslets/html/doctranslet.xsl 2003-03-18 21:53:45.000000000 +0900 -+++ src/resources/doctranslets/html/doctranslet.xsl 2004-01-16 23:03:32.000000000 +0900 -@@ -31,7 +31,7 @@ - xmlns="http://www.gnu.org/software/cp-tools/gjdocxslfiles";> - - <xsl:output method="xml" -- encoding="utf8" -+ encoding="utf-8" - indent="no"/> - - <xsl:strip-space elements="*"/> -diff -uNr src.orig/resources/doctranslets/html/fulltree.xsl src/resources/doctranslets/html/fulltree.xsl ---- src.orig/resources/doctranslets/html/fulltree.xsl 2003-03-18 21:53:45.000000000 +0900 -+++ src/resources/doctranslets/html/fulltree.xsl 2004-01-16 23:03:52.000000000 +0900 -@@ -33,7 +33,7 @@ - <xsl:include href="html_common.xsl"/> - - <xsl:output method="xml" -- encoding="UTF8" -+ encoding="utf-8" - indent="no"/> - - <xsl:strip-space elements="*"/> -diff -uNr src.orig/resources/doctranslets/html/gjdoc.xsl src/resources/doctranslets/html/gjdoc.xsl ---- src.orig/resources/doctranslets/html/gjdoc.xsl 2003-03-18 21:53:45.000000000 +0900 -+++ src/resources/doctranslets/html/gjdoc.xsl 2004-01-16 23:04:10.000000000 +0900 -@@ -31,7 +31,7 @@ - xmlns="http://www.gnu.org/software/cp-tools/gjdocxslfiles";> - - <xsl:output method="xml" -- encoding="UTF8" -+ encoding="utf-8" - indent="no"/> - - <xsl:strip-space elements="*"/> -diff -uNr src.orig/resources/doctranslets/html/index.xsl src/resources/doctranslets/html/index.xsl ---- src.orig/resources/doctranslets/html/index.xsl 2003-03-18 21:53:45.000000000 +0900 -+++ src/resources/doctranslets/html/index.xsl 2004-01-16 23:04:54.000000000 +0900 -@@ -34,7 +34,7 @@ - <xsl:include href="html_common.xsl"/> - - <xsl:output method="html" -- encoding="ISO-8859-1" -+ encoding="utf-8" - doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" - doctype-system="http://www.w3.org/TR/html4/loose.dtd"; - indent="no"/> -diff -uNr src.orig/resources/doctranslets/html/index_noframes.xsl src/resources/doctranslets/html/index_noframes.xsl ---- src.orig/resources/doctranslets/html/index_noframes.xsl 2003-03-18 21:53:45.000000000 +0900 -+++ src/resources/doctranslets/html/index_noframes.xsl 2004-01-16 23:04:23.000000000 +0900 -@@ -34,7 +34,7 @@ - <xsl:include href="html_common.xsl"/> - - <xsl:output method="xml" -- encoding="iso-8859-1" -+ encoding="utf-8" - indent="no"/> - - <xsl:strip-space elements="*"/> -diff -uNr src.orig/resources/doctranslets/html/packageclasses.xsl src/resources/doctranslets/html/packageclasses.xsl ---- src.orig/resources/doctranslets/html/packageclasses.xsl 2003-03-18 21:53:45.000000000 +0900 -+++ src/resources/doctranslets/html/packageclasses.xsl 2004-01-16 23:05:34.000000000 +0900 -@@ -33,7 +33,7 @@ - <xsl:include href="html_common.xsl"/> - - <xsl:output method="xml" -- encoding="UTF8" -+ encoding="utf-8" - indent="no"/> - - <xsl:strip-space elements="*"/> -diff -uNr src.orig/resources/doctranslets/html/packagedoc.xsl src/resources/doctranslets/html/packagedoc.xsl ---- src.orig/resources/doctranslets/html/packagedoc.xsl 2003-03-18 21:53:45.000000000 +0900 -+++ src/resources/doctranslets/html/packagedoc.xsl 2004-01-16 23:05:22.000000000 +0900 -@@ -1,4 +1,4 @@ --<?xml version="1.0" encoding="iso-8859-1"?> -+<?xml version="1.0" encoding="utf-8"?> - - <!-- packagedoc.xsl - Copyright (C) 2003 Free Software Foundation, Inc. -@@ -33,7 +33,7 @@ - <xsl:include href="html_common.xsl"/> - - <xsl:output method="xml" -- encoding="UTF8" -+ encoding="utf-8" - indent="no"/> - - <xsl:strip-space elements="*"/> Deleted: trunk/gjdoc/debian/patches/09_no_code_tag_in_param.dpatch =================================================================== --- trunk/gjdoc/debian/patches/09_no_code_tag_in_param.dpatch 2008-02-13 08:56:25 UTC (rev 5682) +++ trunk/gjdoc/debian/patches/09_no_code_tag_in_param.dpatch 2008-02-13 08:57:51 UTC (rev 5683) @@ -1,156 +0,0 @@ -#! /bin/sh -e -## 09_no_code_tag_in_param.dpatch by Arnaud Vandyck <[EMAIL PROTECTED]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -if [ $# -lt 1 ]; then - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch -p1 ${patch_opts} < $0;; - -unpatch) patch -R -p1 ${patch_opts} < $0;; - *) - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1;; -esac - -exit 0 - [EMAIL PROTECTED]@ -diff -urNad /home/arnaud/debian/bugs/gjdoc/gjdoc-0.6.1/src/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java gjdoc-0.6.1/src/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java ---- /home/arnaud/debian/bugs/gjdoc/gjdoc-0.6.1/src/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java 2004-05-05 16:48:16.924171336 +0200 -+++ gjdoc-0.6.1/src/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java 2004-05-05 16:49:18.531805552 +0200 -@@ -52,6 +52,7 @@ - } - } - -+ private boolean testDebug = false; - private DocErrorReporter warningReporter; - private boolean noWarn; - private boolean noEmailWarn; -@@ -108,6 +109,11 @@ - - private void haveStartOrEndTag(String tag) { - -+ if (testDebug) -+ { -+ System.out.println( "haveStartOrEndTag: " + tag); -+ } -+ - tag = tag.trim(); - - boolean isEndTag = tag.startsWith("/"); -@@ -388,6 +394,7 @@ - StringBuffer buf = new StringBuffer(); - char[] textAsChars = text.toCharArray(); - -+ boolean DEBUG = text.startsWith("bar <code>"); - for (int i=0, ilim=textAsChars.length+1; i<ilim; ++i) { - int c; - -@@ -397,10 +404,14 @@ - else { - c = -1; - } -- - switch (state) { - - case STATE_INITIAL: -+ if (DEBUG) -+ { -+ System.out.println ("STATE_INITIAL: " + (char)c); -+ testDebug = true; -+ } - if ('<'==c) { - state = STATE_TAG_START; - if (buf.length()>0) { -@@ -428,6 +439,10 @@ - break; - - case STATE_AMP: -+ if (DEBUG) -+ { -+ System.out.println ("STATE_AMP: " + (char)c); -+ } - if ('<'==c) { - buf.append("&"); - state = STATE_TAG_START; -@@ -467,6 +482,10 @@ - break; - - case STATE_TAG_START: -+ if (DEBUG) -+ { -+ System.out.println ("STATE_TAG_START: " + (char)c); -+ } - if (" \t\r\n".indexOf(c)>=0) { - //continue; - -@@ -501,6 +520,10 @@ - break; - - case STATE_TAG: -+ if (DEBUG) -+ { -+ System.out.println ("STATE_TAG: " + (char)c); -+ } - if ('\"'==c) { - buf.append((char)c); - state = STATE_TAG_DOUBLEQUOTE; -@@ -510,12 +533,28 @@ - state = STATE_TAG_SINGLEQUOTE; - } - else if ('>'==c) { -+ if (DEBUG) -+ { -+ System.out.println ("Fin du tag!"); -+ } - state = STATE_INITIAL; -+ if (DEBUG) -+ { -+ System.out.println ("-----------------------"); -+ } - haveStartOrEndTag(buf.toString()); -+ if (DEBUG) -+ { -+ System.out.println ("-----------------------"); -+ } - buf.setLength(0); - } - else if ('<'==c) { - // notify user, missing greater-than sign -+ if (DEBUG) -+ { -+ System.out.println("< is missing?"); -+ } - haveStartOrEndTag(buf.toString()); - buf.setLength(0); - } -@@ -530,6 +569,10 @@ - break; - - case STATE_TAG_DOUBLEQUOTE: -+ if (DEBUG) -+ { -+ System.out.println ("STATE_TAG_DOUBLEQUOTE: " + (char)c); -+ } - if ('\"'==c) { - buf.append((char)c); - state = STATE_TAG; -@@ -544,6 +587,10 @@ - break; - - case STATE_TAG_SINGLEQUOTE: -+ if (DEBUG) -+ { -+ System.out.println ("STATE_TAG_SINGLEQUOTE: " + (char)c); -+ } - if ('\''==c) { - buf.append((char)c); - state = STATE_TAG; _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
