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

Sun Jun 17 17:26:37 UTC 2007

Author: tgg
Date: 2007-06-17 17:26:36 +0000 (Sun, 17 Jun 2007)
New Revision: 3697

Added:
   trunk/eclipse-cdt/debian/eclipse-cdt-target_filter.gif.gz.uu
Removed:
   trunk/eclipse-cdt/debian/patches/eclipse-cdt-only-sdk.patch
Modified:
   trunk/eclipse-cdt/debian/control
   trunk/eclipse-cdt/debian/rules
Log:
do not keep Fedora patch we will not use. For now we distribute sdk files in eclipse-cdt package.

Also add a missing icon (taken from Fedora .src.rpm)


Modified: trunk/eclipse-cdt/debian/control
===================================================================

--- trunk/eclipse-cdt/debian/control	2007-06-17 16:16:48 UTC (rev 3696)
+++ trunk/eclipse-cdt/debian/control	2007-06-17 17:26:36 UTC (rev 3697)
@@ -3,12 +3,12 @@
 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>, Thomas Girard <thomas.g.girard at free.fr>
-Build-Depends: debhelper (>> 5), eclipse (>= 3.2.1), java-gcj-compat-dev, bzip2
+Build-Depends: debhelper (>> 5), eclipse (>= 3.2.1), java-gcj-compat-dev, bzip2, sharutils
 Standards-Version: 3.7.2
 
 Package: eclipse-cdt
 Architecture: any
-Depends: eclipse-pde (>= 3.2.1), exuberant-ctags | ctags
+Depends: eclipse-pde (>= 3.2.1), g++, make, exuberant-ctags | ctags
 Description: C/C++ Development Tools for Eclipse
  The eclipse-cdt package contains Eclipse features and plugins that are
  useful for C and C++ development.

