r1878 - trunk/eclipse/debian

[Michael Koch]

Author: mkoch
Date: 2006-02-08 11:27:27 +0000 (Wed, 08 Feb 2006)
New Revision: 1878

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/rules
Log:
Determine upstream version and use a variable containing it everywhere.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-02-08 10:52:17 UTC (rev 1877)
+++ trunk/eclipse/debian/changelog	2006-02-08 11:27:27 UTC (rev 1878)
@@ -33,12 +33,14 @@
   * debian/extra/links.txt, debian/extra/package-links.txt: Adjust links for
     libmx4j-java >= 2.1.1-3.
   * debian/control.in: Make eclipse package Architure: any (not all).
+  * debian/rules: Determine upstream version and use a variable containing it
+    everywhere.
   * Added watch file.
 
   [ Matthias Klose ]
   * Add support to build using firefox-dev (turned off by default).
 
- -- Michael Koch <konqueror at gmx.de>  Wed,  8 Feb 2006 07:16:22 +0000
+ -- Michael Koch <konqueror at gmx.de>  Wed,  8 Feb 2006 12:32:41 +0000
 
 eclipse (3.1.1-8) unstable; urgency=low
 

Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules	2006-02-08 10:52:17 UTC (rev 1877)
+++ trunk/eclipse/debian/rules	2006-02-08 11:27:27 UTC (rev 1878)
@@ -39,6 +39,7 @@
 BUILD_TREE=$(CURDIR)/build-tree
 
 SOURCE_VERSION=$(shell head -1 debian/changelog | sed -e 's/^.*(\(.*\)).*$$/\1/')
+UPSTREAM_VERSION=$(shell echo $(SOURCE_VERSION) | sed -e 's/-.*$$//')
 
 # GCJ configuration
 # GCJ_RUN		command line to launch gcj
@@ -387,7 +388,7 @@
 	# extract the jdtCompilerAdapter.jar file
 	mkdir -p $(DEBIAN_TMP)/usr/share/ant/lib
 	cd $(DEBIAN_TMP)/usr/share/ant/lib && \
-		jar xf $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.jdt.core_3.1.2.jar jdtCompilerAdapter.jar
+		jar xf $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.jdt.core_$(UPSTREAM_VERSION).jar jdtCompilerAdapter.jar
 	
 	# Builds any Debian-specific extra files.
 	
@@ -395,7 +396,7 @@
 	
 	# Put debian version into about.mappings of org.eclipse.sdk to show it
 	# in Eclispe about dialog.
-	plugin_dir=$(DEBIAN_TMP)/usr/share/eclipse/plugins/org.eclipse.sdk_3.1.2 ; \
+	plugin_dir=$(DEBIAN_TMP)/usr/share/eclipse/plugins/org.eclipse.sdk_$(UPSTREAM_VERSION) ; \
 	sed -e "s/\(0=.*\)/\1 ($(DISTRIBUTION) version: $(SOURCE_VERSION))/" < $$plugin_dir/about.mappings > $$plugin_dir/about.mappings.tmp ; \
 	mv $$plugin_dir/about.mappings.tmp $$plugin_dir/about.mappings
 	
@@ -458,8 +459,8 @@
 	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/LICENSE.dom.txt
 	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/LICENSE.sax.txt
 	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.tomcat_*/mx4j.license
-	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_3.1.2/src/org.apache.ant_*/LICENSE.sax.txt
-	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_3.1.2/src/org.eclipse.tomcat_*/mx4j.license
+	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_$(UPSTREAM_VERSION)/src/org.apache.ant_*/LICENSE.sax.txt
+	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_$(UPSTREAM_VERSION)/src/org.eclipse.tomcat_*/mx4j.license
 	
 	# Move architecture dependent files from ECLIPSE_HOME into
 	# ECLIPSE_ARCH. All non-moved files will be symlinked instead.