Update of /cvsroot/pkg-java/eclipse/debian
In directory haydn:/tmp/cvs-serv7590

Modified Files:
        changelog control control.in eclipse-ecj-gcj.install 
        eclipse-ecj.install rules 
Added Files:
        eclipse-ecj-gcj.manpages eclipse-ecj.manpages 
Log Message:
  * debian/extra/eclipse.1: Updated and added missing commandline
    options. Closes: #343315
  * debian/patches/eclipse-public-applypatch.dpatch: Add patch to make some
    of the API of the compare plugin public, which is needed for the bugzilla
    plugin (https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707)
  * debian/rules,debian/eclipse-ecj.manpages,debian/eclipse-ecj-gcj.manpages,
    debian/extra/ecj.1,debian/extra/ecj-java.1,debian/extra/ecj-gcj.1:
    Make an own copy for ecj-gcj with a special comment about gcj and
    use *.manpages instead of a copy within the rules.
  * debian/control, debian/rules: Added dependency to classpath-doc and enabled
    eclipse-link-classpathdoc.dpatch to prevent that javadoc is fetching
    javadoc informations from java.sun.com during the build time.


--- /cvsroot/pkg-java/eclipse/debian/changelog  2005/12/19 08:19:35     1.50
+++ /cvsroot/pkg-java/eclipse/debian/changelog  2005/12/23 11:29:29     1.51
@@ -5,6 +5,18 @@
   * debian/eclipse-rcp.prerm: Fix the deletion of the eclipse
     directories in /usr/local/lib, so that it doesn't fail if they are not
     empty. Closes: #342338, #342305
+  * debian/extra/eclipse.1: Updated and added missing commandline
+    options. Closes: #343315
+  * debian/patches/eclipse-public-applypatch.dpatch: Add patch to make some
+    of the API of the compare plugin public, which is needed for the bugzilla
+    plugin (https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707)
+  * debian/rules,debian/eclipse-ecj.manpages,debian/eclipse-ecj-gcj.manpages,
+    debian/extra/ecj.1,debian/extra/ecj-java.1,debian/extra/ecj-gcj.1:
+    Make an own copy for ecj-gcj with a special comment about gcj and
+    use *.manpages instead of a copy within the rules.
+  * debian/control, debian/rules: Added dependency to classpath-doc and 
enabled 
+    eclipse-link-classpathdoc.dpatch to prevent that javadoc is fetching
+    javadoc informations from java.sun.com during the build time.
 
   [ Michael Koch ]
   * debian/extra/eclipse.1: Fixed typo.
@@ -29,7 +41,7 @@
   * debian/rules: Moved natively compiled jars to /usr/lib/gcj-4.0 and
     reworked it to support updates to newer GCJ versions more easily.
 
- -- Michael Koch <[EMAIL PROTECTED]>  Sun, 18 Dec 2005 16:49:44 +0000
+ -- Stephan Michels <[EMAIL PROTECTED]>  Fri, 23 Dec 2005 12:24:07 +0100
 
 eclipse (3.1.1-6) unstable; urgency=low
 
--- /cvsroot/pkg-java/eclipse/debian/control    2005/12/18 15:52:31     1.17
+++ /cvsroot/pkg-java/eclipse/debian/control    2005/12/23 11:29:29     1.18
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers 
<[email protected]>
 Uploaders: Jerry Haltom <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>, 
Matthias Klose <[EMAIL PROTECTED]>, Stephan Michels <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, unzip, 
sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, 
liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), 
libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), 
libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, mozilla-dev, 
gjdoc (>= 0.7.7), libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5-java
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, unzip, 
sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, 
liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), 
libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), 
libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, mozilla-dev, 
gjdoc (>= 0.7.7), classpath-doc, libcairo2-dev, ant-optional (>= 1.6.5-3), 
libtomcat5-java
 Standards-Version: 3.6.2
 
 Package: eclipse-rcp
