1. Forum
  2. Usenet
  3. LINUX.DEBIAN.BUGS.DIST

  • Bug#1099741: dgit: does not work out of the box with the rosettasciio r

    From =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-@21:1/5 to All on Fri Mar 7 12:50:01 2025
    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 no
  • From Ian Jackson@21:1/5 to All on Fri Mar 28 18:30:01 2025
    Control: reassign -1 src:git-buildpackage

    Picca Frédéric-Emmanuel writes ("Bug#1099741: dgit: does not work out of the box with the rosettasciio repository"):
    I try to build a package comming from here
    ...
    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

    That seems likely.

    It seems like you are trying to base your work on upstream tarballs.
    In that case, to work with dgit, your git objects must contain
    precisely the same as the tarball - in this case, with crlf line endings.

    I looked at doc/make.bat and the version in the git tree seems to have
    nl line endings, even though the version in the Debian archive has
    crlf line endings.

    I conjecture that this tune

    gbp import-orig --uscan

    failed to defuse the gitattributes before doing the tarball import.

    Ian.

    --
    Ian Jackson <ijackson@chiark.greenend.org.uk> These opinions are my own.

    Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk,
    that is a private address which bypasses my fierce spamfilter.

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)