Bug#656198: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656198

[Picca Frédéric-Emmanuel]

Le Mon, 23 Jan 2012 19:56:09 +0100,
Teemu Ikonen <tpikonen at gmail.com> a écrit :

> 2012/1/21 PICCA Frédéric-Emmanuel
> <frederic-emmanuel.picca at synchrotron-soleil.fr>:
> > Hello Teemu, I do not know about your patch system so can you deal with this issue ?
> > I am personnaly using gbp-pq which came with git-buildpackage as explain here [1]
> > [1] http://raphaelhertzog.com/2010/11/18/4-tips-to-maintain-a-3-0-quilt-debian-source-package-in-a-vcs/
> 
> Hello Frederic,
> 
> You should be able to commit the fix to the master branch, add the
> patch to debian/patches (and commit) and then build with debuild,
> git-buildpackage or similar.
> 
> I usually also cherry-pick separate patches to a separate branch in
> the git repo (and have scripts to refresh the patches automatically)
> but this can be done afterwards.
> 
> I'm going to be mostly offline this week, so please go ahead and make
> a new pymca release, if you want.
> 
> Best,
> 
> Teemu


Hello Teemu, here what I did to build pymca on my machine

picca at xxxxxx:~/Debian/sponsor/pymca$ debcheckout pymca
declared git repository at git://git.debian.org/git/debian-science/packages/pymca.git
git clone git://git.debian.org/git/debian-science/packages/pymca.git pymca ...
Cloning into 'pymca'...
remote: Counting objects: 1192, done.
remote: Compressing objects: 100% (794/794), done.
remote: Total 1192 (delta 535), reused 973 (delta 372)
Receiving objects: 100% (1192/1192), 9.72 MiB | 2.63 MiB/s, done.
Resolving deltas: 100% (535/535), done.


picca at xxxxxxx:~/Debian/sponsor/pymca/pymca$ git-buildpackage --git-pbuilder
dh_testdir
dh_clean
python setup.py clean
PyMca X-Ray Fluorescence Toolkit 4.4.1
running clean
You have PyQt4 and PyQwt5 installed.
PyMca is fully functional under PyQt4 with PyQwt5.
You can easily embed PyMca fitting in your Qt4 graphical 
applications using McaAdvancedFit.py
rm -rf build
gbp:info: pymca_4.4.1p1.orig.tar.gz does not exist, creating from 'upstream/4.4.1p1'
Building with cowbuilder for distribution sid
W: /home/picca/.pbuilderrc does not exist
I: using cowbuilder as pbuilder
dpkg-buildpackage: source package pymca
dpkg-buildpackage: source version 4.4.1p1-2
dpkg-buildpackage: source changed by Teemu Ikonen <tpikonen at gmail.com>
 dpkg-source --before-build pymca
dpkg-source: info: using options from pymca/debian/source/local-options: --abort-on-upstream-changes
 fakeroot debian/rules clean
dh_testdir
dh_clean
python setup.py clean
PyMca X-Ray Fluorescence Toolkit 4.4.1
running clean
You have PyQt4 and PyQwt5 installed.
PyMca is fully functional under PyQt4 with PyQwt5.
You can easily embed PyMca fitting in your Qt4 graphical 
applications using McaAdvancedFit.py
rm -rf build
 dpkg-source -b pymca
dpkg-source: info: using options from pymca/debian/source/local-options: --abort-on-upstream-changes
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building pymca using existing ./pymca_4.4.1p1.orig.tar.gz
dpkg-source: info: local changes detected, the modified files are:
 pymca/PyMca/PyMcaMain.py
 pymca/PyMca/scripts/pymcapostbatch
 pymca/setup.py
dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/pymca_4.4.1p1-2.diff.5HCOSs
dpkg-source: info: you can integrate the local changes with dpkg-source --commit
dpkg-buildpackage: error: dpkg-source -b pymca gave error exit status 2
gbp:error: git-pbuilder returned 2
gbp:error: Couldn't run 'git-pbuilder'


So it seems that the repository is not clean and I do not want to mess up your repository.
I attached the patch files generated during the build process.

See you

Frederic

-- 
GPG public key 4096R/4696E015 2011-02-14
    fingerprint = E92E 7E6E 9E9D A6B1 AA31  39DC 5632 906F 4696 E015
uid  Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>

GPG public key 1024D/A59B1171 2009-08-11
    fingerprint = 1688 A3D6 F0BD E4DF 2E6B  06AA B6A9 BA6A A59B 1171
uid  Picca Frédéric-Emmanuel <picca at debian.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pymca_4.4.1p1-2.diff.5HCOSs
Type: application/octet-stream
Size: 7972 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/debian-science-maintainers/attachments/20120126/55ce55dd/attachment-0001.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/debian-science-maintainers/attachments/20120126/55ce55dd/attachment-0001.pgp>