Changeset 0230c0a


Ignore:
Timestamp:
May 30, 2011, 3:05:49 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Children:
271d1f96
Parents:
32f55264 (diff), 9f51c06 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into simp

Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/common/grep.xml

    r32f55264 r0230c0a  
    2525  <sect2 role="installation">
    2626    <title>Installation of Grep</title>
    27 
    28     <para os="p1">This patch contains various bug fixes for Grep:</para>
    29 
    30 <screen os="p2"><userinput>patch -Np1 -i ../&grep-fixes-patch;</userinput></screen>
    3127
    3228    <para os="a">Prepare Grep for compilation:</para>

  • BOOK/final-system/common/shadow.xml

    r32f55264 r0230c0a  
    3333      command below.</para>
    3434    </note>
     35
     36    <para os="f1">Fix an issue with the Russian man pages:</para>
     37
     38    <screen os="f2"><userinput>sed -i 's/man_MANS = $(man_nopam) /man_MANS = /' man/ru/Makefile.in</userinput></screen>
    3539
    3640    <para os="b">Prepare Shadow for compilation:</para>

  • BOOK/final-system/multilib/grep.xml

    r32f55264 r0230c0a  
    2121  <sect2 role="installation">
    2222    <title>Installation of Grep</title>
    23 
    24     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/grep.xml"
    26     xpointer="xpointer(//*[@os='p1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/grep.xml"
    30     xpointer="xpointer(//*[@os='p2'])"/>
    3123
    3224    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/introduction/common/changelog.xml

    r32f55264 r0230c0a  
    3636    </listitem>
    3737-->
     38
     39    <listitem>
     40      <para>May 26, 2011</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[Jonathan] - Upgraded Shadow to 4.1.4.3.</para>
     44        </listitem>
     45        <listitem>
     46          <para>[Jonathan] - Removed old grep patch.</para>
     47        </listitem>
     48      </itemizedlist>
     49    </listitem>
    3850
    3951    <listitem>

  • BOOK/materials/common/patches.xml

    r32f55264 r0230c0a  
    7474
    7575    <varlistentry>
    76       <term>Grep Fixes Patch - <token>&grep-fixes-patch-size;</token>:</term>
    77       <listitem>
    78         <para>Download: <ulink
    79         url="&patches-root;&grep-fixes-patch;"/></para>
    80         <para>MD5 sum: <literal>&grep-fixes-patch-md5;</literal></para>
    81       </listitem>
    82     </varlistentry>
    83 
    84     <varlistentry>
    8576      <term>IPUtils Fixes Patch - <token>&iputils-fixes-patch-size;</token>:</term>
    8677      <listitem>

  • BOOK/packages.ent

    r32f55264 r0230c0a  
    389389<!ENTITY sed-home "&gnu-software;sed">
    390390
    391 <!ENTITY shadow-version "4.1.4.2">
    392 <!ENTITY shadow-size "1,748 KB">
     391<!ENTITY shadow-version "4.1.4.3">
     392<!ENTITY shadow-size "1,804 KB">
    393393<!ENTITY shadow-url "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-&shadow-version;.tar.bz2">
    394 <!ENTITY shadow-md5 "d593a9cab93c48ee0a6ba056db8c1997">
     394<!ENTITY shadow-md5 "b8608d8294ac88974f27b20f991c0e79">
    395395<!ENTITY shadow-home "http://pkg-shadow.alioth.debian.org">
    396396

  • BOOK/patches.ent

    r32f55264 r0230c0a  
    3232<!ENTITY gcc-branch_update-patch-md5 "3ff1f39dc12932736694bf6fb6a1846a">
    3333<!ENTITY gcc-branch_update-patch-size "1.5 MB">
    34 
    35 <!ENTITY grep-fixes-patch "grep-&grep-version;-fixes-1.patch">
    36 <!ENTITY grep-fixes-patch-md5 "0cb36684847842adb17a1b3fb96f733d">
    37 <!ENTITY grep-fixes-patch-size "12 KB">
    3834
    3935<!ENTITY iputils-fixes-patch "iputils-&iputils-version;-fixes-1.patch">
Note: See TracChangeset for help on using the changeset viewer.