[pkg-java] r17830 - in trunk/sqlline/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-03-06 09:23:54 +0000 (Thu, 06 Mar 2014)
New Revision: 17830

Added:
   trunk/sqlline/debian/patches/02_rename_enum_variables.patch
Modified:
   trunk/sqlline/debian/changelog
   trunk/sqlline/debian/patches/series
Log:
Renamed the 'enum' variables to fix a build failure



Modified: trunk/sqlline/debian/changelog
===================================================================
--- trunk/sqlline/debian/changelog	2014-03-06 09:17:12 UTC (rev 17829)
+++ trunk/sqlline/debian/changelog	2014-03-06 09:23:54 UTC (rev 17830)
@@ -1,6 +1,7 @@
 sqlline (1.0.2-5) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Renamed the 'enum' variables to fix a build failure (Closes: #738425)
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
     - Use canonical URLs for the Vcs-* fields

Added: trunk/sqlline/debian/patches/02_rename_enum_variables.patch
===================================================================
--- trunk/sqlline/debian/patches/02_rename_enum_variables.patch	                        (rev 0)
+++ trunk/sqlline/debian/patches/02_rename_enum_variables.patch	2014-03-06 09:23:54 UTC (rev 17830)
@@ -0,0 +1,20 @@
+Description: Renames the 'enum' variables to fix a build failure
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/738425
+--- a/src/sqlline/SqlLine.java
++++ b/src/sqlline/SqlLine.java
+@@ -1720,10 +1720,10 @@
+ 				int total = zf.size ();
+ 				int index = 0;
+ 
+-				for (Enumeration enum = zf.entries ();
+-					enum.hasMoreElements (); )
++				for (Enumeration enumeration = zf.entries ();
++					enumeration.hasMoreElements (); )
+ 				{
+-					ZipEntry entry = (ZipEntry)enum.nextElement ();
++					ZipEntry entry = (ZipEntry)enumeration.nextElement ();
+ 					String name = entry.getName ();
+ 					progress (index++, total);
+ 

Modified: trunk/sqlline/debian/patches/series
===================================================================
--- trunk/sqlline/debian/patches/series	2014-03-06 09:17:12 UTC (rev 17829)
+++ trunk/sqlline/debian/patches/series	2014-03-06 09:23:54 UTC (rev 17830)
@@ -1 +1,2 @@
 01_build_lib_release.patch 
+02_rename_enum_variables.patch