Changeset 964b98c

Timestamp:

02/11/2012 12:54:33 AM (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:

3839649

Parents:

3491d06

Message:

gcalctool-6.2.0

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

Files:

• general.ent (modified) (2 diffs)
• gnome/add/add.xml (modified) (1 diff)
• gnome/core/core.xml (modified) (1 diff)
• gnome/core/gcalctool.xml (moved) (moved from gnome/add/gcalctool.xml ) (5 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -711 +711 @@
 <!ENTITY epiphany-version             "3.2.1">
 <!ENTITY evince-version               "3.2.1">
+<!ENTITY gcalctool-version            "6.2.0">
 <!ENTITY gnome-terminal-version       "2.30.2">
 <!ENTITY nautilus-version             "2.30.1">
@@ -746 +747 @@
 <!ENTITY ekiga-version                "3.2.7">
 <!ENTITY file-roller-version          "2.30.2">
-<!ENTITY gcalctool-version            "5.30.2">
 <!ENTITY gconf-editor-version         "2.30.0">
 <!ENTITY gdm-version                  "2.30.2">

gnome/add/add.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ekiga.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file-roller.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcalctool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gconf-editor.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdm.xml"/>

gnome/core/core.xml

@@ -99 +99 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epiphany.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evince.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcalctool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-contacts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcalctool.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-contacts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-disk-utility.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-system-monitor.xml"/>-->

gnome/core/gcalctool.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY gcalctool-download-http "&gnome-download-http;/gcalctool/5.30/gcalctool-&gcalctool-version;.tar.bz2">
-  <!ENTITY gcalctool-download-ftp  "&gnome-download-ftp;/gcalctool/5.30/gcalctool-&gcalctool-version;.tar.bz2">
-  <!ENTITY gcalctool-md5sum        "9357de6835da305ee4f0ebad509b509a">
-  <!ENTITY gcalctool-size          "1.1 MB">
-  <!ENTITY gcalctool-buildsize     "23 MB">
-  <!ENTITY gcalctool-time          "0.5 SBU">
+  <!ENTITY gcalctool-download-http "&gnome-download-http;/gcalctool/6.2/gcalctool-&gcalctool-version;.tar.xz">
+  <!ENTITY gcalctool-download-ftp  "&gnome-download-ftp;/gcalctool/6.2/gcalctool-&gcalctool-version;.tar.xz">
+  <!ENTITY gcalctool-md5sum        "2ec304f118735f6268d38741394a3b9e">
+  <!ENTITY gcalctool-size          "977 KB">
+  <!ENTITY gcalctool-buildsize     "31 MB">
+  <!ENTITY gcalctool-time          "0.8 SBU">
 ]>
 
@@ -35 +35 @@
     of accuracy.</para>
 
-    &lfs65_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -64 +64 @@
     <para role="required"><xref linkend="GConf"/>,
     <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gtk2"/>, and
+    <xref linkend="gtk3"/>, and
     <xref linkend="which"/></para>
 
@@ -81 +81 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib \
-            --mandir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
+<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
 make</userinput></screen>
 
@@ -101 +97 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-mandir.xml"/>
-
-    <para><option>--disable-scrollkeeper</option>: Use this parameter if you
-    wish to disable the updates to the scrollkeeper database.</para>
 
   </sect2>

introduction/welcome/changelog.xml

@@ -94 +94 @@
           <para>[ken] - merge evolution-data-server-3.2.2 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merge gcalctool-6.2.0 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>