[SCM] Debian packaging for swt-gtk. branch, master, updated. debian/3.4.2-3-21-g3546439

Adrian Perez adrianperez-guest at alioth.debian.org
Mon Dec 7 15:57:47 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  3546439bbd09a10d77cc243dc034ddc495fc7d0a (commit)
       via  c4f298b3f5ac2408c20bf5dceb0cc975d88558a0 (commit)
       via  30c228625c7c48aeb5e59c20a922f32676c809a9 (commit)
       via  7c5b8d195b23e5e601780028968e5591212dc0be (commit)
       via  ba07b93773ce2b7003b7e6f15fea13494dc788be (commit)
      from  6a0e829256e04e6a92a314a338483018952bb5fa (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 3546439bbd09a10d77cc243dc034ddc495fc7d0a
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date:   Mon Dec 7 10:23:29 2009 -0500

    Release 3.5.1-1 to unstable.

commit c4f298b3f5ac2408c20bf5dceb0cc975d88558a0
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date:   Sun Dec 6 23:29:41 2009 -0500

    debian/rules: Fix default-java path around AWT_LIB_PATH.

commit 30c228625c7c48aeb5e59c20a922f32676c809a9
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date:   Sun Dec 6 23:24:45 2009 -0500

    debian/control: Remove "Conflicts", package should live with eclipse.

commit 7c5b8d195b23e5e601780028968e5591212dc0be
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date:   Sun Dec 6 23:23:57 2009 -0500

    debian/control: Allow DM-Uploads.

commit ba07b93773ce2b7003b7e6f15fea13494dc788be
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date:   Sun Dec 6 23:14:21 2009 -0500

    Update packaging for New Upstream version 3.5.1
    
    * debian/control:
      - Bump binary package versions in name.
    * Update alternatives.
    * debian/Makefile: Update RELEASE.
    * debian/java-config/*: Update JARS.
    * debian/patches: Refresh patches.

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

Summary of changes:
 debian/changelog                          |   15 +++++----
 debian/control                            |    8 +----
 debian/java-config/libswt-gtk-3.5-java    |    2 +-
 debian/patches/common/01-make_linux.patch |   45 +++++-----------------------
 debian/rules                              |    2 +-
 5 files changed, 20 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f795fd..717fd1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
-swt-gtk (3.5.1-1~1.gbp0a3f85) UNRELEASED; urgency=low
+swt-gtk (3.5.1-1) unstable; urgency=low
 
-  ** SNAPSHOT build @0a3f850e24cad4b963bd8f17cc5d61fc84281088 **
-
-  * New upstream release. Closes: #XXXXX.
-  * debian/control: Add Vcs-* fields for Git repository.
-  * debian/copyright: Minor updates.
+  * New upstream release. Closes: #558663.
+  * debian/control: 
+    - Add Vcs-* fields for Git repository.
+    - Allow DM-Uploads.
+    - Remove "Conflicts", package should live with eclipse.
   * debian/rules: Fix default-java path around AWT_LIB_PATH.
+  * debian/copyright: Minor update.
 
- -- Adrian Perez <adrianperez.deb at gmail.com>  Mon, 30 Nov 2009 23:13:20 -0500
+ -- Adrian Perez <adrianperez.deb at gmail.com>  Mon, 07 Dec 2009 10:22:24 -0500
 
 swt-gtk (3.4.2-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 6929a35..56f8655 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: swt-gtk
 Section: libs
 Priority: optional
 Maintainer: Adrian Perez <adrianperez.deb at gmail.com>
+DM-Upload-Allowed: yes
 Build-Depends: default-jdk-builddep, libgnomeui-dev, libxtst-dev,
  xulrunner-dev, libxcb-render-util0-dev, libxt-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
@@ -15,7 +16,7 @@ Package: libswt-gtk-3.5-java
 Architecture: any
 Section: java
 Depends: libswt-gtk-3.5-jni (= ${binary:Version}), ${misc:Depends}
-Suggests: libswt-gtk-3.4-java-gcj
+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
@@ -27,7 +28,6 @@ Package: libswt-gtk-3.5-jni
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: libswt-gnome-gtk-3.5-jni
-Conflicts: libswt3.4-gtk-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
@@ -38,7 +38,6 @@ Description: Standard Widget Toolkit for GTK+ JNI library
 Package: libswt-gnome-gtk-3.5-jni
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libswt3.4-gtk-jni 
 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
@@ -49,7 +48,6 @@ Description: Standard Widget Toolkit for GTK+ GNOME JNI library
 Package: libswt-mozilla-gtk-3.5-jni
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libswt3.4-gtk-jni
 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
@@ -60,7 +58,6 @@ Description: Standard Widget Toolkit for GTK+ Mozilla JNI library
 Package: libswt-cairo-gtk-3.5-jni
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libswt3.4-gtk-jni
 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
@@ -71,7 +68,6 @@ Description: Standard Widget Toolkit for GTK+ Cairo JNI library
 Package: libswt-glx-gtk-3.5-jni
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libswt3.4-gtk-jni
 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
diff --git a/debian/java-config/libswt-gtk-3.5-java b/debian/java-config/libswt-gtk-3.5-java
index 452af3a..f4ad156 100644
--- a/debian/java-config/libswt-gtk-3.5-java
+++ b/debian/java-config/libswt-gtk-3.5-java
@@ -1 +1 @@
-JARS=/usr/lib/java/swt-gtk-3.4.2.jar
+JARS=/usr/lib/java/swt-gtk-3.5.1.jar
diff --git a/debian/patches/common/01-make_linux.patch b/debian/patches/common/01-make_linux.patch
index 2c83d26..fc2f715 100644
--- a/debian/patches/common/01-make_linux.patch
+++ b/debian/patches/common/01-make_linux.patch
@@ -1,35 +1,7 @@
-diff --git a/.topdeps b/.topdeps
-new file mode 100644
-index 0000000..1f7391f
---- /dev/null
-+++ b/.topdeps
-@@ -0,0 +1 @@
-+master
-diff --git a/.topmsg b/.topmsg
-new file mode 100644
-index 0000000..b315ddc
---- /dev/null
-+++ b/.topmsg
-@@ -0,0 +1,6 @@
-+From: Adrian Perez <adrianperez.deb at gmail.com>
-+Subject: [PATCH] debian/makefile
-+
-+Tweak Linux Makefile.
-+
-+Signed-off-by: Adrian Perez <adrianperez.deb at gmail.com>
-diff --git a/make_linux.mak b/make_linux.mak
-index c1bc1a1..f410762 100644
---- a/make_linux.mak
-+++ b/make_linux.mak
-@@ -50,6 +50,7 @@ GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthrea
- 
- CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
- 
-+AWT_LIB_PATH=/usr/lib/jvm/default-java/lib
- AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared
- 
- ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0`
-@@ -64,6 +65,7 @@ GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm
+diff -Nur -x '*.orig' -x '*~' swt-gtk/make_linux.mak swt-gtk.new/make_linux.mak
+--- swt-gtk/make_linux.mak	2011-12-06 19:13:57.054148957 -0500
++++ swt-gtk.new/make_linux.mak	2011-12-06 20:07:00.554197279 -0500
+@@ -64,6 +64,7 @@
  # Uncomment for Native Stats tool
  #NATIVE_STATS = -DNATIVE_STATS
  
@@ -37,20 +9,19 @@ index c1bc1a1..f410762 100644
  MOZILLACFLAGS = -O \
  	-DSWT_VERSION=$(SWT_VERSION) \
  	$(NATIVE_STATS) \
-@@ -76,8 +78,11 @@ MOZILLACFLAGS = -O \
+@@ -76,8 +77,10 @@
  	-I. \
  	-I$(JAVA_HOME)/include \
  	-I$(JAVA_HOME)/include/linux \
 +	`pkg-config --cflags libxul-embedding` \
  	${SWT_PTR_CFLAGS}
 -MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
-+
 +MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic \
-+	`pkg-config --libs libxul-embedding`
++ 	`pkg-config --libs libxul-embedding`
  MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
  	-DNO__1XPCOMGlueStartup \
  	-DNO__1XPCOMGlueLoadXULFunctions \
-@@ -101,7 +106,7 @@ XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomx
+@@ -101,7 +104,7 @@
  XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
  GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
  
@@ -59,7 +30,7 @@ index c1bc1a1..f410762 100644
  		-DSWT_VERSION=$(SWT_VERSION) \
  		$(NATIVE_STATS) \
  		-DLINUX -DGTK \
-@@ -111,6 +116,7 @@ CFLAGS = -O -Wall \
+@@ -111,6 +114,7 @@
  		${SWT_PTR_CFLAGS}
  LIBS = -shared -fPIC
  
diff --git a/debian/rules b/debian/rules
index f0b6fa9..9dd3333 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), powerpc))
 	AWT_LIB_DIR = ppc
 endif 
 
-DEB_MAKE_INVOKE += -DAWT_LIB_PATH=/usr/lib/jvm/default-java/lib/\
+DEB_MAKE_INVOKE += -DAWT_LIB_PATH=/usr/lib/jvm/default-java/jre/lib/\
 	$(AWT_LIB_DIR)
 
 include /usr/share/cdbs/1/rules/simple-patchsys.mk


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

More information about the pkg-java-commits mailing list