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

[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) ?

Thanks !
--
Aurélien


$ 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