Please merge swt-gtk 3.7-1 (main) from Debian unstable (main)

[أحمد المحمودي (Ahmed El-Mahmoudy)]

swt-gtk (3.7-1ubuntu1) oneiric; urgency=low

  * Merge from Debian unstable (LP: #796136), remaining changes:
    + Disable xulrunner support and enable webkit
      - update debian/control
      - update debian/Makefile
      - update debian/rules
      - remove debian/libswt-mozilla-gtk-3-jni.install
  * Dropped changes that got applied upstream:
    + Fix a missing include for the webkit JNI
    + Add patch to fix webkit linkage
  * Other dropped changes:
    + Add debian/patches/common/03-force_webkit.patch
    + Ensure that dpkg-shlibdeps can find libgcj_bc.so.1

 -- أحمد المحمودي (Ahmed El-Mahmoudy) <email address hidden> Fri, 01 Jul 2011 10:03:06 +0200

swt-gtk (3.7-1) unstable; urgency=low

  * New upstream release.
  * Mass package rename 3.6[.2] => 3 (Use major version only).
  * Updated arch64.diff patch for new upstream release.
  * Removed 02-webkit_linkage and 04-fix-webkit-includes patches as they got
    applied upstream.
  * debian/control: Bumped Standards-Version to 3.9.2, no changes needed.
  * Added 01-as-needed.diff patch to use -Wl,--as-needed when linking
  * Added debian/libswt-gtk-3.7-java.lintian-overrides
  * Added debian/gbp.conf
  * debian/Makefile: Figure out the RELEASE from Debian changelog instead of
    hard-coding it.

 -- أحمد المحمودي (Ahmed El-Mahmoudy) <email address hidden> Tue, 28 Jun 2011 14:57:14 +0200

swt-gtk (3.6.2-1) unstable; urgency=low

  * New upstream release. (Closes: #592338)
  * debian/control, debian/Makefile, debian/libswt-webkit-gtk-3.6-jni.install:
    add WebKit package.
  * Dropped 02-bp-accessible-object.diff, since it is applied upstream.
  * debian/control: Set Maintainer to Debian Java Maintainers, and added
    Adrian and myself to Uploaders.
  * Updated 64/arch64.diff patch (from Ubuntu package)
  * Added common/02-webkit_linkage.patch patch from Ubuntu to fix linkage for
    WebKit (>= 1.3).
  * Added common/04-fix-webkit-includes.patch (based on a patch from Ubuntu),
    to fix a missing include for WebKit (>= 1.3) JNI.
  * debian/control: Put libswt-gtk-3.6-java-gcj in java section
  * Bump to compat level 8.

 -- أحمد المحمودي (Ahmed El-Mahmoudy) <email address hidden> Sat, 02 Apr 2011 10:48:43 +0200

[أحمد المحمودي (Ahmed El-Mahmoudy) (aelmahmoudy)]

Please note that I dropped this change: "Ensure that dpkg-shlibdeps can find libgcj_bc.so.1", as it is not needed with dpkg-dev 1.16 (as far as I understand), the build was successful with this diff dropped, please see build logs for amd64 & i386 archs:

https://launchpad.net/~aelmahmoudy/+archive/ppa/+build/2560256/+files/buildlog_ubuntu-oneiric-amd64.swt-gtk_3.6.2-1ubuntu1~ppa1_BUILDING.txt.gz

https://launchpad.net/~aelmahmoudy/+archive/ppa/+build/2560257/+files/buildlog_ubuntu-oneiric-i386.swt-gtk_3.6.2-1ubuntu1~ppa1_BUILDING.txt.gz

[Dave Walker (davewalker)]

Thanks أحمد for updating the diff!

Something that is very odd.. The orig tarball differs between Ubuntu archive and Debian archive.. :/

md5sums:
724796e8accf5e62c944752f85f15197 debian/swt-gtk_3.6.2.orig.tar.gz
9508a57034c051a1b51cd22df1ed9c65 ubuntu/swt-gtk_3.6.2.orig.tar.gz

[أحمد المحمودي (Ahmed El-Mahmoudy) (aelmahmoudy)]

On Fri, Jun 24, 2011 at 12:07:09PM -0000, Dave Walker wrote:
> Thanks أحمد for updating the diff!
>
> Something that is very odd.. The orig tarball differs between Ubuntu
> archive and Debian archive.. :/
>
> md5sums:
> 724796e8accf5e62c944752f85f15197 debian/swt-gtk_3.6.2.orig.tar.gz
> 9508a57034c051a1b51cd22df1ed9c65 ubuntu/swt-gtk_3.6.2.orig.tar.gz
---end quoted text---

That's odd indeed, because I did use Ubuntu's orig tarball when I
prepared the package for Debian.

It seems that the sponsor recreated the orig tarball instead of using
the one I committed to git.

Anyways, I diff'ed both orig tarballs (after extraction), and they are
the same. So if there is no way to use the Debian tarball, then just use
the Ubuntu tarball as follows. To elaborate, I imagine that you do
something like:

pull-debian-source swt-gtk, then apply my patch, then: debuild -S -rfakeroot

Before running debuild, just fetch the orig tarball from Ubuntu, and
replace Debian tarball with it.

--
 ‎أحمد المحمودي (Ahmed El-Mahmoudy)
  Digital design engineer
 GPG KeyID: 0xEDDDA1B7
 GPG Fingerprint: 8206 A196 2084 7E6D 0DF8 B176 BC19 6A94 EDDD A1B7

[أحمد المحمودي (Ahmed El-Mahmoudy) (aelmahmoudy)]

I am working on SWT 3.7 packaging now. So this merge can wait.

[أحمد المحمودي (Ahmed El-Mahmoudy) (aelmahmoudy)]

Please note that this will require transitions in packages depending on swt-gtk

[Benjamin Drung (bdrung)]

I recommend to use wrap-and-sort.

[Launchpad Janitor (janitor)]

This bug was fixed in the package swt-gtk - 3.7-1ubuntu1

---------------
swt-gtk (3.7-1ubuntu1) oneiric; urgency=low

  * Merge from Debian unstable (LP: #796136), remaining changes:
    + Disable xulrunner support and enable webkit
      - update debian/control
      - update debian/Makefile
      - update debian/rules
      - remove debian/libswt-mozilla-gtk-3-jni.install
  * Dropped changes that got applied upstream:
    + Fix a missing include for the webkit JNI
    + Add patch to fix webkit linkage
  * Other dropped changes:
    + Add debian/patches/common/03-force_webkit.patch
    + Ensure that dpkg-shlibdeps can find libgcj_bc.so.1

swt-gtk (3.7-1) unstable; urgency=low

  * New upstream release.
  * Mass package rename 3.6[.2] => 3 (Use major version only).
  * Updated arch64.diff patch for new upstream release.
  * Removed 02-webkit_linkage and 04-fix-webkit-includes patches as they got
    applied upstream.
  * debian/control: Bumped Standards-Version to 3.9.2, no changes needed.
  * Added 01-as-needed.diff patch to use -Wl,--as-needed when linking
  * Added debian/libswt-gtk-3.7-java.lintian-overrides
  * Added debian/gbp.conf
  * debian/Makefile: Figure out the RELEASE from Debian changelog instead of
    hard-coding it.

swt-gtk (3.6.2-1) unstable; urgency=low

  * New upstream release. (Closes: #592338)
  * debian/control, debian/Makefile, debian/libswt-webkit-gtk-3.6-jni.install:
    add WebKit package.
  * Dropped 02-bp-accessible-object.diff, since it is applied upstream.
  * debian/control: Set Maintainer to Debian Java Maintainers, and added
    Adrian and myself to Uploaders.
  * Updated 64/arch64.diff patch (from Ubuntu package)
  * Added common/02-webkit_linkage.patch patch from Ubuntu to fix linkage for
    WebKit (>= 1.3).
  * Added common/04-fix-webkit-includes.patch (based on a patch from Ubuntu),
    to fix a missing include for WebKit (>= 1.3) JNI.
  * debian/control: Put libswt-gtk-3.6-java-gcj in java section
  * Bump to compat level 8.
 -- ALEFHAHMEEMDAL ALEFLAMMEEMHAHMEEMWAWDALYEH (Ahmed El-Mahmoudy) <email address hidden> Fri, 01 Jul 2011 23:50:46 +0200