Author: tgg
Date: 2007-06-14 22:42:15 +0000 (Thu, 14 Jun 2007)
New Revision: 3652
Added:
trunk/eclipse-cdt/debian/patches/eclipse-cdt-build-linux.patch
trunk/eclipse-cdt/debian/patches/eclipse-cdt-only-sdk.patch
Modified:
trunk/eclipse-cdt/debian/changelog
trunk/eclipse-cdt/debian/rules
Log:
restore previously dropped eclipse-cdt-build-linux.patch
also create patch eclipse-cdt-only-sdk from FC, but don't apply it yet
Modified: trunk/eclipse-cdt/debian/changelog
===================================================================
--- trunk/eclipse-cdt/debian/changelog 2007-06-14 21:43:59 UTC (rev 3651)
+++ trunk/eclipse-cdt/debian/changelog 2007-06-14 22:42:15 UTC (rev 3652)
@@ -1,10 +1,12 @@
-eclipse-cdt (3.1.2-1) unstable; urgency=low
+eclipse-cdt (3.1.2-1) UNRELEASED; urgency=low
- * New upstream release.
+ * New upstream release, resynched with Fedora:
+ o refresh the patches
+ o do not ship cppunit and autotools plugins yet
* Add myself to the uploaders field.
* Bump debhelper compat level to 5, and adapt build-dependency accordingly.
- -- Thomas Girard <[EMAIL PROTECTED]> Wed, 13 Jun 2007 21:27:39 +0200
+ -- Thomas Girard <[EMAIL PROTECTED]> Thu, 14 Jun 2007 21:09:17 +0200
eclipse-cdt (3.1.1-1) unstable; urgency=medium
Added: trunk/eclipse-cdt/debian/patches/eclipse-cdt-build-linux.patch
===================================================================
--- trunk/eclipse-cdt/debian/patches/eclipse-cdt-build-linux.patch
(rev 0)
+++ trunk/eclipse-cdt/debian/patches/eclipse-cdt-build-linux.patch
2007-06-14 22:42:15 UTC (rev 3652)
@@ -0,0 +1,40 @@
+diff -r -u source-tree.orig/org.eclipse.cdt.releng/platform/build.properties
source-tree/org.eclipse.cdt.releng/platform/build.properties
+--- source-tree.orig/org.eclipse.cdt.releng/platform/build.properties
2005-11-18 02:41:32.000000000 +0100
++++ source-tree/org.eclipse.cdt.releng/platform/build.properties
2005-11-18 02:45:38.000000000 +0100
+@@ -71,15 +71,7 @@
+ # configs=win32,win32,x86 & linux,motif,x86
+ # By default the value is *,*,*
+ configs=\
+- aix,motif,ppc \
+- & linux,gtk,x86 \
+- & linux,gtk,x86_64 \
+- & linux,gtk,ppc \
+- & linux,gtk,ia64 \
+- & macosx,carbon,ppc \
+- & qnx,photon,x86 \
+- & solaris,motif,sparc \
+- & win32,win32,x86
++ linux,gtk,@ARCH@
+
+ archivesFormat=\
+ aix,motif,ppc-tar \
+diff -r -u source-tree.orig/org.eclipse.cdt.releng/sdk/build.properties
source-tree/org.eclipse.cdt.releng/sdk/build.properties
+--- source-tree.orig/org.eclipse.cdt.releng/sdk/build.properties
2005-11-18 02:41:29.000000000 +0100
++++ source-tree/org.eclipse.cdt.releng/sdk/build.properties 2005-11-18
02:44:59.000000000 +0100
+@@ -71,15 +71,7 @@
+ # configs=win32,win32,x86 & linux,motif,x86
+ # By default the value is *,*,*
+ configs=\
+- aix,motif,ppc\
+- & linux,gtk,x86 \
+- & linux,gtk,x86_64 \
+- & linux,gtk,ppc \
+- & linux,gtk,ia64 \
+- & macosx,carbon,ppc \
+- & qnx,photon,x86 \
+- & solaris,motif,sparc \
+- & win32,win32,x86
++ linux,gtk,@ARCH@
+
+ archivesFormat=\
+ aix,motif,ppc-tar \
Added: trunk/eclipse-cdt/debian/patches/eclipse-cdt-only-sdk.patch
===================================================================
--- trunk/eclipse-cdt/debian/patches/eclipse-cdt-only-sdk.patch
(rev 0)
+++ trunk/eclipse-cdt/debian/patches/eclipse-cdt-only-sdk.patch 2007-06-14
22:42:15 UTC (rev 3652)
@@ -0,0 +1,28 @@
+--- source-tree/org.eclipse.cdt.releng/build.xml- 2007-06-15
00:35:56.000000000 +0200
++++ source-tree/org.eclipse.cdt.releng/build.xml 2007-06-15
00:36:24.000000000 +0200
+@@ -43,15 +43,9 @@
+
+ <target name="fetch" depends="init">
+ <ant antfile="build.xml" dir="${pde.build.scripts}"
target="preBuild">
+- <property name="builder" value="${basedir}/platform"/>
+- </ant>
+- <ant antfile="build.xml" dir="${pde.build.scripts}"
target="preBuild">
+ <property name="builder" value="${basedir}/sdk"/>
+ </ant>
+ <ant antfile="build.xml" dir="${pde.build.scripts}"
target="fetch">
+- <property name="builder" value="${basedir}/platform"/>
+- </ant>
+- <ant antfile="build.xml" dir="${pde.build.scripts}"
target="fetch">
+ <property name="builder" value="${basedir}/sdk"/>
+ </ant>
+ </target>
+@@ -65,9 +59,6 @@
+
+ <target name="zips" depends="init,unzip">
+ <ant antfile="build.xml" dir="${pde.build.scripts}">
+- <property name="builder" value="${basedir}/platform" />
+- </ant>
+- <ant antfile="build.xml" dir="${pde.build.scripts}">
+ <property name="builder" value="${basedir}/sdk" />
+ </ant>
+ <concat destfile="${zipsdir}/compilelog.txt">
Modified: trunk/eclipse-cdt/debian/rules
===================================================================
--- trunk/eclipse-cdt/debian/rules 2007-06-14 21:43:59 UTC (rev 3651)
+++ trunk/eclipse-cdt/debian/rules 2007-06-14 22:42:15 UTC (rev 3652)
@@ -35,6 +35,7 @@
endif
PATCHES = \
+ eclipse-cdt-build-linux \
eclipse-cdt-no-cvs2 \
eclipse-cdt-no-tests \
eclipse-cdt-buildconsole \
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
