[pkg-java] r2906 - in trunk/eclipse-cdt/debian: . patches

[Vladimír Lapáček]

Author: vladimir-guest
Date: 2007-01-03 23:43:17 +0100 (Wed, 03 Jan 2007)
New Revision: 2906

Removed:
   trunk/eclipse-cdt/debian/lintian/
Modified:
   trunk/eclipse-cdt/debian/changelog
   trunk/eclipse-cdt/debian/control
   trunk/eclipse-cdt/debian/eclipse-cdt.install
   trunk/eclipse-cdt/debian/patches/eclipse-cdt-no-tests.patch
   trunk/eclipse-cdt/debian/rules
Log:
eclipse-cdt: new upstream 3.2
removed lintian files, no more needed

Modified: trunk/eclipse-cdt/debian/changelog
===================================================================
--- trunk/eclipse-cdt/debian/changelog	2007-01-03 13:42:01 UTC (rev 2905)
+++ trunk/eclipse-cdt/debian/changelog	2007-01-03 22:43:17 UTC (rev 2906)
@@ -1,3 +1,10 @@
+eclipse-cdt (3.1.1-0ubuntu1) feisty; urgency=low
+
+  * New upstream release
+  * Updated to use Eclipse 3.2.1
+
+ -- Vladimír Lapáček <vladimir.lapacek at gmail.com>  Wed,  6 Dec 2006 22:58:10 +0100
+
 eclipse-cdt (3.0.1-3) unstable; urgency=low
 
   * debian/rules: Adjusted for current eclipse (Closes: #345371).

Modified: trunk/eclipse-cdt/debian/control
===================================================================
--- trunk/eclipse-cdt/debian/control	2007-01-03 13:42:01 UTC (rev 2905)
+++ trunk/eclipse-cdt/debian/control	2007-01-03 22:43:17 UTC (rev 2906)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>, Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), eclipse (>= 3.1.1-5), java-gcj-compat-dev
+Build-Depends: debhelper (>> 4.2), eclipse (>= 3.2.1), java-gcj-compat-dev
 Standards-Version: 3.7.2
 
 Package: eclipse-cdt

Modified: trunk/eclipse-cdt/debian/eclipse-cdt.install
===================================================================
--- trunk/eclipse-cdt/debian/eclipse-cdt.install	2007-01-03 13:42:01 UTC (rev 2905)
+++ trunk/eclipse-cdt/debian/eclipse-cdt.install	2007-01-03 22:43:17 UTC (rev 2906)
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/eclipse usr/lib
-debian/lintian/eclipse-cdt usr/share/lintian/overrides/
+debian/tmp/usr/lib/eclipse/features usr/lib/eclipse
+debian/tmp/usr/lib/eclipse/plugins usr/lib/eclipse

Modified: trunk/eclipse-cdt/debian/patches/eclipse-cdt-no-tests.patch
===================================================================
--- trunk/eclipse-cdt/debian/patches/eclipse-cdt-no-tests.patch	2007-01-03 13:42:01 UTC (rev 2905)
+++ trunk/eclipse-cdt/debian/patches/eclipse-cdt-no-tests.patch	2007-01-03 22:43:17 UTC (rev 2906)
@@ -6,6 +6,6 @@
  	
 -	<target name="build" depends="zips,test"/>
 +	<target name="build" depends="zips"/>
+	<target name="nightly" depends="tag,zips,test,copy"/>
  	<target name="cdtbuild" depends="zips,test,upload"/>
  	
- 	<target name="init">

Modified: trunk/eclipse-cdt/debian/rules
===================================================================
--- trunk/eclipse-cdt/debian/rules	2007-01-03 13:42:01 UTC (rev 2905)
+++ trunk/eclipse-cdt/debian/rules	2007-01-03 22:43:17 UTC (rev 2906)
@@ -6,13 +6,13 @@
 export LC_ALL=C
 CURDIR=$(shell pwd)
 
-SOURCE=$(shell echo upstream/*.tar.gz)
+SOURCE=$(shell echo upstream/*.tar.bz2)
 SOURCE_TREE=source-tree
 JAVA_HOME=/usr/lib/jvm/java-gcj
 JAVA_RUN=$(JAVA_HOME)/bin/java -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.0/classmap.db
 ANT_RUN=ant
 homedir=$(CURDIR)/home
-ECLIPSE_BASE=/usr/share/eclipse
+ECLIPSE_BASE=/usr/lib/eclipse
 ECLIPSE_PLATFORM=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 RELENG_PLUGIN=org.eclipse.cdt.releng
@@ -59,7 +59,7 @@
 	# The building happens inside the source-tree directory. This makes
 	# cleanup much easier.
 	mkdir -p "$(SOURCE_TREE)"
-	(cd "$(SOURCE_TREE)" && tar xzf ../"$(SOURCE)" > /dev/null)
+	(cd "$(SOURCE_TREE)" && tar xjf ../"$(SOURCE)" > /dev/null)
 	
 	touch uncompress-stamp
 	
@@ -118,7 +118,7 @@
 		-DjavacFailOnError=true \
 		-DdontUnzip=true \
 		-DbaseLocation=$(ECLIPSE_BASE) \
-		-Dpde.build.scripts=$(ECLIPSE_BASE)/plugins/org.eclipse.pde.build_3.1.2/scripts \
+		-Dpde.build.scripts=$(ECLIPSE_BASE)/plugins/org.eclipse.pde.build_3.2.1.r321_v20060823/scripts \
 		-DskipFetch=true \
 		-Dconfigs="linux,gtk,$(ECLIPSE_PLATFORM)" \
 		-Dbaseos=linux \