Changeset ac38e9dc for general/prog/prog.xml

Timestamp:

08/01/2015 04:26:22 AM (9 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

systemd-13485

Children:

ad6910d

Parents:

4a83293

Message:

Import back into SVN from Github

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16309 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/prog/prog.xml (modified) (3 diffs)

general/prog/prog.xml

@@ -23 +23 @@
   system's development capabilities.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bazaar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="check.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clisp.xml"/>
@@ -54 +53 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="scons.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="slang.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="subversion.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="subversion-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="svnserver-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="swig.xml"/>
@@ -66 +65 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-java.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="java.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjdk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ojdk-conf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apache-ant.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="junit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjdk.xml"/>
 
 </chapter>