On 2025-06-22 13:45:31 [+0200], To Paul Gevers wrote: > Control: tags -1 - moreinfo > > On 2025-06-19 22:02:00 [+0200], Paul Gevers wrote: > > Hi, > Hi, > > > It seems to me that the only important bug in testing that we're fixing with > > this version is bug #1106311 (and the out of sync bug). That bug doesn't > > need all the new upstream releases. Can't we have a target fix that is > > appropriate for this phase of the freeze? I think all we want is something > > like > > https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=1106311;filename=git.diff.txt;msg=19. > > I'll even grant permission to use of t-p-u for that. Can you prepare a > > source diff for review? > > Please find attached the diff addressing just this single bug.
again, now with proper suite. > > Paul > Sebastian
diff -Nru git-2.47.2/debian/changelog git-2.47.2/debian/changelog --- git-2.47.2/debian/changelog 2025-01-19 09:06:17.000000000 +0100 +++ git-2.47.2/debian/changelog 2025-06-22 13:21:11.000000000 +0200 @@ -1,3 +1,13 @@ +git (1:2.47.2-0.2) trixie; urgency=medium + + * Non-maintainer upload. + * debian/rules: remove overly strict check for license file + content matching base-files. This unbreaks the build on + builders with an updated copy of the GPLv2 text (thx + Santiago Vila; closes: #1106311). + + -- Sebastian Andrzej Siewior <sebast...@breakpoint.cc> Sun, 22 Jun 2025 13:21:11 +0200 + git (1:2.47.2-0.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru git-2.47.2/debian/git.links git-2.47.2/debian/git.links --- git-2.47.2/debian/git.links 2025-01-19 09:05:07.000000000 +0100 +++ git-2.47.2/debian/git.links 2025-06-22 12:22:47.000000000 +0200 @@ -1,6 +1,5 @@ usr/share/bash-completion/completions/git usr/share/bash-completion/completions/gitk usr/share/gitweb/gitweb.cgi usr/share/gitweb/index.cgi usr/share/git-core/contrib/hooks usr/share/doc/git/contrib/hooks -# These licenses are checked for equivalent contents in override_dh_installdocs. usr/share/common-licenses/Apache-2.0 usr/share/doc/git/contrib/persistent-https/LICENSE usr/share/common-licenses/GPL-2 usr/share/doc/git/contrib/subtree/COPYING diff -Nru git-2.47.2/debian/rules git-2.47.2/debian/rules --- git-2.47.2/debian/rules 2025-01-19 09:05:07.000000000 +0100 +++ git-2.47.2/debian/rules 2025-06-22 12:22:47.000000000 +0200 @@ -147,9 +147,6 @@ override_dh_installdocs-arch: dh_installdocs --arch -X.gitignore - # These licenses are replaced with symlinks in git.links. - diff -q '$(GIT)'/usr/share/doc/git/contrib/persistent-https/LICENSE /usr/share/common-licenses/Apache-2.0 - diff -bq '$(GIT)'/usr/share/doc/git/contrib/subtree/COPYING /usr/share/common-licenses/GPL-2 rm -rf '$(GIT)'/usr/share/doc/git/contrib/completion rm -rf '$(GIT)'/usr/share/doc/git/contrib/emacs rm -rf '$(GIT)'/usr/share/doc/git/contrib/hooks
