Hi Iulian, Axel Beckert wrote: > Iulian Udrea wrote: > > Thanks for the report. I would be grateful if you could include this change > > in > > your NMU. > > Hrm, I'll check. Not sure if the dcut command was in time to cancel > the second direct upload. We'll see.
Seems to have worked.
Attached the updated debdiff. I'll upload directly to unstable and
push my changes to the master branch on alioth.
Regards, Axel
--
,''`. | Axel Beckert <a...@debian.org>, http://people.debian.org/~abe/
: :' : | Debian Developer, ftp.ch.debian.org Admin
`. `' | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
`- | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5
diff -Nru guilt-0.35/debian/changelog guilt-0.35/debian/changelog --- guilt-0.35/debian/changelog 2013-01-20 19:33:01.000000000 +0100 +++ guilt-0.35/debian/changelog 2013-06-18 01:21:58.000000000 +0200 @@ -1,3 +1,16 @@ +guilt (0.35-1.2) unstable; urgency=low + + * Non-maintainer upload with maintainer's permission. + * Fix unneeded conflict against git >= 1.8 by dropping the (for Debian) + unneeded in-program git version check as suggested by Jonathan Nieder + in #589708 (Closes: #692884) + * Reorder alternative dependencies: prefer git over transitional package + git-core. + * Set Homepage header to http://repo.or.cz/w/guilt.git (Closes: #692883) + * Fix man-page path for "guilt help" (Closes: #712620; LP #1191821) + + -- Axel Beckert <a...@debian.org> Tue, 18 Jun 2013 01:21:57 +0200 + guilt (0.35-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nru guilt-0.35/debian/control guilt-0.35/debian/control --- guilt-0.35/debian/control 2013-01-20 19:32:12.000000000 +0100 +++ guilt-0.35/debian/control 2013-06-17 23:59:46.000000000 +0200 @@ -6,14 +6,13 @@ Build-Depends: debhelper (>= 7) Build-Depends-Indep: asciidoc (>> 7.0.2-3), xmlto, libexpat1-dev Standards-Version: 3.9.2 -Homepage: http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/ +Homepage: http://repo.or.cz/w/guilt.git Vcs-Browser: http://git.debian.org/?p=collab-maint/guilt.git Vcs-Git: git://git.debian.org/git/collab-maint/guilt.git Package: guilt Architecture: all -Depends: ${misc:Depends}, git-core (>= 1.4) | git (>= 1:1.7), - git-core (<= 1:1.7.0.4-1) | git (<< 1:1.8) +Depends: ${misc:Depends}, git (>= 1:1.7) | git-core (>= 1.4) Description: quilt for git; similar to Mercurial queues Guilt (Git Quilt) is a series of bash scripts which add a Mercurial queues-like functionality and interface to git. The one distinguishing diff -Nru guilt-0.35/debian/patches/drop-dependency-check.patch guilt-0.35/debian/patches/drop-dependency-check.patch --- guilt-0.35/debian/patches/drop-dependency-check.patch 1970-01-01 01:00:00.000000000 +0100 +++ guilt-0.35/debian/patches/drop-dependency-check.patch 2013-06-17 23:01:05.000000000 +0200 @@ -0,0 +1,26 @@ +Description: Drop in-program git version check +Author: Axel Beckert <a...@debian.org> +Debian-Bug: 692884 + +Index: guilt/guilt +=================================================================== +--- guilt.orig/guilt 2013-06-17 18:47:39.000000000 +0200 ++++ guilt/guilt 2013-06-17 22:57:35.000000000 +0200 +@@ -26,17 +26,6 @@ + . "$(git --exec-path)/git-sh-setup" + + # +-# Git version check +-# +-gitver=`git --version | cut -d' ' -f3 | sed -e 's/^debian\.//'` +-case "$gitver" in +- 1.5.*) ;; # git config +- 1.6.*) ;; # git config +- 1.7.*) ;; # git config +- *) die "Unsupported version of git ($gitver)" ;; +-esac +- +-# + # Shell library + # + usage() diff -Nru guilt-0.35/debian/patches/fix-guilt-help-man-page-path.patch guilt-0.35/debian/patches/fix-guilt-help-man-page-path.patch --- guilt-0.35/debian/patches/fix-guilt-help-man-page-path.patch 1970-01-01 01:00:00.000000000 +0100 +++ guilt-0.35/debian/patches/fix-guilt-help-man-page-path.patch 2013-06-18 01:18:46.000000000 +0200 @@ -0,0 +1,17 @@ +Description: Fix "guilt help" man page path +Author: Axel Beckert <a...@debian.org> +Debian-Bug: 712620 + +Index: guilt/guilt-help +=================================================================== +--- guilt.orig/guilt-help 2013-06-17 18:47:39.000000000 +0200 ++++ guilt/guilt-help 2013-06-18 01:13:58.000000000 +0200 +@@ -34,7 +34,7 @@ + ;; + esac + +-MANDIR=`dirname $0`/../man ++MANDIR=`dirname $0`/../share/man + MANDIR=`(cd "$MANDIR"; pwd)` + exec man -M "$MANDIR" "$page" + diff -Nru guilt-0.35/debian/patches/series guilt-0.35/debian/patches/series --- guilt-0.35/debian/patches/series 2011-08-05 23:39:23.000000000 +0200 +++ guilt-0.35/debian/patches/series 2013-06-18 01:19:22.000000000 +0200 @@ -1,2 +1,4 @@ DocMakefile.patch Makefile.patch +drop-dependency-check.patch +fix-guilt-help-man-page-path.patch
signature.asc
Description: Digital signature
