[git.ipfire.org] IPFire 3.x development tree branch, master, updated. b3c1fffa24b3ba0109b6ac3880d0740444b287d8

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. b3c1fffa24b3ba0109b6ac3880d0740444b287d8

[git]

[-- Attachment #1: Type: text/plain, Size: 4984 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  b3c1fffa24b3ba0109b6ac3880d0740444b287d8 (commit)
       via  9943604121477ba834314b444ad60adf0683e4db (commit)
       via  59d8b7646af5f7b1c37956d09d559439c53bd366 (commit)
       via  e18fc0fa68db548f07da6babb482d51218bcfe9d (commit)
      from  22e4598587764f81f6a44927f96d6e6bdd04b6aa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b3c1fffa24b3ba0109b6ac3880d0740444b287d8
Merge: 59d8b76 9943604
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Sep 20 19:46:05 2013 +0100

    Merge remote-tracking branch 'arne_f/kernel'

commit 9943604121477ba834314b444ad60adf0683e4db
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Sep 20 20:38:47 2013 +0200

    kernel: fix console output.

commit 59d8b7646af5f7b1c37956d09d559439c53bd366
Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
Date:   Fri Sep 20 12:36:15 2013 +0100

    elinks: Update to 0.12pre6.
    
    Fixes an issue which pages which could not be shown.

commit e18fc0fa68db548f07da6babb482d51218bcfe9d
Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
Date:   Fri Sep 20 12:35:47 2013 +0100

    linux-firmware: Update to 20130910.

-----------------------------------------------------------------------

Summary of changes:
 elinks/elinks.nm                 |  9 ++++++---
 kernel/config-generic            | 22 +++++++++++-----------
 kernel/kernel.nm                 |  2 +-
 linux-firmware/linux-firmware.nm |  4 ++--
 4 files changed, 20 insertions(+), 17 deletions(-)

Difference in files:
diff --git a/elinks/elinks.nm b/elinks/elinks.nm
index 1e7bc51..82cc8b0 100644
--- a/elinks/elinks.nm
+++ b/elinks/elinks.nm
@@ -4,8 +4,10 @@
 ###############################################################################
 
 name       = elinks
-version    = 0.11.7
-release    = 2
+version    = 0.12
+ver_suffix = pre6
+release    = 1.%{ver_suffix}
+thisapp    = %{name}-%{version}%{ver_suffix}
 
 groups     = Applications/Internet
 url        = http://elinks.or.cz/
@@ -19,7 +21,8 @@ description
 	It is quite portable and runs on a variety of platforms.
 end
 
-source_dl  =
+source_dl  = http://elinks.or.cz/download/
+sources    = %{thisapp}.tar.bz2
 
 build
 	requires
diff --git a/kernel/config-generic b/kernel/config-generic
index 8f9f118..38d7ea1 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -2992,24 +2992,24 @@ CONFIG_DRM_QXL=m
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_HDMI=y
-CONFIG_FB=m
-# CONFIG_FIRMWARE_EDID is not set
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_DDC is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLITym
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
+CONFIG_FB_TILEBLITTING=y
 
 #
 # Frame buffer hardware drivers
@@ -3065,7 +3065,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # Console display driver support
 #
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
+CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FONT_8x16=y
 CONFIG_FONT_AUTOSELECT=y
 CONFIG_LOGO=y
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index ad2019c..b22f071 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 3.10.9
-release    = 1
+release    = 2
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
diff --git a/linux-firmware/linux-firmware.nm b/linux-firmware/linux-firmware.nm
index 096adef..f5906f4 100644
--- a/linux-firmware/linux-firmware.nm
+++ b/linux-firmware/linux-firmware.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = linux-firmware
-version    = 20130307
-git_ver    = c530a75
+version    = 20130910
+git_ver    = 3fe01af
 release    = 1.git%{git_ver}
 arch       = noarch
 thisapp    = %{name}-%{git_ver}


hooks/post-receive
--
IPFire 3.x development tree