[pkg-java] r6137 - in trunk/statcvs: . debian debian/manpages debian/wrappers

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2008-04-10 21:31:48 +0000 (Thu, 10 Apr 2008)
New Revision: 6137

Removed:
   trunk/statcvs/cvslognewformat.patch
Modified:
   trunk/statcvs/debian/changelog
   trunk/statcvs/debian/control
   trunk/statcvs/debian/manpages/statcvs.1
   trunk/statcvs/debian/wrappers/statcvs
Log:
[statcvs] Ready for main !

Deleted: trunk/statcvs/cvslognewformat.patch
===================================================================
--- trunk/statcvs/cvslognewformat.patch	2008-04-10 06:07:15 UTC (rev 6136)
+++ trunk/statcvs/cvslognewformat.patch	2008-04-10 21:31:48 UTC (rev 6137)
@@ -1,33 +0,0 @@
---- statcvs-20030713/src/net/sf/statcvs/util/DateUtils.java      2003-04-13 17:04:49.000000000 -0600
-+++ statcvs-20030713/src/net/sf/statcvs/util/DateUtils.java      2004-08-16 13:16:33.000000000 -0600
-@@ -38,10 +38,14 @@
- public class DateUtils {
-	private static final String LOG_TIMESTAMP_FORMAT =
-		"yyyy/MM/dd HH:mm:ss zzz";
-+	private static final String LOG_TIMESTAMP_FORMAT_NEW =
-+		"yyyy-MM-dd HH:mm:ss Z zzz";
-	private static final Locale LOG_TIMESTAMP_LOCALE = Locale.US;
-
-	private static SimpleDateFormat logTimeFormat =
-		new SimpleDateFormat(LOG_TIMESTAMP_FORMAT, LOG_TIMESTAMP_LOCALE);
-+	private static SimpleDateFormat logTimeFormatNew =
-+		new SimpleDateFormat(LOG_TIMESTAMP_FORMAT_NEW, LOG_TIMESTAMP_LOCALE);
-	private static SimpleDateFormat outputDateFormat =
-		new SimpleDateFormat(Messages.getString("DATE_FORMAT"));
-	private static SimpleDateFormat outputDateTimeFormat =
-@@ -81,10 +85,13 @@
-	*/
-	public static Date convertFromLogTime(String modTime) {
-		try {
-+			if (modTime.indexOf('-') > 0)
-+				return logTimeFormatNew.parse(modTime);
-+
-			return logTimeFormat.parse(modTime);
-		} catch (ParseException e) {
-			// fallback is to return null
-			return null;
-		}
-	}
--}
-\ No newline at end of file
-+}

Modified: trunk/statcvs/debian/changelog
===================================================================
--- trunk/statcvs/debian/changelog	2008-04-10 06:07:15 UTC (rev 6136)
+++ trunk/statcvs/debian/changelog	2008-04-10 21:31:48 UTC (rev 6137)
@@ -1,9 +1,12 @@
-statcvs (1:0.3.dfsg-3) UNRELEASED; urgency=low
+statcvs (1:0.3.dfsg-3) unstable; urgency=low
 
-  * NOT RELEASED YET
   * Fix manual page: statcvs does not have info documentation !
+  * Fix another glitch in manual page
+  * statcvs can now move to main (Closes: #463520)
+  * Remove last remaining file not in the debian/ subdir, 
+    so lintian is happy
 
- -- Vincent Fourmond <fourmond at debian.org>  Tue, 04 Mar 2008 23:44:31 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 10 Apr 2008 23:25:02 +0200
 
 statcvs (1:0.3.dfsg-2) unstable; urgency=low
 

Modified: trunk/statcvs/debian/control
===================================================================
--- trunk/statcvs/debian/control	2008-04-10 06:07:15 UTC (rev 6136)
+++ trunk/statcvs/debian/control	2008-04-10 21:31:48 UTC (rev 6137)
@@ -1,5 +1,5 @@
 Source: statcvs
-Section: contrib/devel
+Section: devel
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Vincent Fourmond <fourmond at debian.org>, Christian Bayle <bayle at debian.org>
@@ -14,7 +14,7 @@
 
 Package: statcvs
 Architecture: all
-Depends: sun-java5-jre | sun-java6-jre | j2re1.6 | j2re1.5, libjcommon-java,
+Depends: java-gcj-compat | java-runtime, libjcommon-java,
  libjfreechart-java, java-wrappers (>= 0.1.3)
 Recommends: cvs
 Description: CVS Repository statistic analysis tool, written in Java

Modified: trunk/statcvs/debian/manpages/statcvs.1
===================================================================
--- trunk/statcvs/debian/manpages/statcvs.1	2008-04-10 06:07:15 UTC (rev 6136)
+++ trunk/statcvs/debian/manpages/statcvs.1	2008-04-10 21:31:48 UTC (rev 6137)
@@ -78,9 +78,6 @@
 .B \-viewcvs <url>
 integrate with ViewCVS installation at <url>
 .TP
-.B \-output\-dir <dir>
-directory where HTML suite will be saved
-.TP
 .B \-verbose
 print extra progress information
 

Modified: trunk/statcvs/debian/wrappers/statcvs
===================================================================
--- trunk/statcvs/debian/wrappers/statcvs	2008-04-10 06:07:15 UTC (rev 6136)
+++ trunk/statcvs/debian/wrappers/statcvs	2008-04-10 21:31:48 UTC (rev 6137)
@@ -3,8 +3,8 @@
 # Include the wrappers utility script
 . /usr/lib/java-wrappers/java-wrappers.sh
 
-# We unfortunately need sun's runtime
-find_java_runtime sun || echo "[WARNING] statcvs currently still needs Sun's java, it probably won't work properly if at all" >&2 
+# We first look for sun's runtime, and then for all the rest
+find_java_runtime sun || find_java_runtime 
 find_jars jfreechart jcommon statcvs
 
 run_java net.sf.statcvs.Main "$@"