Hi Alessandro, Thanks for the patch, when I run debuild on the same I get:
bhavani@bhavani-spagetti-monster:~/sponsoring/keepassx-0.4.3$ debuild -S -sa -k2E303A1E dpkg-buildpackage -rfakeroot -d -us -uc -S -sa dpkg-buildpackage: source package keepassx dpkg-buildpackage: source version 0.4.3-2ubuntu1 dpkg-buildpackage: source changed by Alessandro Losavio <[email protected]> dpkg-source --before-build keepassx-0.4.3 fakeroot debian/rules clean dh clean --parallel --buildsystem=qmake_qt4 dh_testdir -O--parallel -O--buildsystem=qmake_qt4 debian/rules override_dh_auto_clean make[1]: Entering directory `/home/bhavani/sponsoring/keepassx-0.4.3' dh_auto_clean rm -rf bin build make[1]: Leaving directory `/home/bhavani/sponsoring/keepassx-0.4.3' dh_clean -O--parallel -O--buildsystem=qmake_qt4 dpkg-source -b keepassx-0.4.3 dpkg-source: info: using source format `3.0 (quilt)' dpkg-source: info: building keepassx using existing ./keepassx_0.4.3.orig.tar.gz dpkg-source: info: local changes detected, the modified files are: keepassx-0.4.3/src/KpxConfig.h keepassx-0.4.3/src/dialogs/SettingsDlg.cpp dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/keepassx_0.4.3-2ubuntu1.diff.6HjkYH dpkg-source: info: you can integrate the local changes with dpkg-source --commit dpkg-buildpackage: error: dpkg-source -b keepassx-0.4.3 gave error exit status 2 debuild: fatal error at line 1357: dpkg-buildpackage -rfakeroot -d -us -uc -S -sa failed Can you please check whether the patches apply cleanly as dpkg-source detects byhand changes or please correct me if I'm missing something here. Regards Bhavani -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1094568 Title: Merge Keppassx from 0.4.3-1ubuntu3 to 0.4.3-2 (universe) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/keepassx/+bug/1094568/+subscriptions -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
