Changeset 2a64859e

Timestamp:

02/18/2012 11:38:06 PM (12 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

ae0367a

Parents:

ab348e5

Message:

Add aisleriot (solitaire), and comment the package version entities which I obsoleted in my previous commit.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9467 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (2 diffs)
• gnome/add/add.xml (modified) (1 diff)
• gnome/add/aisleriot.xml (added)
• gnome/add/gnome-games.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -765 +765 @@
 <!ENTITY libgnomeprintui-version      "2.18.5">
 <!ENTITY mobile-broadband-provider-info-version "20110511">
-<!ENTITY system-tools-backends-version "2.9.4">
-<!ENTITY liboobs-version              "2.30.1">
 
 <!-- Utilities -->
-<!ENTITY alacarte-version             "0.13.1">
-<!ENTITY bug-buddy-version            "2.30.0">
+<!ENTITY aisleriot-version            "3.2.2">
 <!ENTITY cheese-version               "2.30.1">
-<!ENTITY deskbar-applet-version       "2.30.1">
-<!ENTITY ekiga-version                "3.2.7">
 <!ENTITY file-roller-version          "2.30.2">
-<!ENTITY gconf-editor-version         "2.30.0">
 <!ENTITY gedit-version                "2.30.3">
 <!ENTITY gnome-games-version          "2.30.2">
-<!ENTITY gnome-netstatus-version      "2.28.1">
 <!ENTITY gnome-nettool-version        "2.30.0">
 <!ENTITY gnome-power-manager-version  "2.30.1">
 <!ENTITY gnome-screensaver-version    "3.2.0">
-<!ENTITY gnome-system-tools-version   "2.30.2">
 <!ENTITY hamster-applet-version       "2.30.2">
 <!ENTITY nautilus-sendto-version      "3.0.1">
 <!ENTITY seahorse-version             "2.30.1">
-<!ENTITY seahorse-plugins-version     "2.30.1">
-<!ENTITY sound-juicer-version         "2.28.2">
 <!ENTITY totem-version                "2.30.2">
 <!ENTITY vinagre-version              "2.30.2">
 
 <!-- Accessibility -->
-<!ENTITY at-spi-version               "1.30.1">
-<!ENTITY dasher-version               "4.11">
-<!ENTITY gnome-mag-version            "0.16.1">
-<!ENTITY gnome-speech-version         "0.4.25">
-<!ENTITY gok-version                  "2.30.0">
-<!ENTITY java-access-bridge-version   "1.26.2">
-<!ENTITY libgail-gnome-version        "1.20.3">
 <!ENTITY orca-version                 "3.2.2">
 
@@ -813 +796 @@
 
 <!-- Obsolete
+<!ENTITY at-spi-version               "1.30.1">
+<!ENTITY alacarte-version             "0.13.1">
+<!ENTITY bug-buddy-version            "2.30.0">
+<!ENTITY dasher-version               "4.11">
+<!ENTITY deskbar-applet-version       "2.30.1">
+<!ENTITY eel-version                  "2.18.3">
+<!ENTITY ekiga-version                "3.2.7">
+<!ENTITY gail-version                 "1.22.3">
 <!ENTITY gal-version                  "2.4.3">
-<!ENTITY nautilus-media-version       "0.8.1">
-<!ENTITY gpdf-version                 "2.10.0">
+<!ENTITY gconf-editor-version         "2.30.0">
 <!ENTITY ggv-version                  "2.12.0">
-<!ENTITY gnomemeeting-version         "1.2.2">
-<!ENTITY gnome2-user-docs-version     "2.8.1">
-<!ENTITY gnopernicus-version          "1.1.1">
-<!ENTITY gnome-vfs-monikers-version   "2.15.3">
 <!ENTITY gnome-audio-version          "2.0.0">
-<!ENTITY gnome-themes-version         "2.30.2">
-<!ENTITY gnome-volume-manager-version "2.17.0">
-<!ENTITY nautilus-cd-burner-version   "2.18.2">
-<!ENTITY eel-version                  "2.18.3">
-<!ENTITY gail-version                 "1.22.3">
 <!ENTITY gnome-keyring-manager-version "2.18.0">
 <!ENTITY gnome-mount-version          "0.8">
+<!ENTITY gnome-mag-version            "0.16.1">
+<!ENTITY gnome-netstatus-version      "2.28.1">
+<!ENTITY gnome-speech-version         "0.4.25">
+<!ENTITY gnome-system-tools-version   "2.30.2">
+<!ENTITY gnome-themes-version         "2.30.2">
+<!ENTITY gnome-vfs-monikers-version   "2.15.3">
+<!ENTITY gnome-volume-manager-version "2.17.0">
+<!ENTITY gnome2-user-docs-version     "2.8.1">
+<!ENTITY gnomemeeting-version         "1.2.2">
+<!ENTITY gnopernicus-version          "1.1.1">
+<!ENTITY gok-version                  "2.30.0">
+<!ENTITY gpdf-version                 "2.10.0">
+<!ENTITY java-access-bridge-version   "1.26.2">
+<!ENTITY libgail-gnome-version        "1.20.3">
+<!ENTITY liboobs-version              "2.30.1">
+<!ENTITY nautilus-cd-burner-version   "2.18.2">
+<!ENTITY nautilus-media-version       "0.8.1">
+<!ENTITY seahorse-plugins-version     "2.30.1">
+<!ENTITY sound-juicer-version         "2.28.2">
+<!ENTITY system-tools-backends-version "2.9.4">
 -->
 

gnome/add/add.xml

@@ -35 +35 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-utilities.xml"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aisleriot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cheese.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file-roller.xml"/>

gnome/add/gnome-games.xml

@@ -375 +375 @@
       </varlistentry>
 
-      <varlistentry id="sol">
+      <!-- conflicts with aisleriot <varlistentry id="sol">
         <term><command>sol</command></term>
         <listitem>
@@ -384 +384 @@
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry>-->
 
       <varlistentry id="swell-foop">

introduction/welcome/changelog.xml

@@ -51 +51 @@
           <para>[ken] - update to orca-3.2.2.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merge aisleriot-3.2.2 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>