[SCM] Debian packaging for swt-gtk. branch, master, updated. debian/3.5.1-2.1-7-g96dd699

[Adrian Perez]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Debian packaging for swt-gtk.".

The branch, master has been updated
       via  96dd69942109b3a340092e4e17dee5ab7b247593 (commit)
       via  821aded3a7556faa398c56d1ca3be29a8197dea3 (commit)
       via  734c1a38121db8ab9e4aaf0274023eb91052ec4b (commit)
       via  9ff3329c82c1565f7cce6bbf31c71be673f0ff79 (commit)
       via  f3e1f1d3de90a4fc8798bf9e1f076a82bdcfd850 (commit)
       via  1e8a2fd94d908758f726c4b3d3ae28412ff68596 (commit)
      from  482dc779bf64a1df17b722e34ea96e561487cdef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 96dd69942109b3a340092e4e17dee5ab7b247593
Author: Adrian Perez <blackxored at debian.org>
Date:   Tue Sep 14 18:16:47 2010 -0400

    Prepare 3.5.1-3 to unstable

commit 821aded3a7556faa398c56d1ca3be29a8197dea3
Author: Adrian Perez <blackxored at debian.org>
Date:   Tue Sep 14 19:00:32 2010 -0400

    Rename accessible-object patch

commit 734c1a38121db8ab9e4aaf0274023eb91052ec4b
Author: Adrian Perez <blackxored at debian.org>
Date:   Tue Sep 14 18:28:24 2010 -0400

    Backport AccessibleObject.getAccessibleObject() patch

commit 9ff3329c82c1565f7cce6bbf31c71be673f0ff79
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date:   Mon Sep 13 19:27:57 2010 -0400

    debian/rules: Support SH4 builds. Closes: 593178
    
    Thanks: Nobuhiro Iwamatsu

commit f3e1f1d3de90a4fc8798bf9e1f076a82bdcfd850
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date:   Mon Sep 13 19:25:17 2010 -0400

    debian/copyright: Minor updates

commit 1e8a2fd94d908758f726c4b3d3ae28412ff68596
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date:   Mon Sep 13 19:17:23 2010 -0400

    debian/control: Update maintainer e-mail address

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                |   15 +++++++++++++++
 debian/control                                  |    2 +-
 debian/copyright                                |   10 +++++++++-
 debian/patches/common/bp-accessible-object.diff |   16 ++++++++++++++++
 debian/rules                                    |    4 ++++
 5 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0fec909..1ed9ec7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+swt-gtk (3.5.1-3) unstable; urgency=low
+
+  * Acknowledge AWL-forced NMU. Thanks: Ahmed El-Mahmoudy.
+  * debian/control: Update maintainer e-mail address.
+  * debian/copyright: Minor updates.
+  * debian/rules: Support SH4 builds. Closes: #593178.
+    Thanks: Nobuhiro Iwamatsu.
+  * debian/patches:
+    - Backport AccessibleObject.getAccessibleObject() upstream
+      patch. Closes: #563046.
+  * Partly revert removal of alternatives scripts.
+    Closes: #594641, #568940. Thanks: Ahmed El-Mahmoudy.
+
+ -- Adrian Perez <blackxored at debian.org>  Tue, 14 Sep 2010 18:10:36 -0400
+
 swt-gtk (3.5.1-2.1) unstable; urgency=low
 
   * NMU
diff --git a/debian/control b/debian/control
index 37b0c44..89ec92b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: swt-gtk
 Section: libs
 Priority: optional
-Maintainer: Adrian Perez <adrianperez.deb at gmail.com>
+Maintainer: Adrian Perez <blackxored at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: default-jdk, gcj-native-helper, libgnomeui-dev, libxtst-dev,
  xulrunner-dev, libxcb-render-util0-dev, libxt-dev,
diff --git a/debian/copyright b/debian/copyright
index 5403df1..602cfa1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ Copyright: 2000-2009, IBM Corporation and others
 License: EPL-1.0
 
 Files: debian/*
-Copyright: 2009, Adrian Perez <adrianperez.deb at gmail.com>
+Copyright: 2009-2010, Adrian Perez <adrianperez.deb at gmail.com>
            2004-2009, Shaun Jackman <sjackman at debian.org>
 License: GPL-3+
 
@@ -38,6 +38,14 @@ Files: org/eclipse/swt/internal/gtk/[^X]*.java
 Copyright: 2000-2007, IBM Corporation and others
 License: LGPL-2.1
 
+Files: org/eclipse/swt/internal/gnome/*
+Copyright: 2000-2008, IBM Corporation and others
+License: LGPL-2.1
+
+Files: org/eclipse/swt/internal/cde/*
+Copyright: 2000-2008, IBM Corporation and others
+License: LGPL-2.1
+
 Files: org/eclipse/swt/internal/image/JPEGFileFormat.java
 Copyright: 2000-2008, IBM Corporation and others
 License: other
diff --git a/debian/patches/common/bp-accessible-object.diff b/debian/patches/common/bp-accessible-object.diff
new file mode 100644
index 0000000..cdbe52e
--- /dev/null
+++ b/debian/patches/common/bp-accessible-object.diff
@@ -0,0 +1,16 @@
+Binary files swt-gtk/.git/index and swt-gtk.new/.git/index differ
+diff -Nur -x '*.orig' -x '*~' swt-gtk/org/eclipse/swt/accessibility/AccessibleObject.java swt-gtk.new/org/eclipse/swt/accessibility/AccessibleObject.java
+--- swt-gtk/org/eclipse/swt/accessibility/AccessibleObject.java	2010-09-13 13:31:45.687685180 -0400
++++ swt-gtk.new/org/eclipse/swt/accessibility/AccessibleObject.java	2010-09-14 18:26:56.111986733 -0400
+@@ -1176,7 +1176,10 @@
+	}
+
+	static AccessibleObject getAccessibleObject (int /*long*/ atkObject) {
+-		return (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
++		AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
++		if (object == null) return null;
++		if (object.accessible == null) return null;
++		return object;
+	}
+
+	AccessibleObject getChildByHandle (int /*long*/ handle) {
diff --git a/debian/rules b/debian/rules
index 90bed7b..02ce996 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,10 @@ endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH), powerpc))
 	AWT_LIB_DIR = ppc
+endif
+
+ifneq (,$(filter $(DEB_HOST_ARCH), sh4))
+	AWT_LIB_DIR = sh
 endif 
 
 export AWT_LIB_PATH=/usr/lib/jvm/default-java/jre/lib/$(AWT_LIB_DIR)


hooks/post-receive
-- 
Debian packaging for swt-gtk.