Hi,
Nano: Update to 2.4.2 GIT: http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=69d4fcba2...
From: Matthias Fischer fischerm42@t-online.de ---
diff --git a/config/rootfiles/packages/nano b/config/rootfiles/packages/nano index 67cf060..d31753c 100644 --- a/config/rootfiles/packages/nano +++ b/config/rootfiles/packages/nano @@ -21,10 +21,12 @@ usr/share/nano/cmake.nanorc usr/share/nano/css.nanorc usr/share/nano/debian.nanorc usr/share/nano/default.nanorc +usr/share/nano/elisp.nanorc usr/share/nano/fortran.nanorc usr/share/nano/gentoo.nanorc #usr/share/nano/go.nanorc usr/share/nano/groff.nanorc +usr/share/nano/guile.nanorc usr/share/nano/html.nanorc usr/share/nano/java.nanorc #usr/share/nano/javascript.nanorc @@ -41,6 +43,7 @@ usr/share/nano/patch.nanorc usr/share/nano/perl.nanorc usr/share/nano/php.nanorc usr/share/nano/po.nanorc +usr/share/nano/postgresql.nanorc usr/share/nano/pov.nanorc usr/share/nano/python.nanorc usr/share/nano/ruby.nanorc diff --git a/lfs/nano b/lfs/nano index 4eec9c1..bf80810 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@
include Config
-VER = 2.4.1 +VER = 2.4.2
THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 5 +PAK_VER = 6
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1c612b478f976abf8ef926480c7a3684 +$(DL_FILE)_MD5 = ce6968992fec4283c17984b53554168b
install : $(TARGET)
Hi,
thank you for sending in your patches as an email to this list.
However there are some slight problems that we need to sort out. The biggest one is that your email client did some weird stuff with the patch. On every line that did not start with a + or - character, it added an other space. So the patch did not apply until I removed the superfluous space characters.
On Sun, 2015-07-26 at 16:43 +0200, Matthias Fischer wrote:
Hi,
Nano: Update to 2.4.2 GIT: http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit ;h=69d4fcba20177bf3ab6d69c3e17a710d39f2b08b
You do not need to add a URL to the git branch. Just the change.
From: Matthias Fischer fischerm42@t-online.de
This should be "Signed-off-by"
diff --git a/config/rootfiles/packages/nano b/config/rootfiles/packages/nano index 67cf060..d31753c 100644 --- a/config/rootfiles/packages/nano +++ b/config/rootfiles/packages/nano @@ -21,10 +21,12 @@ usr/share/nano/cmake.nanorc usr/share/nano/css.nanorc usr/share/nano/debian.nanorc usr/share/nano/default.nanorc +usr/share/nano/elisp.nanorc usr/share/nano/fortran.nanorc usr/share/nano/gentoo.nanorc #usr/share/nano/go.nanorc usr/share/nano/groff.nanorc +usr/share/nano/guile.nanorc usr/share/nano/html.nanorc usr/share/nano/java.nanorc #usr/share/nano/javascript.nanorc @@ -41,6 +43,7 @@ usr/share/nano/patch.nanorc usr/share/nano/perl.nanorc usr/share/nano/php.nanorc usr/share/nano/po.nanorc +usr/share/nano/postgresql.nanorc usr/share/nano/pov.nanorc usr/share/nano/python.nanorc usr/share/nano/ruby.nanorc diff --git a/lfs/nano b/lfs/nano index 4eec9c1..bf80810 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@
include Config
-VER = 2.4.1 +VER = 2.4.2
THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 5 +PAK_VER = 6
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1c612b478f976abf8ef926480c7a3684 +$(DL_FILE)_MD5 = ce6968992fec4283c17984b53554168b
install : $(TARGET)
The content is fine.
I merged this one since I manually edited it. Have you tried using "git send-email"?
-Michael