Unexpected upstream changes after running uscan / gbp import-orig for Amarok

[Boyuan Yang]

Hi,

在 1/19/2025 12:21 PM, Aurélien COUDERC 写道:
> Hi Team,
> 
> I was trying to update Amarok to 3.2.1 and after running uscan, gbp import-orig and adding a changelog entry for 3.2.1 I get the below error while running dpkg-buildpackage -S -d.
> 
> Is there anything obvious I’m missing (besides that I should remove the upstream source from the repo because it makes no sense to mix it with the debian packaging, and live happily ever after) ?

Starting from a clean clone with HEAD of
https://salsa.debian.org/qt-kde-team/extras/amarok/-/commit/3c58a5e429e515d56f66efe391ecb5b063fbd0d5 ,
the following workflow works for me:

#######################################################
$ gbp import-orig --uscan --pristine-tar
$ dch -i

# ... add new entry

$ gbp buildpackage [...]
#######################################################

No error was reported with dpkg-source. There will be
some build failures due to dh_install but that is
unrelated.

My guess is that the git workspace may not be clean.
Consider running 'git clean -xdf' frequently and check
local git commit history to ensure that nothing unexpected
(including .pc/ dir) was accidentally committed.

Thanks,
Boyuan Yang


> $ LANG=C dpkg-buildpackage -S -d -us -uc
> dpkg-buildpackage: info: source package amarok
> dpkg-buildpackage: info: source version 3.2.1-1
> dpkg-buildpackage: info: source distribution UNRELEASED
> dpkg-buildpackage: info: source changed by Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
>   dpkg-source --before-build .
>   debian/rules clean
> dh clean
>     dh_auto_clean --buildsystem=kf5
>     dh_clean
>   dpkg-source -b .
> dpkg-source: info: using source format '3.0 (quilt)'
> dpkg-source: info: building amarok using existing ./amarok_3.2.1.orig.tar.xz
> dpkg-source: info: using patch list from debian/patches/series
> dpkg-source: info: local changes detected, the modified files are:
>   amarok/src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp
>   amarok/src/services/ServiceSqlQueryMaker.cpp
> dpkg-source: hint: make sure the version in debian/changelog matches the unpacked source tree
> dpkg-source: hint: you can integrate the local changes with dpkg-source --commit
> dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/amarok_3.2.1-1.diff.d_GnMd
> dpkg-buildpackage: error: dpkg-source -b . subprocess returned exit status 2
> 
> 
> 
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-kde-talk/attachments/20250119/f1d8124a/attachment.sig>