[SCM] Debian packaging for swt-gtk. branch, master, updated. debian/3.4.2-3-25-g2656d7d
Adrian Perez
adrianperez-guest at alioth.debian.org
Fri Dec 18 14:34:48 UTC 2009
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 2656d7d8f0f8f577422f268ca966f38649115548 (commit)
via 3a818efb5629c04989a1aa8da9b85c8cd3257428 (commit)
via b78c5fa6a2d1eb2656e94a7f1cb5e1769550b160 (commit)
via 5516dd3630f733eee080e43bdbd56029cbc24efc (commit)
from 3546439bbd09a10d77cc243dc034ddc495fc7d0a (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 2656d7d8f0f8f577422f268ca966f38649115548
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Thu Dec 17 22:48:46 2009 -0500
Prepare 3.5.1-2 upload to unstable
commit 3a818efb5629c04989a1aa8da9b85c8cd3257428
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Thu Dec 17 19:49:02 2009 -0500
Rename 64 bits patch to arch64.diff to be more concise.
commit b78c5fa6a2d1eb2656e94a7f1cb5e1769550b160
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Thu Dec 17 19:46:36 2009 -0500
debian/patches/make_jni64.diff: Fix 64 bits variable to pass new JNI64.
Remove old debian/patches/swt-ptr-size-64.patch.
-----------------------------------------------------------------------
Summary of changes:
debian/NEWS.Debian | 22 +++++++++
debian/README.Debian | 25 +++++-----
debian/changelog | 33 ++++++++++---
debian/control | 61 +++++++++++++----------
debian/libswt-gtk-3.5-java.links | 2 +
debian/libswt-gtk-3.5-java.postinst | 29 -----------
debian/libswt-gtk-3.5-java.prerm | 21 --------
debian/patches/64/{x86_64.diff => arch64.diff} | 0
debian/patches/64/make_jni64.diff | 13 +++++
debian/patches/64/swt-ptr-size-64.patch | 7 ---
10 files changed, 109 insertions(+), 104 deletions(-)
diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
new file mode 100644
index 0000000..2ee7a1d
--- /dev/null
+++ b/debian/NEWS.Debian
@@ -0,0 +1,22 @@
+swt-gtk (3.5.1-2) unstable; urgency=low
+
+ * Update packaging for being the only source of the SWT libraries in
+ Debian, effectively dropping the tight connection with the eclipse
+ package.
+ - Drop eclipse binary packages for SWT and maintain only the swt-gtk
+ generated packages.
+
+ - This was influenced by many arguments from different people, notably:
+
+ + Myself (swt-gtk maintainer and eclipse co-maintainer).
+ + Benjamin Drung and Niels Thykier (eclipse co-maintainers).
+ + Onkar Shinde.
+ + Maykel Koch.
+
+ - The main arguments is that this is a commonly used library which is used
+ more and more commonly outside the eclipse environment.
+ We don't want cases such as SWT being blocked by eclipse, or uploading
+ a new eclipse version for just including a SWT bugfix and viceversa,
+ among others.
+
+ -- Adrian Perez <adrianperez.deb at gmail.com> Thu, 17 Dec 2009 19:55:19 -0500
diff --git a/debian/README.Debian b/debian/README.Debian
index 7c4ae90..13bac1b 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,19 +1,20 @@
swt for Debian
-----------------
-This is the Debian version of the Standard Widget Toolkit (SWT) for GTK+.
+This is the Debian version of the Standard Widget Toolkit (SWT) for GTK+.
-The SWT libraries are maintained separately from the eclipse package,
-since is a bit outdated in Debian.
+The SWT libraries are maintained separately from the eclipse package.
-Currently, the full SWT distribution is provided by the following packages:
+Currently, the full SWT distribution is provided by the following packages
+(where X.Y is the current upstream version number):
- * libswt-cairo-gtk-3.4-jni: Cairo JNI libraries.
- * libswt-glx-gtk-3.4-jni: GLX JNI libraries.
- * libswt-gnome-gtk-3.4-jni: GNOME JNI Library.
- * libswt-gtk-3.4-java: SWT jar libraries.
- * libswt-gtk-3.4-java-gcj: native libraries built with gcj.
- * libswt-gtk-3.4-jni: JNI libraries.
- * libswt-mozilla-gtk-3.4-jni: Mozilla JNI libraries.
+ * libswt-cairo-gtk-X.Y-jni: Cairo JNI libraries.
+ * libswt-glx-gtk-X.Y-jni: GLX JNI libraries.
+ * libswt-gnome-gtk-X.Y-jni: GNOME JNI Library.
+ * libswt-gtk-X.Y-java: SWT JAR libraries.
+ * libswt-gtk-X.Y-java-gcj: native libraries built with gcj.
+ * libswt-gtk-X.Y-jni: SWT JNI libraries.
+ * libswt-mozilla-gtk-X.Y-jni: Mozilla JNI libraries.
+
+ -- Adrian Perez <adrianperez.deb at gmail.com>, Thu, 17 Dec 2009 20:00:30 -0500
- -- Adrian Perez <adrianperez.deb at gmail.com>, Mon, 6 Jul 2009 10:04:15 -0400
diff --git a/debian/changelog b/debian/changelog
index 717fd1e..5d34392 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,24 @@
+swt-gtk (3.5.1-2) unstable; urgency=low
+
+ * debian/control:
+ - libswt-gtk-3.5-jni: Specify which libraries are provided by package.
+ - Improve Descriptions.
+ * debian/patches:
+ - 64/make_jni64.diff: Fix 64 bits makefile variable, now passes JNI64.
+ - 64/swt-ptr-size-64.patch: Remove obsolete patch.
+ - 64/arch64.diff: Rename x86_64 to arch64 being more concise about archs.
+ * debian/{NEWS,README}.Debian:
+ - Note that swt-gtk will be the only source of SWT libraries.
+ * debian/libswt-gtk-3.5-java.{postinst,prerm}:
+ - Remove, since alternatives are no longer needed.
+ * debian/libswt-gtk-3.5-java.links: Add links for /usr/share/java.
+
+ -- Adrian Perez <adrianperez.deb at gmail.com> Thu, 17 Dec 2009 19:55:09 -0500
+
swt-gtk (3.5.1-1) unstable; urgency=low
* New upstream release. Closes: #558663.
- * debian/control:
+ * debian/control:
- Add Vcs-* fields for Git repository.
- Allow DM-Uploads.
- Remove "Conflicts", package should live with eclipse.
@@ -12,13 +29,13 @@ swt-gtk (3.5.1-1) unstable; urgency=low
swt-gtk (3.4.2-3) unstable; urgency=medium
- * debian/control:
+ * debian/control:
- Build-Depend on libxt-dev. Fixes FTBFS with openjdk. Closes: #542990.
- Update Standards-Version to 3.8.3.
- * debian/rules:
+ * debian/rules:
- Set makefile to debian/Makefile.
- Pass AWT_LIB_PATH dinamically to Makefile.
- * debian/copyright:
+ * debian/copyright:
- Update copyright holders and licenses.
- Use machine-readable format.
* debian/patches/01-make_linux.patch: Remove AWT_LIB_PATH from patch.
@@ -27,9 +44,9 @@ swt-gtk (3.4.2-3) unstable; urgency=medium
swt-gtk (3.4.2-2) unstable; urgency=low
- * Architecture-dependent package libswt-gtk-3.4-java installs to
+ * Architecture-dependent package libswt-gtk-3.4-java installs to
/usr/lib/java by policy.
- * Updated maintainer scripts and alternatives to reflect previous change.
+ * Updated maintainer scripts and alternatives to reflect previous change.
-- Adrian Perez <adrianperez.deb at gmail.com> Fri, 24 Jul 2009 12:26:59 -0400
@@ -58,8 +75,8 @@ swt-gtk (3.4.2-1) unstable; urgency=low
- Changed DEB_PATCHDIRS to include 'common' and arch-dependent patches.
* Fixed debian/watch file.
* Added README.Debian.
-
- -- Adrian Perez <adrianperez.deb at gmail.com> Mon, 6 Jul 2009 10:04:15 -0400
+
+ -- Adrian Perez <adrianperez.deb at gmail.com> Mon, 6 Jul 2009 10:04:15 -0400
swt-gtk (3.4-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 56f8655..1783a26 100644
--- a/debian/control
+++ b/debian/control
@@ -18,9 +18,10 @@ Section: java
Depends: libswt-gtk-3.5-jni (= ${binary:Version}), ${misc:Depends}
Suggests: libswt-gtk-3.5-java-gcj
Description: Standard Widget Toolkit for GTK+ Java library
- The SWT component is designed to provide efficient, portable access to
- the user-interface facilities of the operating systems on which it is
- implemented.
+ The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
+ programming language. SWT provides efficient, portable and fast access to
+ native controls and user interface facilities on the platforms where it has
+ been implemented.
.
This package includes the SWT JAR libraries.
@@ -29,19 +30,21 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: libswt-gnome-gtk-3.5-jni
Description: Standard Widget Toolkit for GTK+ JNI library
- The SWT component is designed to provide efficient, portable access to
- the user-interface facilities of the operating systems on which it is
- implemented.
+ The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
+ programming language. SWT provides efficient, portable and fast access to
+ native controls and user interface facilities on the platforms where it has
+ been implemented.
.
- This package includes the JNI libraries.
+ This package includes the JNI libraries (atk, awt, gtk, pi).
Package: libswt-gnome-gtk-3.5-jni
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Standard Widget Toolkit for GTK+ GNOME JNI library
- The SWT component is designed to provide efficient, portable access to
- the user-interface facilities of the operating systems on which it is
- implemented.
+ The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
+ programming language. SWT provides efficient, portable and fast access to
+ native controls and user interface facilities on the platforms where it has
+ been implemented.
.
This package includes the GNOME JNI library.
@@ -49,9 +52,10 @@ Package: libswt-mozilla-gtk-3.5-jni
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Standard Widget Toolkit for GTK+ Mozilla JNI library
- The SWT component is designed to provide efficient, portable access to
- the user-interface facilities of the operating systems on which it is
- implemented.
+ The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
+ programming language. SWT provides efficient, portable and fast access to
+ native controls and user interface facilities on the platforms where it has
+ been implemented.
.
This package includes the Mozilla JNI libraries.
@@ -59,9 +63,10 @@ Package: libswt-cairo-gtk-3.5-jni
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Standard Widget Toolkit for GTK+ Cairo JNI library
- The SWT component is designed to provide efficient, portable access to
- the user-interface facilities of the operating systems on which it is
- implemented.
+ The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
+ programming language. SWT provides efficient, portable and fast access to
+ native controls and user interface facilities on the platforms where it has
+ been implemented.
.
This package includes the Cairo JNI libraries.
@@ -69,23 +74,25 @@ Package: libswt-glx-gtk-3.5-jni
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Standard Widget Toolkit for GTK+ GLX JNI library
- The SWT component is designed to provide efficient, portable access to
- the user-interface facilities of the operating systems on which it is
- implemented.
+ The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
+ programming language. SWT provides efficient, portable and fast access to
+ native controls and user interface facilities on the platforms where it has
+ been implemented.
.
This package includes the GLX JNI libraries.
Package: libswt-gtk-3.5-java-gcj
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends},
- libswt-cairo-gtk-3.5-jni (= ${binary:Version}),
- libswt-glx-gtk-3.5-jni (= ${binary:Version}),
- libswt-gnome-gtk-3.5-jni (= ${binary:Version}),
- libswt-gtk-3.5-jni (= ${binary:Version}),
- libswt-mozilla-gtk-3.5-jni (= ${binary:Version})
+ libswt-cairo-gtk-3.5-jni (= ${binary:Version}),
+ libswt-glx-gtk-3.5-jni (= ${binary:Version}),
+ libswt-gnome-gtk-3.5-jni (= ${binary:Version}),
+ libswt-gtk-3.5-jni (= ${binary:Version}),
+ libswt-mozilla-gtk-3.5-jni (= ${binary:Version})
Description: Standard Widget Toolkit for GTK+ native library
- The SWT component is designed to provide efficient, portable access to
- the user-interface facilities of the operating systems on which it is
- implemented.
+ The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
+ programming language. SWT provides efficient, portable and fast access to
+ native controls and user interface facilities on the platforms where it has
+ been implemented.
.
This package contains a native library built using gcj.
diff --git a/debian/libswt-gtk-3.5-java.links b/debian/libswt-gtk-3.5-java.links
new file mode 100644
index 0000000..9cf8f76
--- /dev/null
+++ b/debian/libswt-gtk-3.5-java.links
@@ -0,0 +1,2 @@
+usr/lib/java/swt-gtk-3.5.1.jar usr/share/java/swt-gtk-3.5.1.jar
+usr/share/java/swt-gtk-3.5.1.jar usr/share/java/swt.jar
diff --git a/debian/libswt-gtk-3.5-java.postinst b/debian/libswt-gtk-3.5-java.postinst
deleted file mode 100644
index cd4c61f..0000000
--- a/debian/libswt-gtk-3.5-java.postinst
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-set -e
-
-case "$1" in
- configure)
- update-alternatives --install \
- /usr/share/java-config/libswt-3.5-java \
- libswt-3.5-java \
- /usr/share/java-config/libswt-gtk-3.5-java \
- 103
- update-alternatives --install \
- /usr/share/java/swt.jar \
- swt.jar \
- /usr/lib/java/swt-gtk-3.5.1.jar \
- 103
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libswt-gtk-3.5-java.prerm b/debian/libswt-gtk-3.5-java.prerm
deleted file mode 100644
index 9c3c03c..0000000
--- a/debian/libswt-gtk-3.5-java.prerm
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-set -e
-
-case "$1" in
- remove|upgrade|deconfigure)
- update-alternatives --remove libswt-3.5-java \
- /usr/share/java-config/libswt-gtk-3.5-java
- update-alternatives --remove swt.jar \
- /usr/lib/java/swt-gtk-3.5.1.jar
- ;;
- failed-upgrade)
- ;;
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/patches/64/x86_64.diff b/debian/patches/64/arch64.diff
similarity index 100%
rename from debian/patches/64/x86_64.diff
rename to debian/patches/64/arch64.diff
diff --git a/debian/patches/64/make_jni64.diff b/debian/patches/64/make_jni64.diff
new file mode 100644
index 0000000..32ea7fb
--- /dev/null
+++ b/debian/patches/64/make_jni64.diff
@@ -0,0 +1,13 @@
+diff --git a/make_linux.mak b/make_linux.mak
+index c1bc1a1..1629f7f 100644
+--- a/make_linux.mak
++++ b/make_linux.mak
+@@ -14,7 +14,7 @@
+ include make_common.mak
+
+ SWT_VERSION=$(maj_ver)$(min_ver)
+-
++SWT_PTR_CFLAGS=-DJNI64
+ # Define the various shared libraries to be build.
+ WS_PREFIX = gtk
+ SWT_PREFIX = swt
diff --git a/debian/patches/64/swt-ptr-size-64.patch b/debian/patches/64/swt-ptr-size-64.patch
deleted file mode 100644
index 77f5e61..0000000
--- a/debian/patches/64/swt-ptr-size-64.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- make_linux.mak.orig 2007-10-13 11:07:08.000000000 -0700
-+++ make_linux.mak 2007-10-13 11:15:01.000000000 -0700
-@@ -1,3 +1,4 @@
-+SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
- #*******************************************************************************
- # Copyright (c) 2000, 2007 IBM Corporation and others.
- # All rights reserved. This program and the accompanying materials
hooks/post-receive
--
Debian packaging for swt-gtk.
More information about the pkg-java-commits
mailing list