diff -u eclipse-3.2.2/debian/control eclipse-3.2.2/debian/control --- eclipse-3.2.2/debian/control +++ eclipse-3.2.2/debian/control @@ -1,9 +1,10 @@ Source: eclipse Section: devel Priority: optional -Maintainer: Debian Java Maintainers +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Jerry Haltom , Michael Koch , Matthias Klose , Stephan Michels -Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.34), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java, libxul-dev +Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.34), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java, firefox-dev Standards-Version: 3.7.2 Package: eclipse-rcp @@ -53,7 +54,7 @@ Package: eclipse-platform Architecture: any -Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.34), libtomcat5.5-java, ${shlibs:Depends} +Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.34), libtomcat5.5-java, firefox (>= 1.4.99) Recommends: eclipse-platform-gcj, eclipse Replaces: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common Conflicts: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common @@ -188,7 +189,7 @@ Package: libswt3.2-gtk-java Architecture: any Depends: libswt3.2-gtk-jni (= ${binary:Version}), java-common -Recommends: libswt3.2-gtk-gcj, ${shlibs:Depends} +Recommends: libswt3.2-gtk-gcj, firefox (>= 1.4.99) Replaces: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, eclipse-rcp (<< 3.1.2-2) Conflicts: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.2-java (<< 3.2.1-5) Description: Fast and rich GUI toolkit for Java, gtk2 version diff -u eclipse-3.2.2/debian/changelog eclipse-3.2.2/debian/changelog --- eclipse-3.2.2/debian/changelog +++ eclipse-3.2.2/debian/changelog @@ -1,3 +1,11 @@ +eclipse (3.2.2-4ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Change maintainer to MOTU in debian/control.in and debian/control + - Regenerated debian/control for Ubuntu. + + -- Flávio Martins Wed, 21 Nov 2007 18:43:13 +0000 + eclipse (3.2.2-4) unstable; urgency=low [ Michael Koch ] @@ -19,6 +27,29 @@ -- Michael Koch Sun, 07 Oct 2007 11:46:03 +0200 +eclipse (3.2.2-3ubuntu3) gutsy; urgency=low + + * Replace ecj-bootstrap-gcj with ecj-gcj in eclipse-gcj's Depends. + + -- Steve Kowalik Fri, 14 Sep 2007 17:34:23 +1000 + +eclipse (3.2.2-3ubuntu2) gutsy; urgency=low + + * In eclipse-awt-libpath.dpatch added paths to fix ppc build. + (LP: #138498) + * Fix build on lpia. (LP: #138497) + * Move to gcj-4.2. + + -- Flávio Martins Sun, 09 Sep 2007 21:20:21 +0100 + +eclipse (3.2.2-3ubuntu1) gutsy; urgency=low + + * In debian/control and debian/rules change from xulrunner to firefox + * Set distribution name to Ubuntu in debian/rules + * Change maintainer to MOTU in debian/control.in and debian/control + + -- Scott Kitterman Sat, 08 Sep 2007 15:14:26 -0400 + eclipse (3.2.2-3) unstable; urgency=low [ Michael Koch ] diff -u eclipse-3.2.2/debian/control.in eclipse-3.2.2/debian/control.in --- eclipse-3.2.2/debian/control.in +++ eclipse-3.2.2/debian/control.in @@ -1,7 +1,8 @@ Source: eclipse Section: devel Priority: optional -Maintainer: Debian Java Maintainers +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Jerry Haltom , Michael Koch , Matthias Klose , Stephan Michels Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.34), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev@BUILD_DEPS@ Standards-Version: 3.7.2