diff --git a/cdt.map b/cdt.map
deleted file mode 100644
index 492e0bd..0000000
--- a/cdt.map
+++ /dev/null
@@ -1,180 +0,0 @@
-! The master
-git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git
-feature@org.eclipse.cdt.master=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=releng/org.eclipse.cdt.master
-
-! Cross platform
-plugin@org.eclipse.cdt.core=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.core
-plugin@org.eclipse.cdt.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.ui
-
-plugin@org.eclipse.cdt.make.core=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=build/org.eclipse.cdt.make.core
-plugin@org.eclipse.cdt.make.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=build/org.eclipse.cdt.make.ui
-
-plugin@org.eclipse.cdt.managedbuilder.core=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=build/org.eclipse.cdt.managedbuilder.core
-plugin@org.eclipse.cdt.managedbuilder.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=build/org.eclipse.cdt.managedbuilder.ui
-plugin@org.eclipse.cdt.managedbuilder.gnu.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=build/org.eclipse.cdt.managedbuilder.gnu.ui
-
-plugin@org.eclipse.cdt.debug.core=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=debug/org.eclipse.cdt.debug.core
-plugin@org.eclipse.cdt.debug.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=debug/org.eclipse.cdt.debug.ui
-
-plugin@org.eclipse.cdt.debug.mi.core=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=debug/org.eclipse.cdt.debug.mi.core
-plugin@org.eclipse.cdt.debug.mi.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=debug/org.eclipse.cdt.debug.mi.ui
-
-plugin@org.eclipse.cdt.launch=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=launch/org.eclipse.cdt.launch
-
-plugin@org.eclipse.cdt.doc.user=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=doc/org.eclipse.cdt.doc.user
-plugin@org.eclipse.cdt.doc.isv=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=doc/org.eclipse.cdt.doc.isv
-
-plugin@org.eclipse.cdt=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=releng/org.eclipse.cdt
-
-
-! CDT Features
-feature@org.eclipse.cdt.platform=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=releng/org.eclipse.cdt.platform-feature
-feature@org.eclipse.cdt.gnu.build=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=build/org.eclipse.cdt.gnu.build-feature
-feature@org.eclipse.cdt.gnu.debug=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=debug/org.eclipse.cdt.gnu.debug-feature
-feature@org.eclipse.cdt=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=releng/org.eclipse.cdt-feature
-
-
-! GDB feature
-feature@org.eclipse.cdt.gdb=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=debug/org.eclipse.cdt.gdb-feature
-plugin@org.eclipse.cdt.gdb=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=debug/org.eclipse.cdt.gdb
-plugin@org.eclipse.cdt.gdb.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=debug/org.eclipse.cdt.gdb.ui
-
-
-! Platform specific
-fragment@org.eclipse.cdt.core.aix=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.core.aix
-fragment@org.eclipse.cdt.core.linux=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.core.linux
-fragment@org.eclipse.cdt.core.linux.ia64=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.core.linux.ia64
-fragment@org.eclipse.cdt.core.linux.ppc=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.core.linux.ppc
-fragment@org.eclipse.cdt.core.linux.ppc64=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.core.linux.ppc64
-fragment@org.eclipse.cdt.core.linux.x86=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.core.linux.x86
-fragment@org.eclipse.cdt.core.linux.x86_64=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.core.linux.x86_64
-fragment@org.eclipse.cdt.core.macosx=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.core.macosx
-fragment@org.eclipse.cdt.core.qnx=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.core.qnx
-fragment@org.eclipse.cdt.core.solaris=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.core.solaris
-fragment@org.eclipse.cdt.core.win32=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.core.win32
-fragment@org.eclipse.cdt.core.win32.x86=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.core.win32.x86
-fragment@org.eclipse.cdt.core.win32.x86_64=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.core.win32.x86_64
-
-! Testing feature
-plugin@org.eclipse.cdt.core.tests=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.core.tests
-plugin@org.eclipse.cdt.ui.tests=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=core/org.eclipse.cdt.ui.tests
-plugin@org.eclipse.cdt.debug.ui.tests=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=debug/org.eclipse.cdt.debug.ui.tests
-plugin@org.eclipse.cdt.managedbuilder.core.tests=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=build//org.eclipse.cdt.managedbuilder.core.tests
-plugin@org.eclipse.cdt.managedbuilder.ui.tests=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=build/org.eclipse.cdt.managedbuilder.ui.tests
-plugin@org.eclipse.cdt.testing=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=releng/org.eclipse.cdt.testing
-plugin@org.eclipse.test=R3_6,:pserver:anonymous:guest:@dev.eclipse.org/cvsroot/eclipse,
-fragment@org.eclipse.ant.optional.junit=R3_6,:pserver:anonymous:guest:@dev.eclipse.org/cvsroot/eclipse
-feature@org.eclipse.cdt.testing=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=releng/org.eclipse.cdt.testing-feature
-
-! SDK Feature
-plugin@org.eclipse.cdt.sdk=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=releng/org.eclipse.cdt.sdk
-feature@org.eclipse.cdt.sdk=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=releng/org.eclipse.cdt.sdk-feature
-
-! Windows Feature
-plugin@org.eclipse.cdt.msw.build=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=windows/org.eclipse.cdt.msw.build
-feature@org.eclipse.cdt.msw=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=windows/org.eclipse.cdt.msw-feature
-
-! GDB Hardware Debugging Feature
-plugin@org.eclipse.cdt.debug.gdbjtag=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=jtag/org.eclipse.cdt.debug.gdbjtag
-plugin@org.eclipse.cdt.debug.gdbjtag.core=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=jtag/org.eclipse.cdt.debug.gdbjtag.core
-plugin@org.eclipse.cdt.debug.gdbjtag.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=jtag/org.eclipse.cdt.debug.gdbjtag.ui
-feature@org.eclipse.cdt.debug.gdbjtag=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=jtag/org.eclipse.cdt.debug.gdbjtag-feature
-
-! XL compiler integration
-plugin@org.eclipse.cdt.errorparsers.xlc=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=xlc/org.eclipse.cdt.errorparsers.xlc
-plugin@org.eclipse.cdt.make.xlc.core=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=xlc/org.eclipse.cdt.make.xlc.core
-plugin@org.eclipse.cdt.managedbuilder.xlc.core=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=xlc/org.eclipse.cdt.managedbuilder.xlc.core
-plugin@org.eclipse.cdt.managedbuilder.xlc.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=xlc/org.eclipse.cdt.managedbuilder.xlc.ui
-feature@org.eclipse.cdt.xlc.feature=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=xlc/org.eclipse.cdt.xlc.feature
-feature@org.eclipse.cdt.xlc.sdk=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=xlc/org.eclipse.cdt.xlc.sdk-feature
-plugin@org.eclipse.cdt.core.lrparser.xlc=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=xlc/org.eclipse.cdt.core.lrparser.xlc
-plugin@org.eclipse.cdt.core.lrparser.xlc.tests=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=xlc/org.eclipse.cdt.core.lrparser.xlc.tests
-plugin@org.eclipse.cdt.managedbuilder.xlupc.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=xlc/org.eclipse.cdt.managedbuilder.xlupc.ui
-
-! LR parser
-plugin@org.eclipse.cdt.core.lrparser=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=lrparser/org.eclipse.cdt.core.lrparser
-plugin@org.eclipse.cdt.core.lrparser.tests=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=lrparser/org.eclipse.cdt.core.lrparser.tests
-! newly signed LPG runtime
-plugin@net.sourceforge.lpg.lpgjavaruntime,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/net.sourceforge.lpg.lpgjavaruntime_1.1.0.v200803061910.jar
-feature@org.eclipse.cdt.core.lrparser.feature=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=lrparser/org.eclipse.cdt.core.lrparser.feature
-feature@org.eclipse.cdt.core.lrparser.sdk=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=lrparser/org.eclipse.cdt.core.lrparser.sdk.feature
-
-! UPC parser - also uses LPG but since we already download it above no need to download again
-plugin@org.eclipse.cdt.core.parser.upc=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=upc/org.eclipse.cdt.core.parser.upc
-plugin@org.eclipse.cdt.core.parser.upc.tests=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=upc/org.eclipse.cdt.core.parser.upc.tests
-feature@org.eclipse.cdt.core.parser.upc.feature=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=upc/org.eclipse.cdt.core.parser.upc.feature
-feature@org.eclipse.cdt.core.parser.upc.sdk=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=upc/org.eclipse.cdt.core.parser.upc.sdk.feature
-
-! CDT Utilities
-plugin@org.eclipse.cdt.util=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=util/org.eclipse.cdt.util
-feature@org.eclipse.cdt.util=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=util/org.eclipse.cdt.util-feature
-
-! DSF
-plugin@org.eclipse.cdt.dsf=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=dsf/org.eclipse.cdt.dsf
-plugin@org.eclipse.cdt.dsf.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=dsf/org.eclipse.cdt.dsf.ui
-plugin@org.eclipse.cdt.examples.dsf=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=dsf/org.eclipse.cdt.examples.dsf
-plugin@org.eclipse.cdt.examples.dsf.pda=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=dsf/org.eclipse.cdt.examples.dsf.pda
-plugin@org.eclipse.cdt.examples.dsf.pda.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=dsf/org.eclipse.cdt.examples.dsf.pda.ui
-plugin@org.eclipse.cdt.tests.dsf=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=dsf/org.eclipse.cdt.tests.dsf
-feature@org.eclipse.cdt.examples.dsf=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=dsf/org.eclipse.cdt.examples.dsf-feature
-
-! DSF-GDB Integration
-plugin@org.eclipse.cdt.dsf.gdb=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=dsf-gdb/org.eclipse.cdt.dsf.gdb
-plugin@org.eclipse.cdt.dsf.gdb.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=dsf-gdb/org.eclipse.cdt.dsf.gdb.ui
-plugin@org.eclipse.cdt.tests.dsf.gdb=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=dsf-gdb/org.eclipse.cdt.tests.dsf.gdb
-feature@org.eclipse.cdt.gnu.dsf=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=dsf-gdb/org.eclipse.cdt.gnu.dsf-feature
-
-! CDT Memory
-plugin@org.eclipse.cdt.debug.ui.memory.traditional=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=memory/org.eclipse.cdt.debug.ui.memory.traditional
-plugin@org.eclipse.cdt.debug.ui.memory.transport=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=memory/org.eclipse.cdt.debug.ui.memory.transport
-plugin@org.eclipse.cdt.debug.ui.memory.search=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=memory/org.eclipse.cdt.debug.ui.memory.search
-plugin@org.eclipse.cdt.debug.ui.memory.memorybrowser=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=memory/org.eclipse.cdt.debug.ui.memory.memorybrowser
-feature@org.eclipse.cdt.debug.ui.memory=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=memory/org.eclipse.cdt.debug.ui.memory-feature
-
-! CDT RSE Remote Launch
-plugin@org.eclipse.cdt.launch.remote=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=cross/org.eclipse.cdt.launch.remote
-feature@org.eclipse.cdt.launch.remote=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=cross/org.eclipse.cdt.launch.remote-feature
-
-! CDT Cross GCC
-plugin@org.eclipse.cdt.build.crossgcc=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=cross/org.eclipse.cdt.build.crossgcc
-feature@org.eclipse.cdt.build.crossgcc=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=cross/org.eclipse.cdt.build.crossgcc-feature
-
-! CDT P2 Additions
-plugin@org.eclipse.cdt.p2=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=p2/org.eclipse.cdt.p2
-feature@org.eclipse.cdt.p2=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=p2/org.eclipse.cdt.p2-feature
-
-! EDC
-plugin@org.eclipse.cdt.debug.edc=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.edc.git,path=org.eclipse.cdt.debug.edc
-plugin@org.eclipse.cdt.debug.edc.linux.x86=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.edc.git,path=org.eclipse.cdt.debug.edc.linux.x86
-plugin@org.eclipse.cdt.debug.edc.x86=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.edc.git,path=org.eclipse.cdt.debug.edc.x86
-plugin@org.eclipse.cdt.debug.edc.tcf.extension=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.edc.git,path=org.eclipse.cdt.debug.edc.tcf.extension
-plugin@org.eclipse.cdt.debug.edc.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.edc.git,path=org.eclipse.cdt.debug.edc.ui
-plugin@org.eclipse.cdt.debug.edc.windows=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.edc.git,path=org.eclipse.cdt.debug.edc.windows
-plugin@org.eclipse.cdt.debug.edc.windows.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.edc.git,path=org.eclipse.cdt.debug.edc.windows.ui
-plugin@org.eclipse.cdt.debug.edc.doc.user=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.edc.git,path=org.eclipse.cdt.debug.edc.doc.user
-plugin@org.eclipse.cdt.scripting=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.edc.git,path=org.eclipse.cdt.scripting
-feature@org.eclipse.cdt.debug.edc=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.edc.git,path=org.eclipse.cdt.debug.edc-feature
-
-! TCF Requirements for EDC
-plugin@org.eclipse.tm.tcf=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=branches/0.4.0,path=plugins/org.eclipse.tm.tcf
-plugin@org.eclipse.tm.tcf.cdt.ui=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=branches/0.4.0,path=plugins/org.eclipse.tm.tcf.cdt.ui
-plugin@org.eclipse.tm.tcf.core=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=branches/0.4.0,path=plugins/org.eclipse.tm.tcf.core
-plugin@org.eclipse.tm.tcf.debug=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=branches/0.4.0,path=plugins/org.eclipse.tm.tcf.debug
-plugin@org.eclipse.tm.tcf.debug.ui=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=branches/0.4.0,path=plugins/org.eclipse.tm.tcf.debug.ui
-plugin@org.eclipse.tm.tcf.rse=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=branches/0.4.0,path=plugins/org.eclipse.tm.tcf.rse
-feature@org.eclipse.tm.tcf.feature=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=branches/0.4.0,path=features/org.eclipse.tm.tcf.feature
-
-! Berkeley UPC
-plugin@org.eclipse.cdt.managedbuilder.bupc.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=upc/org.eclipse.cdt.managedbuilder.bupc.ui
-feature@org.eclipse.cdt.bupc=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=upc/org.eclipse.cdt.bupc-feature
-
-! Codan
-plugin@org.eclipse.cdt.codan.core=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=codan/org.eclipse.cdt.codan.core
-plugin@org.eclipse.cdt.codan.core.test=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=codan/org.eclipse.cdt.codan.core.test
-plugin@org.eclipse.cdt.codan.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=codan/org.eclipse.cdt.codan.ui
-plugin@org.eclipse.cdt.codan.core.cxx=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=codan/org.eclipse.cdt.codan.core.cxx
-plugin@org.eclipse.cdt.codan.ui.cxx=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=codan/org.eclipse.cdt.codan.ui.cxx
-plugin@org.eclipse.cdt.codan.checkers=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=codan/org.eclipse.cdt.codan.checkers
-plugin@org.eclipse.cdt.codan.checkers.ui=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=codan/org.eclipse.cdt.codan.checkers.ui
-plugin@org.eclipse.cdt.codan.examples=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=codan/org.eclipse.cdt.codan.examples
-feature@org.eclipse.cdt.codan.feature=GIT,tag=@cdtTag@,repo=git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git,path=codan/org.eclipse.cdt.codan-feature
diff --git a/eclipse-cdt-disable-jacoco.patch b/eclipse-cdt-disable-jacoco.patch
deleted file mode 100644
index c87e74f..0000000
--- a/eclipse-cdt-disable-jacoco.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up ./pom.xml.fix ./pom.xml
---- ./pom.xml.fix 2014-03-05 17:26:37.417268725 -0500
-+++ ./pom.xml 2014-03-05 17:26:54.337527088 -0500
-@@ -505,27 +505,6 @@
-
-
-
--
-- org.jacoco
-- jacoco-maven-plugin
-- 0.7.1.201405082137
--
--
-- pre-test
--
-- prepare-agent
--
--
--
-- ${sonar.jacoco.reportPath}
--
-- org.eclipse.cdt.*
--
-- true
--
--
--
--
-
-
-
diff --git a/eclipse-cdt-spawner-issue.patch b/eclipse-cdt-spawner-issue.patch
deleted file mode 100644
index 71f90de..0000000
--- a/eclipse-cdt-spawner-issue.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java.fix ./core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java
---- ./core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java.fix 2013-04-30 16:30:52.000000000 -0400
-+++ ./core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/spawner/ProcessFactory.java 2013-04-30 16:31:09.000000000 -0400
-@@ -42,7 +42,7 @@ public class ProcessFactory {
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (UnsatisfiedLinkError e) {
-- e.printStackTrace();
-+ // e.printStackTrace();
- }
- }
-
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 97496e7..dcd6780 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -33,7 +33,7 @@ Epoch: 1
Summary: Eclipse C/C++ Development Tools (CDT) plugin
Name: %{?scl_prefix}eclipse-cdt
Version: %{majmin}.%{micro}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: EPL and CPL
URL: http://www.eclipse.org/cdt
@@ -48,25 +48,25 @@ Source4: cdtdebug.man
Source5: %{name}-runtests.sh
# Following adds current directory to autotools tests build.properties
-Patch1: %{name}-autotools-test.patch
+Patch0: %{name}-autotools-test.patch
# Following fixes cdtdebug.sh script to get proper platform filesystem plugin
-Patch2: %{pkg_name}-cdtdebug.patch
+Patch1: %{pkg_name}-cdtdebug.patch
# Following fixes Standalone Debugger config.ini file to use bundle symbolic names
-Patch3: %{pkg_name}-config-ini.patch
+Patch2: %{pkg_name}-config-ini.patch
# Following fixes Standalone Debugger README file to refer to /usr/bin/cdtdebug
-Patch4: %{pkg_name}-cdtdebug-readme.patch
+Patch3: %{pkg_name}-cdtdebug-readme.patch
# Following removes docker launcher plugins from repo
-Patch6: remove-docker.patch
+Patch4: remove-docker.patch
# Following removes autotools and remote plugins from repo
-Patch7: remove-remote.patch
+Patch5: remove-remote.patch
# Following fixes missing exit code in console bug
-Patch8: %{pkg_name}-exit-code.patch
+Patch6: %{pkg_name}-exit-code.patch
BuildRequires: tycho
BuildRequires: tycho-extras
@@ -181,20 +181,20 @@ cp %{SOURCE3} desktop
mkdir man
cp %{SOURCE4} man
+%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%if %{_enable_container_and_remote_support} == 0
-%patch6 -p0
-%patch7 -p0
+%patch4 -p0
+%patch5 -p0
%else
# Docker not available on F22 or earlier
%if 0%{?fedora} < 23
-%patch6 -p0
+%patch4 -p0
%endif
%endif
-%patch8 -p1
+%patch6 -p1
TYCHO_ENV="linuxgtk%{eclipse_arch}"
%pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV"
@@ -534,6 +534,9 @@ rm -rf $installDir/eclipse/binary
%endif
%changelog
+* Mon Nov 23 2015 Alexander Kurtakov 1:8.8.0-4
+- Drop old patches and organize them.
+
* Thu Oct 08 2015 Mat Booth - 1:8.8.0-3
- Perform full build
- Exclude docker plugins on Fedora < 23