Added: trunk/eclipse-cdt/debian/eclipse-cdt-target_filter.gif.gz.uu
===================================================================
--- trunk/eclipse-cdt/debian/eclipse-cdt-target_filter.gif.gz.uu	                        (rev 0)
+++ trunk/eclipse-cdt/debian/eclipse-cdt-target_filter.gif.gz.uu	2007-06-17 17:26:36 UTC (rev 3697)
@@ -0,0 +1,30 @@
+begin 644 eclipse-cdt-target_filter.gif.gz
+M'XL(`"CF(T8``RM)+$I/+8E/R\PI22W22\],8Z`^,``",Q,3$&UJ8&8`I4W!
+MXD!@:&YHQ&!H8&9H8&YB8F9NR&!@:&)F9L*@8$`#MV"`TN*2Q"(%!8:LK/R,
+MO.*2/%SJ",D/4>#NZ69AF2C`(,#PO`#$9V1D9&)B8F9F9F%A865E96-C8V=G
+MY^#@X.3DY.+BXN;FYN'AX>7EY>/CX^?G%Q`0$!04%!(2$A86%A$1$145%1,3
+M$Q<7EY"0D)24E)*2DI:6EI&1D965E9.3DY>75U!04%145%)24E965E%14555
+M55-34U=7U]#0T-34U-+2TM;6UM'1T=75U=/3T]?7!R4.0T,C(R-C8V,3$Q-3
+M4U,S,S-S<W,+"PM+2TLK*RMK:VL;&QM;6UL[.SM[>WL'!P='1T<G)R=G9V<7
+M%Q=75U<W-S=W=W</#P]/3T\O+R]O;V\?'Q]?7U\_/S]_?_^`@(#`P,"@H*#@
+MX."0D)#0T-"PL+#P\/"(B(C(R,BHJ*CHZ.B8F)C8V-BXN+CX^/B$A(3$Q,2D
+MI*3DY.24E)34U-2TM+3T]/2,C(S,S,RLK*SL[.R<G)S<W-R\O+S\_/R"@H+"
+MPL*BHJ+BXN*2DI+2TM*RLK+R\O**BHK*RLJJJJKJZNJ:FIK:VMJZNKKZ^OJ&
+MAH;&QL:FIJ;FYN:6EI;6UM:VMK;V]O:.CH[.SLZNKJ[N[NZ>GI[>WMZ^OK[^
+M_OX)$R9,G#AQTJ1)DR=/GC)ERM2I4Z=-FS9]^O09,V;,G#ESUJQ9LV?/GC-G
+MSMRY<^?-FS=__OP%"Q8L7+APT:)%BQ<O7K)DR=*E2Y<M6[9\^?(5*U:L7+ER
+MU:I5JU>O7K-FS=JU:]>M6[=^_?H-&S9LW+AQTZ9-FS=OWK)ER]:M6[=MV[9]
+M^_8=.W;LW+ESUZY=NW?OWK-GS]Z]>_?MV[=___X#!PX</'CPT*%#AP\?/G+D
+MR-&C1X\=.W;\^/$3)TZ</'GRU*E3IT^?/G/FS-FS9\^=.W?^_/D+%RY<O'CQ
+MTJ5+ER]?OG+ERM6K5Z]=NW;]^O4;-V[<O'GSUJU;MV_?OG/GSMV[=^_=NW?_
+M_OT'#QX\?/CPT:-'CQ\_?O+DR=.G3Y\]>_;\^?,7+UZ\?/GRU:M7KU^_?O/F
+MS=NW;]^]>_?^_?L/'SY\_/CQTZ=/GS]__O+ER]>O7[]]^_;]^_<?/W[\_/GS
+MUZ]?OW___O/GS]^_?__]^_?__W_%?Z+.1:F)):DI"N69)1D*(1FI"NZ>O@$,
+MBC]9&!D8_C'H at +((*+,P</0Q_.64\=BPX``7FS"?RPH#Q<-M+&]K5BAS+K*W
+M^3]A;43;\H?*14_63=02?#G1<S*+Y,[HEWSA7`DZDH(^)>O2SD9H5%V-<;X@
+ML&/^@Q\?&)F5>B\L_O<C(_K4\]G!P1I%EK7'CL?/S;GY(^'N+\^CNJN8KGL\
+M-EZ[YF;F[*`-DB]:^[=L+[AO]_C3!?DYNRL^RVW),%!@L![8<F04C()1,`I&
+MP2 at 8!:-@%(R"43`*1L$H&`6C8!2, at E$P"D;!*!@%HV`4C()1,`I&P2 at 8!:-@
+-%`P,``!J19/``"@`````
+`
+end

Deleted: trunk/eclipse-cdt/debian/patches/eclipse-cdt-only-sdk.patch
===================================================================
--- trunk/eclipse-cdt/debian/patches/eclipse-cdt-only-sdk.patch	2007-06-17 16:16:48 UTC (rev 3696)
+++ trunk/eclipse-cdt/debian/patches/eclipse-cdt-only-sdk.patch	2007-06-17 17:26:36 UTC (rev 3697)
@@ -1,28 +0,0 @@
---- 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-17 16:16:48 UTC (rev 3696)
+++ trunk/eclipse-cdt/debian/rules	2007-06-17 17:26:36 UTC (rev 3697)
@@ -106,7 +106,11 @@
 	# build native code.
 	cd $(SOURCE_TREE)/org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.linux/library && \
 	make ARCH=$(ECLIPSE_PLATFORM) CC='gcc -D_GNU_SOURCE'
-	
+
+	# add a missing icon before launching the build
+	uudecode -o /dev/stdout debian/eclipse-cdt-target_filter.gif.gz.uu | \
+	    gzip -dc - >  $(SOURCE_TREE)/$(RELENG_PLUGIN)/results/plugins/org.eclipse.cdt.make.ui/icons/dtool16/eclipse-cdt-target_filter.gif
+
 	# Call eclipse headless to process CDT releng build scripts
 	cd $(SOURCE_TREE)/$(RELENG_PLUGIN) && \
 	$(JAVA_RUN) -cp $(ECLIPSE_BASE)/startup.jar \


