[sqlline] 09/22: Renamed the 'enum' variables to fix a build failure

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository sqlline.

commit 70f06f91993ec238193b5781025909fd9ef8d657
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 6 09:23:54 2014 +0000

    Renamed the 'enum' variables to fix a build failure
---
 debian/changelog                              |  1 +
 debian/patches/02_rename_enum_variables.patch | 20 ++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f2ee164..b26738f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/patches/02_rename_enum_variables.patch b/debian/patches/02_rename_enum_variables.patch
new file mode 100644
index 0000000..2bafc49
--- /dev/null
+++ b/debian/patches/02_rename_enum_variables.patch
@@ -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);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c8f27ed..ebaf8dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_build_lib_release.patch 
+02_rename_enum_variables.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sqlline.git