diff -Nru zeroc-ice-3.4.2/debian/changelog zeroc-ice-3.4.2/debian/changelog
--- zeroc-ice-3.4.2/debian/changelog	2013-03-04 19:58:06.000000000 +0800
+++ zeroc-ice-3.4.2/debian/changelog	2013-07-03 16:39:09.000000000 +0800
@@ -1,3 +1,13 @@
+zeroc-ice (3.4.2-8.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Compatible with jgoodies-forms1.6
+   - debian/patch/jgoodies-forms1.6-transition.patch 
+  * Compatible with openjdk7
+   - debian/patch/compatible-with-openjdk7.patch
+
+ -- ShuxiongYe <yeshuxiong@gmail.com>  Wed, 03 Jul 2013 12:16:32 +0800
+
 zeroc-ice (3.4.2-8.2) unstable; urgency=high
 
   [Sebastian Ramacher]
diff -Nru zeroc-ice-3.4.2/debian/patches/compatible-with-openjdk7.patch zeroc-ice-3.4.2/debian/patches/compatible-with-openjdk7.patch
--- zeroc-ice-3.4.2/debian/patches/compatible-with-openjdk7.patch	1970-01-01 08:00:00.000000000 +0800
+++ zeroc-ice-3.4.2/debian/patches/compatible-with-openjdk7.patch	2013-07-03 15:06:12.000000000 +0800
@@ -0,0 +1,26 @@
+Index: zeroc-ice-3.4.2/java/src/IceInternal/OutgoingConnectionFactory.java
+===================================================================
+--- zeroc-ice-3.4.2.orig/java/src/IceInternal/OutgoingConnectionFactory.java	2011-06-16 03:44:00.000000000 +0800
++++ zeroc-ice-3.4.2/java/src/IceInternal/OutgoingConnectionFactory.java	2013-07-03 15:05:32.612618208 +0800
+@@ -17,7 +17,7 @@
+     private static class MultiHashMap<K, V> extends java.util.HashMap<K, java.util.List<V>>
+     {
+         public void
+-        put(K key, V value)
++        putOne(K key, V value)
+         {
+             java.util.List<V> list = this.get(key);
+             if(list == null)
+@@ -693,9 +693,9 @@
+             throw ex;
+ 	}
+ 
+-        _connections.put(ci.connector, connection);
+-        _connectionsByEndpoint.put(connection.endpoint(), connection);
+-        _connectionsByEndpoint.put(connection.endpoint().compress(true), connection);
++        _connections.putOne(ci.connector, connection);
++        _connectionsByEndpoint.putOne(connection.endpoint(), connection);
++        _connectionsByEndpoint.putOne(connection.endpoint().compress(true), connection);
+         return connection;
+     }
+ 
diff -Nru zeroc-ice-3.4.2/debian/patches/jgoodies-forms1.6-transition.patch zeroc-ice-3.4.2/debian/patches/jgoodies-forms1.6-transition.patch
--- zeroc-ice-3.4.2/debian/patches/jgoodies-forms1.6-transition.patch	1970-01-01 08:00:00.000000000 +0800
+++ zeroc-ice-3.4.2/debian/patches/jgoodies-forms1.6-transition.patch	2013-07-03 14:15:07.000000000 +0800
@@ -0,0 +1,119 @@
+Index: zeroc-ice-3.4.2/java/src/IceGridGUI/Application/Editor.java
+===================================================================
+--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/Application/Editor.java	2011-06-16 03:44:00.000000000 +0800
++++ zeroc-ice-3.4.2/java/src/IceGridGUI/Application/Editor.java	2013-07-03 14:12:20.616789988 +0800
+@@ -29,7 +29,6 @@
+ 
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
+ import com.jgoodies.forms.factories.DefaultComponentFactory;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.util.LayoutStyle;
+@@ -106,7 +105,7 @@
+     protected void buildPropertiesPanel()
+     {
+         super.buildPropertiesPanel();
+-        JComponent buttonBar = ButtonBarFactory.buildRightAlignedBar(_applyButton, _discardButton);
++        JComponent buttonBar = new com.jgoodies.forms.builder.ButtonBarBuilder().addGlue().addButton(_applyButton, _discardButton).build();
+         buttonBar.setBorder(Borders.DIALOG_BORDER);
+         _propertiesPanel.add(buttonBar, BorderLayout.SOUTH);
+     }
+Index: zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java
+===================================================================
+--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java	2011-06-16 03:44:00.000000000 +0800
++++ zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java	2013-07-03 14:14:02.361294492 +0800
+@@ -29,7 +29,6 @@
+ 
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.util.LayoutStyle;
+ 
+Index: zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java
+===================================================================
+--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java	2011-06-16 03:44:00.000000000 +0800
++++ zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java	2013-07-03 14:07:50.411450078 +0800
+@@ -30,7 +30,6 @@
+ 
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
+ import com.jgoodies.forms.layout.CellConstraints;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.util.LayoutStyle;
+@@ -128,8 +127,7 @@
+                 };
+             cancelButton.addActionListener(cancelListener);
+ 
+-            JComponent buttonBar =
+-                ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
++            JComponent buttonBar = new com.jgoodies.forms.builder.ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
+             buttonBar.setBorder(Borders.DIALOG_BORDER);
+ 
+             contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
+Index: zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java
+===================================================================
+--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java	2011-06-16 03:44:00.000000000 +0800
++++ zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java	2013-07-03 14:14:30.641434721 +0800
+@@ -22,7 +22,6 @@
+ 
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.util.LayoutStyle;
+ 
+@@ -108,8 +107,7 @@
+         builder.append("Poll period (seconds)", periodField);
+         builder.nextLine();
+ 
+-        JComponent buttonBar =
+-            ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
++        JComponent buttonBar = new com.jgoodies.forms.builder.ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
+         buttonBar.setBorder(Borders.DIALOG_BORDER);
+ 
+         java.awt.Container contentPane = getContentPane();
+Index: zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java
+===================================================================
+--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java	2011-06-16 03:44:00.000000000 +0800
++++ zeroc-ice-3.4.2/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java	2013-07-03 14:14:56.693563906 +0800
+@@ -34,7 +34,6 @@
+ 
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
+ import com.jgoodies.forms.layout.CellConstraints;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.util.LayoutStyle;
+@@ -169,7 +168,7 @@
+         builder.append(_stdOut);
+         builder.append(stdErr);
+         builder.nextLine();
+-        JComponent buttonBar = ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
++        JComponent buttonBar = new com.jgoodies.forms.builder.ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
+         buttonBar.setBorder(Borders.DIALOG_BORDER);
+ 
+         Container contentPane = getContentPane();
+Index: zeroc-ice-3.4.2/java/src/IceGridGUI/SessionKeeper.java
+===================================================================
+--- zeroc-ice-3.4.2.orig/java/src/IceGridGUI/SessionKeeper.java	2011-06-16 03:44:00.000000000 +0800
++++ zeroc-ice-3.4.2/java/src/IceGridGUI/SessionKeeper.java	2013-07-03 14:11:49.792636958 +0800
+@@ -29,7 +29,6 @@
+ 
+ import com.jgoodies.forms.builder.DefaultFormBuilder;
+ import com.jgoodies.forms.factories.Borders;
+-import com.jgoodies.forms.factories.ButtonBarFactory;
+ import com.jgoodies.forms.factories.DefaultComponentFactory;
+ import com.jgoodies.forms.layout.FormLayout;
+ import com.jgoodies.forms.util.LayoutStyle;
+@@ -884,7 +883,7 @@
+             TitledBorder titledBorder = BorderFactory.createTitledBorder(Borders.DIALOG_BORDER, "SSL Configuration");
+             _sslPane.setBorder(titledBorder);
+ 
+-            JComponent buttonBar = ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
++            JComponent buttonBar = new com.jgoodies.forms.builder.ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
+             buttonBar.setBorder(Borders.DIALOG_BORDER);
+ 
+             Container contentPane = getContentPane();
diff -Nru zeroc-ice-3.4.2/debian/patches/series zeroc-ice-3.4.2/debian/patches/series
--- zeroc-ice-3.4.2/debian/patches/series	2013-03-04 19:58:06.000000000 +0800
+++ zeroc-ice-3.4.2/debian/patches/series	2013-07-03 15:04:00.000000000 +0800
@@ -14,3 +14,5 @@
 cpp-make-rules.path
 php5.4-transition.patch
 force_gcc_46.patch
+jgoodies-forms1.6-transition.patch
+compatible-with-openjdk7.patch