--- /cvsroot/pkg-java/eclipse/debian/control.in 2005/12/18 15:52:31     1.17
+++ /cvsroot/pkg-java/eclipse/debian/control.in 2005/12/23 11:29:29     1.18
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers 
<[email protected]>
 Uploaders: Jerry Haltom <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>, 
Matthias Klose <[EMAIL PROTECTED]>, Stephan Michels <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, unzip, 
sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, 
liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), 
libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), 
libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, mozilla-dev, 
gjdoc (>= 0.7.7), [EMAIL PROTECTED]@
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, unzip, 
sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, 
liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), 
libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), 
libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, mozilla-dev, 
gjdoc (>= 0.7.7), classpath-doc, [EMAIL PROTECTED]@
 Standards-Version: 3.6.2
 
 Package: eclipse-rcp
--- /cvsroot/pkg-java/eclipse/debian/eclipse-ecj-gcj.install    2005/10/15 
12:29:53     1.1
+++ /cvsroot/pkg-java/eclipse/debian/eclipse-ecj-gcj.install    2005/12/23 
11:29:29     1.2
@@ -1,3 +1 @@
 debian/tmp/usr/bin/ecj-gcj
-
-debian/tmp/usr/share/man/man1/ecj-gcj.1
--- /cvsroot/pkg-java/eclipse/debian/eclipse-ecj.install        2005/10/15 
13:20:36     1.2
+++ /cvsroot/pkg-java/eclipse/debian/eclipse-ecj.install        2005/12/23 
11:29:29     1.3
@@ -1,5 +1,3 @@
 debian/tmp/usr/share/ant/lib/jdtCompilerAdapter.jar
 
 debian/tmp/usr/bin/ecj-java
-
-debian/tmp/usr/share/man/man1/ecj-java.1
--- /cvsroot/pkg-java/eclipse/debian/rules      2005/12/19 08:19:35     1.19
+++ /cvsroot/pkg-java/eclipse/debian/rules      2005/12/23 11:29:29     1.20
@@ -142,7 +142,9 @@
        eclipse-libswt-mozilla-classic \
        eclipse-navtivepresentation \
        eclipse-javadoc-bootclasspath \
-       eclipse-gjdoc-reflection
+       eclipse-link-classpathdoc \
+       eclipse-gjdoc-reflection \
+       eclipse-public-applypatch 
 
 ifeq ($(with_tomcat),yes)
   eclipse_patches += \
@@ -585,14 +587,11 @@
        cp $(EXTRA)/efj.sh                          $(DEBIAN_TMP)/usr/bin/efj
        mkdir -p                                    
$(DEBIAN_TMP)/usr/share/pixmaps/
        cp $(EXTRA)/eclipse32.xpm                   
$(DEBIAN_TMP)/usr/share/pixmaps/eclipse32.xpm
-       mkdir -p                                    
$(DEBIAN_TMP)/usr/share/man/man1/
-       cp $(EXTRA)/ecj.1                           
$(DEBIAN_TMP)/usr/share/man/man1/ecj-java.1
        mkdir -p                                    
$(DEBIAN_TMP)/$(ECLIPSE_HOME)/links/
        cp $(EXTRA)/local.link                      
$(DEBIAN_TMP)/$(ECLIPSE_HOME)/links/local.link
        
 ifeq ($(enable_native),yes)
        cp $(BUILD_TREE)/ecj-gcj                    
$(DEBIAN_TMP)/usr/bin/ecj-gcj
-       cp $(EXTRA)/ecj.1                           
$(DEBIAN_TMP)/usr/share/man/man1/ecj-gcj.1
        mkdir -p                                    $(DEBIAN_TMP)/usr/sbin/
        cp $(EXTRA)/update-gcj-classmaps-eclipse.sh 
$(DEBIAN_TMP)/usr/sbin/update-gcj-classmaps-eclipse
 endif

_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

Reply via email to