Hi
I want to help with eclipse 3.3 packaging. I did the attached patch
changes against the svn .
This include :
eclipse-ant-manifest
eclipse-fileinitializer
eclipse-gnuformatterjdt
eclipse-gnuformatterjdtui
diff against svn trunk.
Please tells me what needs works at this stage of the development.
I am afraid above changes duplicate works or are out of schedule but I
already did it so I felt sending those would not hurt.
Best regards
Alban
Index: debian/patches/eclipse-fileinitializer.dpatch
===================================================================
--- debian/patches/eclipse-fileinitializer.dpatch (révision 4075)
+++ debian/patches/eclipse-fileinitializer.dpatch (copie de travail)
@@ -40,12 +40,13 @@
+ </initializer>
+ </extension>
</plugin>
---- source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java.orig 2006-01-11 19:20:41.000000000 +0000
-+++ source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java 2006-01-11 19:22:12.000000000 +0000
-@@ -39,6 +39,14 @@
- public static String meta_unableToReadAuthorization;
- public static String meta_unableToWriteAuthorization;
-
+--- source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java.orig 2007-08-31 18:32:56.000000000 +0200
++++ source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java 2007-08-31 18:32:10.000000000 +0200
+@@ -29,6 +29,15 @@
+ // metadata
+ public static String meta_appNotInit;
+ public static String meta_exceptionParsingLog;
++
+ // initializer
+ public static String initializer_error;
+
@@ -56,10 +57,10 @@
+
// parsing/resolve
public static String plugin_deactivatedLoad;
-
---- source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.orig 2006-01-11 19:28:23.000000000 +0000
-+++ source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2006-01-11 19:30:05.000000000 +0000
-@@ -86,6 +86,15 @@
+
+--- source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.orig 2007-08-31 19:39:16.000000000 +0200
++++ source-tree/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2007-08-31 19:38:47.000000000 +0200
+@@ -97,6 +97,15 @@
*/
public static final String PT_PRODUCT = "products"; //$NON-NLS-1$
@@ -73,8 +74,9 @@
+ public static final String PT_INITIALIZERS = "initializers"; //$NON-NLS-1$
+
/**
- * The simple identifier constant (value "<code>initializers</code>") of
- * the extension point of the Core Runtime plug-in where plug-ins declare
+ * Debug option value denoting the time at which the platform runtime
+ * was started. This constant can be used in conjunction with
+
Index: source-tree/plugins/org.eclipse.core.runtime/schema/initializers.exsd
===================================================================
RCS file: schema/initializers.exsd
@@ -436,3 +438,4 @@
+ }
+
+}
+
Index: debian/patches/eclipse-gnuformatterjdtui.dpatch
===================================================================
--- debian/patches/eclipse-gnuformatterjdtui.dpatch (révision 4075)
+++ debian/patches/eclipse-gnuformatterjdtui.dpatch (copie de travail)
@@ -22,23 +22,24 @@
exit 0
@DPATCH@
---- source-tree/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java.orig 2006-01-12 05:34:37.000000000 +0000
-+++ source-tree/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java 2006-01-12 05:35:30.000000000 +0000
-@@ -439,6 +439,7 @@
+--- source-tree/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java.orig 2007-08-31 20:05:06.000000000 +0200
++++ source-tree/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.java 2007-08-31 20:06:12.000000000 +0200
+@@ -429,6 +429,7 @@
public static String NewLinesTabPage_annotations_group_option_after_annotation;
public static String ProfileManager_default_profile_name;
public static String ProfileManager_eclipse_profile_name;
+ public static String ProfileManager_gnu_profile_name;
public static String ProfileManager_java_conventions_profile_name;
- public static String ProfileManager_unmanaged_profile;
- public static String ProfileManager_unmanaged_profile_with_name;
---- source-tree/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties.orig 2006-01-12 05:36:33.000000000 +0000
-+++ source-tree/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties 2006-01-12 05:37:20.000000000 +0000
-@@ -519,6 +519,7 @@
+
+ public static String JavaPreview_formatter_exception;
+--- source-tree/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties.orig 2007-08-31 20:09:11.000000000 +0200
++++ source-tree/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/formatter/FormatterMessages.properties 2007-08-31 20:09:58.000000000 +0200
+@@ -488,6 +488,7 @@
ProfileManager_default_profile_name=Eclipse 2.1 [built-in]
ProfileManager_eclipse_profile_name=Eclipse [built-in]
+ProfileManager_gnu_profile_name=GNU [built-in]
ProfileManager_java_conventions_profile_name=Java Conventions [built-in]
- ProfileManager_unmanaged_profile=Unmanaged profile
+ JavaPreview_formatter_exception=The formatter threw an unhandled exception while formatting the preview.
+
Index: debian/patches/eclipse-gnuformatterjdt.dpatch
===================================================================
--- debian/patches/eclipse-gnuformatterjdt.dpatch (révision 4075)
+++ debian/patches/eclipse-gnuformatterjdt.dpatch (copie de travail)
@@ -21,37 +21,27 @@
exit 0
@DPATCH@
-Index: source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java
-===================================================================
-RCS file: /home/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java,v
-retrieving revision 1.61
-diff -u -r1.61 DefaultCodeFormatterConstants.java
---- source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java 1 Apr 2005 10:54:15 -0000 1.61
-+++ source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java 18 Apr 2005 18:17:47 -0000
-@@ -3134,6 +3134,16 @@
- return DefaultCodeFormatterOptions.getEclipseDefaultSettings().getMap();
+--- source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java.orig 2007-08-31 19:47:14.000000000 +0200
++++ source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java 2007-08-31 19:46:48.000000000 +0200
+@@ -3332,6 +3332,16 @@
}
-+ /**
-+ * Returns the default GNU formatter settings
-+ *
-+ * @return the GNU default settings
-+ * @since 3.1
-+ */
-+ public static Map getGNUSettings() {
-+ return DefaultCodeFormatterOptions.getGNUSettings().getMap();
-+ }
-+
/**
++ * Returns the default GNU formatter settings
++ *
++ * @return the GNU default settings
++ * @since 3.1
++ */
++ public static Map getGNUSettings() {
++ return DefaultCodeFormatterOptions.getGNUSettings().getMap();
++ }
++
++ /**
* <p>Return the force value of the given alignment value.
* The given alignment value should be created using the <code>createAlignmentValue(boolean, int, int)</code>
-Index: source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java
-===================================================================
-RCS file: /home/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java,v
-retrieving revision 1.63
-diff -u -r1.63 DefaultCodeFormatterOptions.java
---- source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java 1 Apr 2005 10:54:15 -0000 1.63
-+++ source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java 18 Apr 2005 18:17:48 -0000
+ * API.
+--- source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java.orig 2007-08-31 19:52:03.000000000 +0200
++++ source-tree/plugins/org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/DefaultCodeFormatterOptions.java 2007-08-31 20:00:01.000000000 +0200
@@ -39,6 +39,12 @@
return options;
}
@@ -61,11 +51,11 @@
+ options.setGNUDefaultSettings();
+ return options;
+ }
-+
++
public static DefaultCodeFormatterOptions getJavaConventionsSettings() {
DefaultCodeFormatterOptions options = new DefaultCodeFormatterOptions();
options.setJavaConventionsSettings();
-@@ -2036,6 +2042,190 @@
+@@ -2174,6 +2180,190 @@
this.tab_size = 4;
}
@@ -252,7 +242,7 @@
+ this.tab_char = SPACE;
+ this.tab_size = 2;
+ }
-+
++
public void setJavaConventionsSettings() {
this.alignment_for_arguments_in_allocation_expression = Alignment.M_COMPACT_SPLIT;
this.alignment_for_arguments_in_enum_constant = Alignment.M_COMPACT_SPLIT;
Index: debian/patches/eclipse-ant-manifest.dpatch
===================================================================
--- debian/patches/eclipse-ant-manifest.dpatch (révision 4075)
+++ debian/patches/eclipse-ant-manifest.dpatch (copie de travail)
@@ -21,31 +21,18 @@
exit 0
@DPATCH@
---- source-tree/plugins/org.apache.ant/META-INF/MANIFEST.MF.orig 2005-10-29 18:14:17.000000000 +0200
-+++ source-tree/plugins/org.apache.ant/META-INF/MANIFEST.MF 2005-10-29 18:18:39.000000000 +0200
-@@ -13,24 +13,14 @@
- lib/ant-apache-resolver.jar,
- lib/ant-commons-logging.jar,
- lib/ant-commons-net.jar,
-- lib/ant-icontract.jar,
-- lib/ant-jai.jar,
- lib/ant-javamail.jar,
- lib/ant-jdepend.jar,
- lib/ant-jmf.jar,
- lib/ant-jsch.jar,
- lib/ant-junit.jar,
-- lib/ant-launcher.jar,
-- lib/ant-netrexx.jar,
- lib/ant-nodeps.jar,
-- lib/ant-starteam.jar,
-- lib/ant-stylebook.jar,
- lib/ant-swing.jar,
-- lib/ant-trax.jar,
-- lib/ant-vaj.jar,
-- lib/ant-weblogic.jar,
-- lib/ant-xalan1.jar,
-- lib/ant-xslp.jar
-+ lib/ant-trax.jar
- Bundle-Vendor: %providerName
- Bundle-Localization: plugin
- Export-Package: .,
+--- source-tree/plugins/org.apache.ant_1.7.0.v200706080842/META-INF/MANIFEST.MF.orig 2007-08-31 18:08:38.000000000 +0200
++++ source-tree/plugins/org.apache.ant_1.7.0.v200706080842/META-INF/MANIFEST.MF 2007-08-31 18:05:58.000000000 +0200
+@@ -54,9 +54,7 @@
+ Bundle-ClassPath: lib/ant.jar,lib/ant-antlr.jar,lib/ant-apache-bcel.ja
+ r,lib/ant-apache-bsf.jar,lib/ant-apache-log4j.jar,lib/ant-apache-oro.
+ jar,lib/ant-apache-regexp.jar,lib/ant-apache-resolver.jar,lib/ant-com
+- mons-logging.jar,lib/ant-commons-net.jar,lib/ant-jai.jar,lib/ant-java
+- mail.jar,lib/ant-jdepend.jar,lib/ant-jmf.jar,lib/ant-jsch.jar,lib/ant
+- -junit.jar,lib/ant-launcher.jar,lib/ant-netrexx.jar,lib/ant-nodeps.ja
+- r,lib/ant-starteam.jar,lib/ant-stylebook.jar,lib/ant-swing.jar,lib/an
+- t-trax.jar,lib/ant-weblogic.jar
++ mons-logging.jar,lib/ant-commons-net.jar,lib/ant-java mail.jar,lib/an
++ t-jdepend.jar,lib/ant-jmf.jar,lib/ant-jsch.jar,lib/ant-junit.jar,lib/
++ ant-nodeps.jar,lib/ant-swing.jar,lib/ant-trax.jar
+
Index: debian/watch
===================================================================
--- debian/watch (révision 4075)
+++ debian/watch (copie de travail)
@@ -1,2 +1,2 @@
version=3
-ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/R-([\d\.-]*)/eclipse-sourceBuild-srcIncluded-(.*)\.zip
+ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-([\d\.-]*)/eclipse-sourceBuild-srcIncluded-(.*)\.zip
Index: debian/rules
===================================================================
--- debian/rules (révision 4075)
+++ debian/rules (copie de travail)
@@ -10,7 +10,7 @@
export DH_OPTIONS =
export SHELL = /bin/bash
-DEB_GCJ_PACKAGES := eclipse-rcp eclipse-platform eclipse-jdt eclipse-pde libswt3.2-gtk
+DEB_GCJ_PACKAGES := eclipse-rcp eclipse-platform eclipse-jdt eclipse-pde libswt3.3-gtk
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
# The ppc64 port in eclipse 3.2 is incomplete.
_______________________________________________
pkg-java-maintainers mailing list
pkg-java-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers
