Changeset 1796

Show
Ignore:
Timestamp:
12/17/06 01:03:31 (2 years ago)
Author:
alexander
Message:

Fixed conflict with the host subversion

Location:
trunk
Files:
1 removed
7 modified
2 copied
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r1775 r1796  
    257257        ch-xbitmaps ch-Xorg-app ch-xcursor-themes ch-xorg-server \ 
    258258        ch-Xorg-font ch-Xorg-driver ch-XML-Parser ch-xkeyboard-config \ 
    259         ch-synaptics ch-inputattach \ 
     259        ch-synaptics ch-inputattach ch-fonts-thai \ 
    260260        ch-freefont ch-fonts-dejavu ch-fonts-kochi ch-fonts-firefly ch-fonts-baekmuk \ 
    261261        ch-libjpeg ch-libtiff ch-openssh ch-glib2 ch-giflib ch-imlib ch-imlib2 \ 

  • trunk/packages/LFS-BOOK/Makefile

    r1780 r1796  
    2828stage2: Makefile $(FILE) 
    2929        @$(call echo_message, Building) 
    30         @svn co -q $(REVPARM) $(URL) $(DIR) 
    31         #tar xf $(FILE) 
    32         @cd $(DIR) ; make BASEDIR=../$(HTMLDIR) 
    33         cp -av $(DIR) $(HTMLDIR) /usr/share 
     30        @mkdir tmp 
     31        @cd tmp ; svn co $(REVPARM) $(URL) $(DIR) >$(DIR)-$@.log 2>&1 
     32        #cd tmp ; tar xf $(FILE) >>$(DIR)-$@.log 2>&1 
     33        @cd tmp/$(DIR) ; make BASEDIR=../$(HTMLDIR) >>$(DIR)-$@.log 2>&1 
     34        @cd tmp ; cp -av $(DIR) $(HTMLDIR) /usr/share >>$(DIR)-$@.log 2>&1 
    3435        @sed -i \ 
    3536         's@file:///.*index.html@file:///usr/share/$(HTMLDIR)/index.html@' \ 
    … …  
    3738        @sed -i 's@WWW_HOME=\".*\"@WWW_HOME=\"/usr/share/$(HTMLDIR)/index.html\"@' \ 
    3839         $(ROOT)/etc/profile 
    39         @make clean >$(DIR)-$@.log 2>&1 
     40        @make clean >>$(DIR)-$@.log 2>&1 
    4041        @touch $@ 
    4142 
    4243clean: 
    43         -rm -rf $(DIR) $(HTMLDIR) 
     44        -rm -rf tmp 
    4445 
    4546.PHONY: clean chroot compile-stage2 

  • trunk/packages/dosfstools/Makefile

    r1757 r1796  
    2121 
    2222compile-stage2: 
     23        sed -i 's,ln -s,ln -sf,' */Makefile 
    2324        make 
    2425        make install 

  • trunk/packages/fontconfig/Makefile

    r1364 r1796  
    2424        make $(PM) 
    2525        make install 
    26         sed -i -e 's/Bitstream Vera/DejaVu/' /etc/fonts/fonts.conf 
    27         sed -i -e 's,^\(\t\t\t<family>Kochi.*\)$$,\1\n\t\t\t<family>AR PL New Sung</family>,' /etc/fonts/fonts.conf 
    28         cp $(ROOT)/etc/fonts/local.conf /etc/fonts/local.conf 
     26        cp $(ROOT)/etc/fonts/{fonts,local}.conf /etc/fonts/ 
    2927 
    3028clean: 

  • trunk/packages/livecd-bootscripts/lang.dat

    r1733 r1796  
    7575Swedish_(ISO-8859-1)                    sv_SE           "sv-latin1"     ""              "se" 
    7676Swedish_(UTF-8)                         sv_SE.UTF-8     "sv-latin1"     "iso-8859-1"    "se" 
     77Thai_(TIS-620)                          th_TH           "th-win-latin1" ""              "us,th" 
     78Thai_(UTF-8)                            th_TH.UTF-8     "th-win-uni"    ""              "us,th" 
    7779Turkish,_F_keyboard_(ISO-8859-9)        tr_TR           "trf"           ""              "tr_f" 
    7880Turkish,_F_keyboard_(UTF-8)             tr_TR.UTF-8     "trf"           "iso-8859-9"    "tr_f" 

  • trunk/packages/livecd-bootscripts/langconf

    r1486 r1796  
    7474        # Base the selection on the language's non-UTF-8 locale charmap 
    7575        F_CHARMAP=`LC_ALL=${F_LANG%.UTF-8} locale charmap` 
    76         while IFS="     " read CHARMAP FONT ERROR 
     76        while IFS="     " read CHARMAP G_FONT ERROR 
    7777        do 
    7878                if [ "$F_CHARMAP" = "$CHARMAP" ] 
    7979                then 
    80                         F_FONT="$FONT" 
     80                        F_FONT="$G_FONT" 
    8181                        F_ERROR="$ERROR" 
    8282                        if [ "$F_ERROR" != "0" ] 

  • trunk/packages/udev/76-network.rules

    r1725 r1796  
    11# Run dhcpcd when anything resembling a valid Ethernet-like interface appears 
    2 ACTION=="add", SUBSYSTEM=="net", SYSFS{addr_len}=="6", SYSFS{address}!="00:00:00:00:00:00", RUN+="dhcp-helper %k" 
     2ACTION=="add", SUBSYSTEM=="net", ATTR{addr_len}=="6", ATTR{address}!="00:00:00:00:00:00", RUN+="dhcp-helper %k" 
    33 
    44# "dhcpcd -k" is not good: it destroys the cache but fails to send DHCP_RELEASE 

  • trunk/packages/udev/Makefile

    r1764 r1796  
    4141        cp -v etc/udev/rules.d/[0-9]* /etc/udev/rules.d/ 
    4242        cd $(CONFDIR) ; make install install-doc install-extra-doc 
    43         echo 'ACTION=="add", BUS=="pci", SYSFS{class}=="0x030000", RUN+="detect-video"' >/etc/udev/rules.d/30-video.rules 
     43        rm /etc/udev/rules.d/81-cdrom.rules 
     44        echo 'ACTION=="add", SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", IMPORT{program}="cdrom_id --export $tempnode", GROUP="cdrom"' >/etc/udev/rules.d/61-cdrom.rules 
     45        echo 'ACTION=="add", BUS=="pci", ATTR{class}=="0x030000", RUN+="detect-video"' >/etc/udev/rules.d/30-video.rules 
    4446        install -m755 ../detect-video ../dhcp-helper /lib/udev 
    45         install -m644 ../50-network.rules /etc/udev/rules.d/ 
     47        install -m644 ../76-network.rules /etc/udev/rules.d/ 
    4648        install -m644 -D docs/writing_udev_rules/index.html \ 
    4749         /usr/share/doc/$(DIR)/index.html