Mailinglist Archive: opensuse-commit (1670 mails)

< Previous Next >
commit antlr
  • From: root@xxxxxxx (h_root)
  • Date: Mon, 9 Oct 2006 17:03:09 +0200 (CEST)
  • Message-id: <20061009150309.5392019A9FE@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package antlr
checked in at Mon Oct 9 17:03:09 CEST 2006.

--------
--- antlr/antlr-bootstrap.changes 2006-09-28 01:00:35.000000000 +0200
+++ /mounts/work_src_done/NOARCH/antlr/antlr-bootstrap.changes 2006-10-07 11:55:43.000000000 +0200
@@ -1,0 +2,14 @@
+Sat Oct 7 11:55:37 CEST 2006 - dbornkessel@xxxxxxx
+
+- added check that checks whether deleted files ShowString.java and StreamConverter.java are really not in place
+
+
+-------------------------------------------------------------------
+Thu Oct 5 11:21:47 CEST 2006 - dbornkessel@xxxxxxx
+
+- deleted
+ antlr-2.7.6/examples/java/unicode.IDENTs/ShowString.java
+ antlr-2.7.6/examples/java/unicode.IDENTs/StreamConverter.java
+ from tar ball due to licensing issues (Bug #207621)
+
+-------------------------------------------------------------------
--- antlr/antlr.changes 2006-09-25 17:35:46.000000000 +0200
+++ /mounts/work_src_done/NOARCH/antlr/antlr.changes 2006-10-07 11:55:32.000000000 +0200
@@ -1,0 +2,14 @@
+Sat Oct 7 11:54:36 CEST 2006 - dbornkessel@xxxxxxx
+
+- added check that checks whether deleted files ShowString.java and StreamConverter.java are really not in place
+
+-------------------------------------------------------------------
+Thu Oct 5 17:27:00 CEST 2006 - dbornkessel@xxxxxxx
+
+- deleted
+ antlr-2.7.6/examples/java/unicode.IDENTs/ShowString.java
+ antlr-2.7.6/examples/java/unicode.IDENTs/StreamConverter.java
+ from tar ball due to licensing issues (Bug #207621)
+
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ antlr-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.uQrOga/_old 2006-10-09 17:02:31.000000000 +0200
+++ /var/tmp/diff_new_pack.uQrOga/_new 2006-10-09 17:02:31.000000000 +0200
@@ -19,10 +19,10 @@
%define real_name antlr
Summary: Antlr for bootstrapping purposes
Version: 2.7.6
-Release: 6
+Release: 8
URL: http://www.antlr.org
Group: Development/Libraries/Java
-License: GPL
+License: Other License(s), see package, BSD
Autoreqprov: on
Source0: antlr-%{version}.tar.bz2
Source1: manifest.antlr
@@ -46,6 +46,7 @@
#>>>
# antlr
%setup -n %{real_name}-%{version}
+find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42
#<<<
#>>> %build

@@ -145,6 +146,13 @@
# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6:

%changelog -n antlr-bootstrap
+* Sat Oct 07 2006 - dbornkessel@xxxxxxx
+- added check that checks whether deleted files ShowString.java and StreamConverter.java are really not in place
+* Thu Oct 05 2006 - dbornkessel@xxxxxxx
+- deleted
+ antlr-2.7.6/examples/java/unicode.IDENTs/ShowString.java
+ antlr-2.7.6/examples/java/unicode.IDENTs/StreamConverter.java
+ from tar ball due to licensing issues (Bug #207621)
* Thu Sep 28 2006 - ro@xxxxxxx
- added gcc-gij to BuildRequires
* Wed Sep 20 2006 - dbornkessel@xxxxxxx

++++++ antlr.spec ++++++
--- /var/tmp/diff_new_pack.uQrOga/_old 2006-10-09 17:02:31.000000000 +0200
+++ /var/tmp/diff_new_pack.uQrOga/_new 2006-10-09 17:02:31.000000000 +0200
@@ -16,7 +16,7 @@
%define native 0
Summary: Another Tool for Language Recognition
Version: 2.7.6
-Release: 6
+Release: 8
License: GPL, X11/MIT
URL: http://www.antlr.org/
Group: Development/Tools/Other
@@ -79,6 +79,8 @@
# install.html
%patch150 -p1
%endif
+# check for license problematic files:
+find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42

%build
%if %{native}
@@ -160,6 +162,13 @@
%endif

%changelog -n antlr
+* Sat Oct 07 2006 - dbornkessel@xxxxxxx
+- added check that checks whether deleted files ShowString.java and StreamConverter.java are really not in place
+* Thu Oct 05 2006 - dbornkessel@xxxxxxx
+- deleted
+ antlr-2.7.6/examples/java/unicode.IDENTs/ShowString.java
+ antlr-2.7.6/examples/java/unicode.IDENTs/StreamConverter.java
+ from tar ball due to licensing issues (Bug #207621)
* Mon Sep 25 2006 - dbornkessel@xxxxxxx
- fixes necessary to compile with Java 1.5.0
- set source="1.4" and target="1.4" for ant "javac" tasks

++++++ antlr-2.7.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/antlr-2.7.6/examples/java/unicode.IDENTs/ShowString.java new/antlr-2.7.6/examples/java/unicode.IDENTs/ShowString.java
--- old/antlr-2.7.6/examples/java/unicode.IDENTs/ShowString.java 2005-12-07 19:00:34.000000000 +0100
+++ new/antlr-2.7.6/examples/java/unicode.IDENTs/ShowString.java 1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-
-/*
- * Copyright (c) 1995-1998 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * and its documentation for NON-COMMERCIAL purposes and without
- * fee is hereby granted provided that this copyright notice
- * appears in all copies. Please refer to the file "copyright.html"
- * for further important copyright and licensing information.
- *
- * SUN MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF
- * THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE, OR NON-INFRINGEMENT. SUN SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
- */
-
-import java.awt.*;
-
-class ShowString extends Frame {
-
- FontMetrics fontM;
- String outString;
-
- ShowString (String target, String title) {
-
- setTitle(title);
- outString = target;
-
- Font font = new Font("Monospaced", Font.PLAIN, 36);
- fontM = getFontMetrics(font);
- setFont(font);
-
- int size = 0;
- for (int i = 0; i < outString.length(); i++) {
- size += fontM.charWidth(outString.charAt(i));
- }
- size += 24;
-
- setSize(size, fontM.getHeight() + 60);
- setLocation(getSize().width/2, getSize().height/2);
- show();
- }
-
- public void paint(Graphics g) {
- Insets insets = getInsets();
- int x = insets.left;
- int y = insets.top;
- g.drawString(outString, x + 6, y + fontM.getAscent() + 14);
- }
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/antlr-2.7.6/examples/java/unicode.IDENTs/StreamConverter.java new/antlr-2.7.6/examples/java/unicode.IDENTs/StreamConverter.java
--- old/antlr-2.7.6/examples/java/unicode.IDENTs/StreamConverter.java 2005-12-07 19:00:34.000000000 +0100
+++ new/antlr-2.7.6/examples/java/unicode.IDENTs/StreamConverter.java 1970-01-01 01:00:00.000000000 +0100
@@ -1,67 +0,0 @@
-
-/*
- * Copyright (c) 1995-1998 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * and its documentation for NON-COMMERCIAL purposes and without
- * fee is hereby granted provided that this copyright notice
- * appears in all copies. Please refer to the file "copyright.html"
- * for further important copyright and licensing information.
- *
- * SUN MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF
- * THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE, OR NON-INFRINGEMENT. SUN SHALL NOT BE LIABLE FOR
- * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
- */
-
-import java.io.*;
-import java.util.*;
-
-public class StreamConverter {
-
- static void writeOutput(String str) {
-
- try {
- FileOutputStream fos = new FileOutputStream("test.txt");
- Writer out = new OutputStreamWriter(fos, "UTF8");
- out.write(str);
- out.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- static String readInput() {
-
- StringBuffer buffer = new StringBuffer();
- try {
- FileInputStream fis = new FileInputStream("test.txt");
- InputStreamReader isr = new InputStreamReader(fis, "UTF8");
- Reader in = new BufferedReader(isr);
- int ch;
- while ((ch = in.read()) > -1) {
- buffer.append((char)ch);
- }
- in.close();
- return buffer.toString();
- } catch (IOException e) {
- e.printStackTrace();
- return null;
- }
- }
-
- public static void main(String[] args) {
-
- String jaString =
- new String("\u65e5\u672c\u8a9e\u6587\u5b57\u5217");
-
- writeOutput(jaString);
- String inputString = readInput();
- String displayString = jaString + " " + inputString;
- new ShowString(displayString, "Conversion Demo");
- }
-
-}
-






++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread