From 2718330937e0419c00d18517857932c9f8df4814 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Thu, 5 Apr 2012 03:44:09 -0500 Subject: [PATCH] debian: new upstream release candidate Signed-off-by: Jonathan Nieder --- debian/changelog | 6 +++--- debian/changelog.upstream | 41 ++++++++++++++++++++++++++++++++++++++++- debian/copyright | 2 +- debian/versions.upstream | 2 ++ 4 files changed, 46 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9af179ecd0..8ee272ceb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -git (1:1.7.10~rc3-1) experimental; urgency=low +git (1:1.7.10~rc4-1) experimental; urgency=low * new upstream release candidate. * merge: use editor by default in interactive sessions * submodules: use relative paths to git dir and worktree. * fast-import: reject "ls" of path with empty components. - * cli: add Chinese and Swedish translations. + * cli: add Chinese, Dutch, Portuguese, and Swedish translations. * am: officially deprecate -b/--binary option. * debian/diff: * 0005-gitk-use-symbolic-font-names-sans-and-monospace-when-.diff, @@ -16,7 +16,7 @@ git (1:1.7.10~rc3-1) experimental; urgency=low * debian/control: package git: Suggests: gettext-base for translated output in shell scripts. - -- Jonathan Nieder Fri, 30 Mar 2012 12:10:10 -0500 + -- Jonathan Nieder Thu, 05 Apr 2012 03:44:03 -0500 git (1:1.7.9.5-1) unstable; urgency=low diff --git a/debian/changelog.upstream b/debian/changelog.upstream index 701c3f4656..30c1a16bc1 100644 --- a/debian/changelog.upstream +++ b/debian/changelog.upstream @@ -1,3 +1,31 @@ +Version v1.7.10-rc4; changes since v1.7.10-rc3: +----------------------------------------------- + +Heiko Voigt (1): + string-list: document that string_list_insert() inserts unique strings + +Jiang Xin (1): + l10n: Improve zh_CN translation for Git 1.7.10-rc3 + +Junio C Hamano (3): + merge: backport GIT_MERGE_AUTOEDIT support + Git 1.7.9.6 + Git 1.7.10-rc4 + +Marco Sousa (1): + l10n: Inital Portuguese Portugal language (pt_PT) + +Pat Thoyts (2): + gitk: fix tabbed preferences construction when using tcl 8.4 + gitk: fix setting font display with new tabbed dialog layout. + +René Scharfe (1): + config: remove useless assignment + +Vincent van Ravesteijn (1): + l10n: Add the Dutch translation team and initialize nl.po + + Version v1.7.10-rc3; changes since v1.7.10-rc2: ----------------------------------------------- @@ -152,7 +180,7 @@ Vincent van Ravesteijn (3): Documentation/git-branch: add default for --contains -Version v1.7.10-rc0; changes since v1.7.9.5: +Version v1.7.10-rc0; changes since v1.7.9.6: -------------------------------------------- Adrian Weimann (1): @@ -453,6 +481,17 @@ ws3389 (1): git-svn: un-break "git svn rebase" when log.abbrevCommit=true +Version v1.7.9.6; changes since v1.7.9.5: +----------------------------------------- + +Heiko Voigt (1): + string-list: document that string_list_insert() inserts unique strings + +Junio C Hamano (2): + merge: backport GIT_MERGE_AUTOEDIT support + Git 1.7.9.6 + + Version v1.7.9.5; changes since v1.7.9.4: ----------------------------------------- diff --git a/debian/copyright b/debian/copyright index 75eb66c817..0cc858c00e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Contact: git@vger.kernel.org Source: http://code.google.com/p/git-core/downloads/list Files: * -Copyright: © 2005-2011, Linus Torvalds and others. +Copyright: © 2005-2012, Linus Torvalds and others. License: GPL-2 Files: xdiff/* diff --git a/debian/versions.upstream b/debian/versions.upstream index 2696b14433..f44259b874 100644 --- a/debian/versions.upstream +++ b/debian/versions.upstream @@ -332,7 +332,9 @@ v1.7.9.2 v1.7.9.3 v1.7.9.4 v1.7.9.5 +v1.7.9.6 v1.7.10-rc0 v1.7.10-rc1 v1.7.10-rc2 v1.7.10-rc3 +v1.7.10-rc4 -- 2.11.4.GIT