diff -Nru swt-gtk-3.5.1/debian/changelog swt-gtk-3.5.1+versionbump/debian/changelog --- swt-gtk-3.5.1/debian/changelog 2010-09-18 10:56:56.000000000 +0300 +++ swt-gtk-3.5.1+versionbump/debian/changelog 2010-09-18 10:56:57.000000000 +0300 @@ -1,3 +1,10 @@ +swt-gtk (3.5.1+versionbump-5ubuntu1) maverick; urgency=low + + * Merge from Debian (LP: #640567, #558672, #531754), remaining changes: + + Bump version number to overcome historical eclipse binaries + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Sat, 18 Sep 2010 10:50:16 +0300 + swt-gtk (3.5.1-5) unstable; urgency=low * debian/patches: Move 02-bp-accessible-object to common/ directory. @@ -49,6 +56,32 @@ -- أحمد المحمودي (Ahmed El-Mahmoudy) Mon, 09 Aug 2010 22:59:08 +0300 +swt-gtk (3.5.1+versionbump-2ubuntu3) maverick; urgency=low + + * Don't set DEB_MAKE_INVOKE and pass AWT_LIB_PATH to Makefile. This used + to be overwritten by makefile-vars.mk in Lucid anyway, and so it was + ignored. It is not overwritten now, and causes the package to FTBFS. + Instead, export AWT_LIB_PATH before calling the makefile (LP: #601009) + - update debian/rules + + -- Chris Coulson Tue, 03 Aug 2010 01:53:58 +0100 + +swt-gtk (3.5.1+versionbump-2ubuntu2) lucid; urgency=low + + * Rebuild against xulrunner-1.9.2 + * Add binary xulrunner depend to libswt-mozilla-gtk-3.5-jni: + - update debian/rules to call dh_xulrunner in binary-predeb target + - update debian/control to add minimum xulrunner-dev version for + dh_xulrunner + + -- Chris Coulson Tue, 23 Mar 2010 13:25:36 +0000 + +swt-gtk (3.5.1+versionbump-2ubuntu1) lucid; urgency=low + + * Bump version number to overcome historical eclipse binaries + + -- Emmet Hikory Thu, 11 Feb 2010 02:45:42 +0900 + swt-gtk (3.5.1-2) unstable; urgency=low * debian/control: diff -Nru swt-gtk-3.5.1/debian/control swt-gtk-3.5.1+versionbump/debian/control --- swt-gtk-3.5.1/debian/control 2010-09-18 10:56:56.000000000 +0300 +++ swt-gtk-3.5.1+versionbump/debian/control 2010-09-18 10:56:57.000000000 +0300 @@ -1,7 +1,8 @@ Source: swt-gtk Section: libs Priority: optional -Maintainer: Adrian Perez +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Adrian Perez DM-Upload-Allowed: yes Build-Depends: default-jdk, gcj-native-helper, libgnomeui-dev, libxtst-dev, xulrunner-dev, libxcb-render-util0-dev, libxt-dev,