Package: dgit Version: 12.8 Severity: normal Dear Maintainer,
I try to build a package comming from here gbp clone http://salsa.debian.org/science-team/hyperspy origtargz dgit --gbp sbuild which end up like this $ dgit --gbp sbuild Format `3.0 (quilt)', need to check/update patch stack dgit: split brain (separate dgit view) may be needed (--quilt=gbp). examining quilt state (multiple patches, gbp mode) dgit: base trees orig=4f3547c9556f7313400b o+d/p=4f3547c9556f7313400b dgit: quilt differences: src: ## orig == gitignores: == orig == dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p dgit: error: --quilt=gbp specified, implying patches-unapplied git tree dgit: but git tree differs from orig in upstream files. dgit: For full diff showing the problem(s), type: dgit: git diff 4f3547c9556f7313400bf895d6a00bce3b8e6ee5 HEAD -- :/ ':!debian' ':!/.gitignore' ':!*/.gitignore' dgit: dgit: ... debian/patches is missing; perhaps this is a patch queue branch? picca@page:~/debian/science-team/hyperspy$ git diff 4f3547c9556f7313400bf895d6a00bce3b8e6ee5 HEAD -- :/ ':!debian' ':!/.gitignore' ':!*/.gitignore' diff --git a/doc/make.bat b/doc/make.bat index 08e5a3cdd..f9e22d429 100755 --- a/doc/make.bat +++ b/doc/make.bat @@ -1,157 +1,157 @@ -@ECHO OFF - -REM Command file for Sphinx documentation - -if "%SPHINXBUILD%" == "" ( - set SPHINXBUILD=sphinx-build -) -set BUILDDIR=_build -set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% . -if NOT "%PAPER%" == "" ( [...] it seems to me that this is something related to the gitattributes. $ cat .gitattributes # Set default behaviour, in case users don't have core.autocrlf set. * text=auto *.py diff=python *.bat eol=crlf *.msa eol=crlf *.nsi eol=crlf I would like your advices in order to solve this issue. I imported the sources with gbp import-orig --uscan thanks for considering Fred -- System Information: Debian Release: trixie/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 6.12.17-amd64 (SMP w/6 CPU threads; PREEMPT) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages dgit depends on: ii apt 2.9.31 ii ca-certificates 20241223 ii coreutils 9.5-1+b1 ii curl 8.12.1-3 ii devscripts 2.25.5 ii dpkg-dev 1.22.15 ii dput 1.2.4 ii git [git-core] 1:2.47.2-0.1 ii git-buildpackage 0.9.37 ii libdpkg-perl 1.22.15 ii libjson-perl 4.10000-1 ii liblist-moreutils-perl 0.430-2 ii liblocale-gettext-perl 1.07-7+b1 ii libtext-csv-perl 2.05-1 ii libtext-glob-perl 0.11-3 ii libtext-iconv-perl 1.7-8+b4 ii libwww-curl-perl 4.17-11 ii perl [libdigest-sha-perl] 5.40.1-2 ii python3 3.13.2-2 Versions of packages dgit recommends: ii distro-info-data 0.63 ii liburi-perl 5.30-1 ii openssh-client [ssh-client] 1:9.9p2-1 Versions of packages dgit suggests: ii cowbuilder 0.90 ii pbuilder 0.231.1 ii sbuild 0.88.5 -- no debconf information
