public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d00032e76530e9ba18f24ed182e1b5e9a4bfebe5
Date: Thu, 14 Apr 2016 12:04:55 +0100	[thread overview]
Message-ID: <20160414110457.589FE1081BDF@git01.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 3341 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 2.x development tree".

The branch, next has been updated
       via  d00032e76530e9ba18f24ed182e1b5e9a4bfebe5 (commit)
       via  41a8f7f3cc90f4abbb448d630b62a20a27c017a9 (commit)
      from  77ecb239d30f979d6fca595aaf79c40214bf758a (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 d00032e76530e9ba18f24ed182e1b5e9a4bfebe5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Apr 14 11:24:40 2016 +0100

    lcdproc: Bump release
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 41a8f7f3cc90f4abbb448d630b62a20a27c017a9
Author: Sascha Kilian <sascha(a)sakisoft.de>
Date:   Wed Apr 13 15:04:39 2016 +0000

    lcdproc: Update to 0.5.7
    
    Signed-off-by: Sascha Kilian <sascha(a)sakisoft.de>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 lfs/lcdproc                              |  7 +++----
 src/patches/lcdproc-0.5.6-menuitem.patch | 11 -----------
 2 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 src/patches/lcdproc-0.5.6-menuitem.patch

Difference in files:
diff --git a/lfs/lcdproc b/lfs/lcdproc
index 9e88622..83b2437 100644
--- a/lfs/lcdproc
+++ b/lfs/lcdproc
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.5.6
+VER        = 0.5.7
 
 THISAPP    = lcdproc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = lcdproc
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = 
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = df4f5c2c7285eaf6979b9c7768b4877f
+$(DL_FILE)_MD5 = 2f8e064233ef1d03e98c0b426595750d
 
 install : $(TARGET)
 
@@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/lcdproc-0.5.6-menuitem.patch
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
diff --git a/src/patches/lcdproc-0.5.6-menuitem.patch b/src/patches/lcdproc-0.5.6-menuitem.patch
deleted file mode 100644
index b9e933d..0000000
--- a/src/patches/lcdproc-0.5.6-menuitem.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/menuitem.c	2012/04/25 19:53:15	1.37
-+++ server/menuitem.c	2013/01/17 21:27:27	1.38
-@@ -33,6 +33,8 @@
- 
- #define MAX_NUMERIC_LEN 40
- 
-+extern Menu *main_menu;		/* Access to the main menu */
-+
- char *error_strs[] = {"", "Out of range", "Too long", "Too short", "Invalid Address"};
- char *menuitemtypenames[] = {"menu", "action", "checkbox", "ring", "slider", "numeric", "alpha", "ip"};
- char *menueventtypenames[] = {"select", "update", "plus", "minus", "enter", "leave"};


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

                 reply	other threads:[~2016-04-14 11:04 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160414110457.589FE1081BDF@git01.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox