This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=fe3231220e6c4962cc9a5164cbbb6e7fa474e256

commit fe3231220e6c4962cc9a5164cbbb6e7fa474e256
Author: Guillem Jover <[email protected]>
AuthorDate: Thu Nov 25 00:15:36 2021 +0100

    Dpkg::Source::Package::V2: Add hint about version matching source tree
    
    When the source tree has been updated from a newer upstream release,
    but the version in debian/changelog has not been updated to match,
    dpkg-source will fail with what might seem like a cryptic error.
    
    Add a hint to help the unsuspecting users.
    
    Closes: #996044
    Based-on-patch-by: Samuel Henrique <[email protected]>
    Signed-off-by: Guillem Jover <[email protected]>
---
 scripts/Dpkg/Source/Package/V2.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/Dpkg/Source/Package/V2.pm 
b/scripts/Dpkg/Source/Package/V2.pm
index 05dd3ba64..eb0a49a89 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -557,6 +557,8 @@ sub do_build {
                                         skip_auto => 
$self->{options}{auto_commit},
                                         usage => 'build');
     unless (-z $tmpdiff or $self->{options}{auto_commit}) {
+        info(g_('Hint: make sure the version in debian/changelog matches ' .
+                'the unpacked source tree'));
         info(g_('you can integrate the local changes with %s'),
              'dpkg-source --commit');
         error(g_('aborting due to unexpected upstream changes, see %s'),

-- 
Dpkg.Org's dpkg

Reply via email to