Dear maintainer, I've uploaded an NMU for jakarta-ecs (versioned as 1.4.2-1.1). The diff is attached to this message.
Cheers, gregor, from the Munich BSP -- .''`. http://info.comodo.priv.at/ -- GPG Key IDs: 0x00F3CFE4, 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT, SPI Inc., fellow of FSFE | http://got.to/quote/ `- BOFH excuse #34: (l)user error
diff -u jakarta-ecs-1.4.2/debian/control jakarta-ecs-1.4.2/debian/control
--- jakarta-ecs-1.4.2/debian/control
+++ jakarta-ecs-1.4.2/debian/control
@@ -1,5 +1,5 @@
Source: jakarta-ecs
-Section: libs
+Section: java
Priority: optional
Maintainer: Kalle Kivimaa <kil...@debian.org>
Build-Depends: debhelper (>= 5), cdbs, default-jdk-builddep, ant
@@ -8,7 +8,6 @@
Package: libjakarta-ecs-java
Architecture: all
-Section: libs
Depends: java-common, java-gcj-compat | java1-runtime | java2-runtime, ${misc:Depends}
Description: Element construction set for various markup languages
Generation API directly supports HTML 4.0 and XML, but can easily be
diff -u jakarta-ecs-1.4.2/debian/changelog jakarta-ecs-1.4.2/debian/changelog
--- jakarta-ecs-1.4.2/debian/changelog
+++ jakarta-ecs-1.4.2/debian/changelog
@@ -1,3 +1,16 @@
+jakarta-ecs (1.4.2-1.1) unstable; urgency=low
+
+ [ Philipp Spitzer ]
+ * Non-maintainer upload.
+ * Renamed "enum" variable to "enumerate" as "enum" became a Java keyword
+ (Closes: #543076).
+
+ [ gregor herrmann ]
+ * debian/control: remove section from binary package, change section to java
+ in source package.
+
+ -- Philipp Spitzer <philipp+deb...@spitzer.priv.at> Fri, 27 Nov 2009 22:28:19 +0100
+
jakarta-ecs (1.4.2-1) unstable; urgency=low
* Initial release (Closes: #503279).
only in patch2:
unchanged:
--- jakarta-ecs-1.4.2.orig/src/java/org/apache/ecs/ElementAttributes.java
+++ jakarta-ecs-1.4.2/src/java/org/apache/ecs/ElementAttributes.java
@@ -342,12 +342,12 @@
}
out.append(getElementType());
- Enumeration enum = getElementHashEntry().keys();
+ Enumeration enumerate = getElementHashEntry().keys();
String value = null; // avoid creating a new string object on each pass through the loop
- while (enum.hasMoreElements())
+ while (enumerate.hasMoreElements())
{
- String attr = (String) enum.nextElement();
+ String attr = (String) enumerate.nextElement();
if(getAttributeFilterState())
{
value = getAttributeFilter().process(getElementHashEntry().get(attr).toString());
only in patch2:
unchanged:
--- jakarta-ecs-1.4.2.orig/src/java/org/apache/ecs/ConcreteElement.java
+++ jakarta-ecs-1.4.2/src/java/org/apache/ecs/ConcreteElement.java
@@ -319,11 +319,11 @@
if(ce.getTagText() != null)
out.write(ce.getTagText().getBytes(encoding));
- Enumeration enum = ce.registryList.elements();
+ Enumeration enumerate = ce.registryList.elements();
- while(enum.hasMoreElements())
+ while(enumerate.hasMoreElements())
{
- Object obj = ce.registry.get((String)enum.nextElement());
+ Object obj = ce.registry.get((String)enumerate.nextElement());
if(obj instanceof GenericElement)
{
Element e = (Element)obj;
@@ -435,10 +435,10 @@
if(getTagText() != null)
out.write(getTagText());
- Enumeration enum = registryList.elements();
- while(enum.hasMoreElements())
+ Enumeration enumerate = registryList.elements();
+ while(enumerate.hasMoreElements())
{
- Object obj = registry.get((String)enum.nextElement());
+ Object obj = registry.get((String)enumerate.nextElement());
if(obj instanceof GenericElement)
{
Element e = (Element)obj;
only in patch2:
unchanged:
--- jakarta-ecs-1.4.2.orig/src/java/org/apache/ecs/filter/RegexpFilter.java
+++ jakarta-ecs-1.4.2/src/java/org/apache/ecs/filter/RegexpFilter.java
@@ -118,10 +118,10 @@
}
String substituteIn = to_process;
- Enumeration enum = keys();
+ Enumeration enumerate = keys();
- while (enum.hasMoreElements()) {
- RE r = (RE)enum.nextElement();
+ while (enumerate.hasMoreElements()) {
+ RE r = (RE)enumerate.nextElement();
String substitution = (String)get(r);
substituteIn = r.subst(substituteIn, substitution);
}
only in patch2:
unchanged:
--- jakarta-ecs-1.4.2.orig/src/java/org/apache/ecs/html/A.java
+++ jakarta-ecs-1.4.2/src/java/org/apache/ecs/html/A.java
@@ -462,13 +462,13 @@
*/
public boolean getNeedLineBreak()
{
- java.util.Enumeration enum = elements();
+ java.util.Enumeration enumerate = elements();
int i=0;
int j=0;
- while(enum.hasMoreElements())
+ while(enumerate.hasMoreElements())
{
j++;
- Object obj = enum.nextElement();
+ Object obj = enumerate.nextElement();
if( obj instanceof IMG )
i++;
}
only in patch2:
unchanged:
--- jakarta-ecs-1.4.2.orig/src/java/org/apache/ecs/html/Select.java
+++ jakarta-ecs-1.4.2/src/java/org/apache/ecs/html/Select.java
@@ -219,10 +219,10 @@
public Select selectOption(int option)
{
- Enumeration enum = keys();
- for(int x = 0; enum.hasMoreElements(); x++)
+ Enumeration enumerate = keys();
+ for(int x = 0; enumerate.hasMoreElements(); x++)
{
- ConcreteElement element = (ConcreteElement)getElement((String)enum.nextElement());
+ ConcreteElement element = (ConcreteElement)getElement((String)enumerate.nextElement());
if(x == option)
{
((Option)element).setSelected(true);
only in patch2:
unchanged:
--- jakarta-ecs-1.4.2.orig/src/java/org/apache/ecs/html/TD.java
+++ jakarta-ecs-1.4.2/src/java/org/apache/ecs/html/TD.java
@@ -468,13 +468,13 @@
*/
public boolean getNeedLineBreak()
{
- java.util.Enumeration enum = elements();
+ java.util.Enumeration enumerate = elements();
int i=0;
int j=0;
- while(enum.hasMoreElements())
+ while(enumerate.hasMoreElements())
{
j++;
- Object obj = enum.nextElement();
+ Object obj = enumerate.nextElement();
if( obj instanceof IMG || obj instanceof A )
i++;
}
only in patch2:
unchanged:
--- jakarta-ecs-1.4.2.orig/src/java/org/apache/ecs/xhtml/td.java
+++ jakarta-ecs-1.4.2/src/java/org/apache/ecs/xhtml/td.java
@@ -466,13 +466,13 @@
*/
public boolean getNeedLineBreak()
{
- java.util.Enumeration enum = elements();
+ java.util.Enumeration enumerate = elements();
int i=0;
int j=0;
- while(enum.hasMoreElements())
+ while(enumerate.hasMoreElements())
{
j++;
- Object obj = enum.nextElement();
+ Object obj = enumerate.nextElement();
if( obj instanceof img || obj instanceof a )
i++;
}
only in patch2:
unchanged:
--- jakarta-ecs-1.4.2.orig/src/java/org/apache/ecs/xhtml/a.java
+++ jakarta-ecs-1.4.2/src/java/org/apache/ecs/xhtml/a.java
@@ -472,13 +472,13 @@
*/
public boolean getNeedLineBreak()
{
- java.util.Enumeration enum = elements();
+ java.util.Enumeration enumerate = elements();
int i=0;
int j=0;
- while(enum.hasMoreElements())
+ while(enumerate.hasMoreElements())
{
j++;
- Object obj = enum.nextElement();
+ Object obj = enumerate.nextElement();
if( obj instanceof img )
i++;
}
only in patch2:
unchanged:
--- jakarta-ecs-1.4.2.orig/src/java/org/apache/ecs/vxml/TestBed2.java
+++ jakarta-ecs-1.4.2/src/java/org/apache/ecs/vxml/TestBed2.java
@@ -158,12 +158,12 @@
Menu menu3 = new Menu("true");
Prompt prompt2 = new Prompt("Welcome Home");
- Enumerate enum = new Enumerate();
- enum.addElement("For ");
- enum.addElement(new Value("_prompt"));
- enum.addElement(", press ");
- enum.addElement(new Value("_dtmf"));
- prompt2.addElement(enum);
+ Enumerate enumerate = new Enumerate();
+ enumerate.addElement("For ");
+ enumerate.addElement(new Value("_prompt"));
+ enumerate.addElement(", press ");
+ enumerate.addElement(new Value("_dtmf"));
+ prompt2.addElement(enumerate);
menu3.addElement(prompt2);
Choice choice1 = new Choice("http://www.sports.example/vxml/start.vxml";);
Choice choice2 = new Choice("http://www.weather.example/intro.vxml";);
only in patch2:
unchanged:
--- jakarta-ecs-1.4.2.orig/src/java/org/apache/ecs/xml/XML.java
+++ jakarta-ecs-1.4.2/src/java/org/apache/ecs/xml/XML.java
@@ -193,13 +193,13 @@
public boolean getNeedLineBreak() {
boolean linebreak = true;
- java.util.Enumeration enum = elements();
+ java.util.Enumeration enumerate = elements();
// if this tag has one child, and it's a String, then don't
// do any linebreaks to preserve whitespace
- while (enum.hasMoreElements()) {
- Object obj = enum.nextElement();
+ while (enumerate.hasMoreElements()) {
+ Object obj = enumerate.nextElement();
if (obj instanceof StringElement) {
linebreak = false;
break;
signature.asc
Description: Digital signature
