[pkg-java] r5919 - trunk/eclipse/debian

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-03-01 13:45:33 +0000 (Sat, 01 Mar 2008)
New Revision: 5919

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/rules
Log:
- Renamed Packages with version number in name.

Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2008-03-01 13:37:00 UTC (rev 5918)
+++ trunk/eclipse/debian/changelog	2008-03-01 13:45:33 UTC (rev 5919)
@@ -1,6 +1,7 @@
 eclipse (3.3.2-1) UNRELEASED; urgency=low
 
   * New upstream version.
+    - Renamed Packages with version number in name.
   * Suppress warnings from javac.
   * Make Debian version injection work more reliable.
 

Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules	2008-03-01 13:37:00 UTC (rev 5918)
+++ trunk/eclipse/debian/rules	2008-03-01 13:45:33 UTC (rev 5919)
@@ -10,10 +10,10 @@
 export DH_OPTIONS =
 export SHELL = /bin/bash
 
-DEB_GCJ_PACKAGES := eclipse-rcp eclipse-platform eclipse-jdt eclipse-pde libswt3.2-gtk
+DEB_GCJ_PACKAGES := eclipse-rcp eclipse-platform eclipse-jdt eclipse-pde libswt3.3-gtk
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-# The ppc64 port in eclipse 3.2 is incomplete.
+# The ppc64 port in eclipse 3.3 is incomplete.
 ECLIPSE_UNOFFICIAL_PLATFORMS := _ppc64_ _sparc_ _sparc64_ _s390_ _hppa_
 
 enable_native := no
@@ -68,7 +68,7 @@
 
 SOURCE_VERSION=$(shell head -1 debian/changelog | sed -e 's/^.*(\(.*\)).*$$/\1/')
 UPSTREAM_VERSION=$(shell echo $(SOURCE_VERSION) | sed -e 's/-.*$$//')
-REL=v3236
+REL=v3347
 
 export JAVA_HOME=/usr/lib/jvm/java-gcj
 
@@ -340,7 +340,7 @@
 
 ifneq (,$(findstring _$(ECLIPSE_PLATFORM)_,$(ECLIPSE_UNOFFICIAL_PLATFORMS)))
 	## Nasty hack to get support for ppc64, s390{,x}, sparc{,64} and hppa
-	# there is only partial support for ppc64 in 3.2 so we have to remove this 
+	# there is only partial support for ppc64 in 3.3 so we have to remove this 
 	# partial support to get the replacemnt hack to work
 	find source-tree -name \*ppc64\* | xargs rm -r
 	# remove ppc64 support from features/org.eclipse.platform.source/feature.xml
@@ -535,9 +535,9 @@
 	# Version-less SWT Jar links.
 	mkdir -p $(DEBIAN_TMP)/usr/lib/java && \
 	cd $(DEBIAN_TMP)/usr/lib/java && \
-	ln -sf ../eclipse/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_PLATFORM)_$(UPSTREAM_VERSION).$(REL).jar swt3.2-gtk.jar && \
-	ln -sf swt3.2-gtk.jar swt-gtk.jar && \
-	ln -sf swt3.2-gtk.jar swt.jar
+	ln -sf ../eclipse/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_PLATFORM)_$(UPSTREAM_VERSION).$(REL).jar swt3.3-gtk.jar && \
+	ln -sf swt3.3-gtk.jar swt-gtk.jar && \
+	ln -sf swt3.3-gtk.jar swt.jar
 
 	# Missing permissions.
 	chmod a+x $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/bin/ant
@@ -658,17 +658,17 @@
 	dh_compress
 	dpkg-shlibdeps \
 		-dDepends \
-			debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-gtk-3236.so \
-			debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-atk-gtk-3236.so \
-			debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-awt-gtk-3236.so \
-			debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-cairo-gtk-3236.so \
-			debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-pi-gtk-3236.so \
+			debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-gtk-3347.so \
+			debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-atk-gtk-3347.so \
+			debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-awt-gtk-3347.so \
+			debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-cairo-gtk-3347.so \
+			debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-pi-gtk-3347.so \
 		-dRecommends \
-			debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-gnome-gtk-3236.so \
-			debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-mozilla-gtk-3236.so \
-			debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-glx-gtk-3236.so \
-		-Tdebian/libswt3.2-gtk-jni.substvars
-	dh_shlibdeps -Nlibswt3.2-gtk-jni
+			debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-gnome-gtk-3347.so \
+			debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-mozilla-gtk-3347.so \
+			debian/libswt3.3-gtk-jni/usr/lib/jni/libswt-glx-gtk-3347.so \
+		-Tdebian/libswt3.3-gtk-jni.substvars
+	dh_shlibdeps -Nlibswt3.3-gtk-jni
 	dh_makeshlibs
 	dh_installdeb
 	dh_gencontrol
@@ -698,7 +698,7 @@
 	done
 
 	# TODO: Is this the second time to do this?
-	@for package in libswt3.2-gtk; do \
+	@for package in libswt3.3-gtk; do \
 		echo "generating classmaps for $${package} ... "; \
 		mkdir -p debian/$${package}-gcj/usr/share/gcj-$(GCJ_VERSION)/classmap.d; \
 		if test -d debian/$${package}-java/$(ECLIPSE_HOME)/plugins; then \