[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 255c4793b52add6577e6cf856636adfa20a8b308

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 255c4793b52add6577e6cf856636adfa20a8b308

[git]

[-- Attachment #1: Type: text/plain, Size: 4434 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  255c4793b52add6577e6cf856636adfa20a8b308 (commit)
       via  669b7cfcf7b61dadd1b31f9b7f2033611f86d8da (commit)
       via  a5248e727fa4833fed0c910aff92658288bef388 (commit)
       via  631a299723fd2e60a79d4bfcd2ebbdda7846aa2a (commit)
      from  b60a4efcd4cfeb298e4c6e393a950e5b27712d19 (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 255c4793b52add6577e6cf856636adfa20a8b308
Merge: 669b7cf a5248e7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 2 17:24:09 2012 +0200

    Merge remote-tracking branch 'ms/git'

commit 669b7cfcf7b61dadd1b31f9b7f2033611f86d8da
Merge: b60a4ef 631a299
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 2 17:23:56 2012 +0200

    Merge remote-tracking branch 'ms/ncurses-terminfo'

commit a5248e727fa4833fed0c910aff92658288bef388
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 2 13:51:39 2012 +0000

    git: Install bash-completion file.
    
    bash-completion is a very handy feature and we
    want to make use of it.

commit 631a299723fd2e60a79d4bfcd2ebbdda7846aa2a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 2 13:49:15 2012 +0000

    ncurses: Package essential terminfo files in -base package.
    
    The most essential terminfo files have been moved to /lib/terminfo
    which does not exist anymore. But as those files need to be installed
    on every system, they are now packaged in the -base package.

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

Summary of changes:
 git/git.nm         |   12 +++++++++++-
 ncurses/ncurses.nm |   10 +++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/git/git.nm b/git/git.nm
index df2f449..361fad9 100644
--- a/git/git.nm
+++ b/git/git.nm
@@ -5,7 +5,7 @@
 
 name       = git
 version    = 1.7.8.2
-release    = 1
+release    = 2
 
 groups     = Development/Tools
 url        = http://git-scm.com/
@@ -45,6 +45,9 @@ build
 		echo "prefix = /usr" >> %{DIR_APP}/config.mak
 		echo "gitwebdir = /var/www/git" >> %{DIR_APP}/config.mak
 		echo "gitexecdir = lib/git-core" >> %{DIR_APP}/config.mak
+
+		# Remove shebang from bash-completion script.
+		sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash
 	end
 
 	build
@@ -52,6 +55,13 @@ build
 	end
 
 	make_install_targets += INSTALLDIRS=vendor
+
+	install_cmds
+		# Install bash completion file.
+		mkdir -pv %{BUILDROOT}%{sysconfdir}/bash_completion.d
+		install -v -m 644 contrib/completion/git-completion.bash \
+			%{BUILDROOT}%{sysconfdir}/bash_completion.d/git
+	end
 end
 
 packages
diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm
index 35c1cc0..7b3f918 100644
--- a/ncurses/ncurses.nm
+++ b/ncurses/ncurses.nm
@@ -5,7 +5,7 @@
 
 name       = ncurses
 version    = 5.9
-release    = 8
+release    = 9
 
 groups     = System/Base
 url        = http://invisible-island.net/ncurses/ncurses.html
@@ -126,10 +126,12 @@ packages
 
 		files
 			/usr/share/terminfo/*/Eterm*
+			/usr/share/terminfo/*/ansi
 			/usr/share/terminfo/*/aterm
 			/usr/share/terminfo/*/bterm
 			/usr/share/terminfo/*/cons25
 			/usr/share/terminfo/*/cygwin
+			/usr/share/terminfo/*/dumb
 			/usr/share/terminfo/*/eterm*
 			/usr/share/terminfo/*/gnome
 			/usr/share/terminfo/*/gnome-256color
@@ -137,6 +139,7 @@ packages
 			/usr/share/terminfo/*/jfbterm
 			/usr/share/terminfo/*/konsole
 			/usr/share/terminfo/*/konsole-256color
+			/usr/share/terminfo/*/linux
 			/usr/share/terminfo/*/mach*
 			/usr/share/terminfo/*/mlterm
 			/usr/share/terminfo/*/mrxvt
@@ -151,6 +154,11 @@ packages
 			/usr/share/terminfo/*/sun
 			/usr/share/terminfo/*/teraterm
 			/usr/share/terminfo/*/teraterm2.3
+			/usr/share/terminfo/*/vt100
+			/usr/share/terminfo/*/vt100-nav
+			/usr/share/terminfo/*/vt102
+			/usr/share/terminfo/*/vt220
+			/usr/share/terminfo/*/vt52
 			/usr/share/terminfo/*/vte
 			/usr/share/terminfo/*/vte-256color
 			/usr/share/terminfo/*/vwmterm


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