Please sync aap (1.090-2) from Debian unstable

[Julien Lavergne]

Binary package hint: aap

Please sync aap (1.090-1) from Debian unstable. All modifications made by Ubuntu was merged. It'll also close bug #112329.

Last changelog entry :

aap (1.090-1) unstable; urgency=low

  * QA upload.
    + Set maintainer to Debian QA Group <email address hidden>
  * New upstream release. (Closes: #480680).
  * Add quilt patch system.
  * Move existing source modifications to quilt patches.
  * 030_python26.diff - New patch to build with Python2.6. (Closes: #522847).
    + Thanks to Colin Watson for the patch.
  * Add watch file.
  * Add Homepage.
  * Make clean not ignore errors.
  * Move debhelper commands to binary-indep since package is arch: all.
  * Fix doc-base section.
  * Move DH_COMPAT from rules to debian/compat and set to 5.
  * Bump Standards Version to 3.8.1.

 -- Barry deFreese <email address hidden> Fri, 24 Apr 2009 12:01:14 -0400

[Krzysztof Klimonda (kklimonda)]

aap will be sync'd with debian sid version when karmic koala development begins.
bug #112329 should be fixed by backporting patch from mainstream to all affected ubuntu releases.

[Julien Lavergne (gilir)]

aap is not in sync with Debian since there is a modification made by Ubuntu (actual version is 1.072-1.1ubuntu1). Automatic import will not work if the package is not re-sync with Debian. Why do you make this bug Invalid ?

And of course, this sync should only occur when Karmic will be open for developpement. This is just a reminder to make the sync when Karmic will be open.

[Krzysztof Klimonda (kklimonda)]

Obviously my bad, You haven't attached version from ubuntu's repository so It looked like invalid (I know, I know - you have mentioned Ubuntu modifications.. like I said, my bad).

[Daniel Holbach (dholbach)]

Did anybody try to test-build this in Ubuntu? To me it looks like the patch needs to be directly applied (instead of using quilt) because the unpatched aap is called during the clean target.

dpkg-buildpackage: source changed by Barry deFreese <email address hidden>
dpkg-buildpackage: host architecture amd64
 fakeroot debian/rules clean
dh_testdir
dh_testroot
QUILT_PATCHES=debian/patches quilt pop -a -R || test $? = 2
No patch removed
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
./aap clean
Traceback (most recent call last):
  File "./aap", line 10, in <module>
    import Main
  File "/tmp/buildd/aap-1.090/Main.py", line 14, in <module>
    from DoAddDef import doadddef
  File "/tmp/buildd/aap-1.090/DoAddDef.py", line 10, in <module>
    from Action import find_primary_action
  File "/tmp/buildd/aap-1.090/Action.py", line 30, in <module>
    from Dictlist import listitem2str, str2dictlist, dictlist2str
  File "/tmp/buildd/aap-1.090/Dictlist.py", line 18, in <module>
    from Process import recipe_error
  File "/tmp/buildd/aap-1.090/Process.py", line 13, in <module>
    from Work import setrpstack
  File "/tmp/buildd/aap-1.090/Work.py", line 25, in <module>
    from Node import Node
  File "/tmp/buildd/aap-1.090/Node.py", line 10, in <module>
    import Filetype
  File "/tmp/buildd/aap-1.090/Filetype.py", line 1417
    as = 0
     ^
SyntaxError: invalid syntax
make: *** [clean] Error 1
dpkg-buildpackage: failure: fakeroot debian/rules clean gave error exit status 2
pbuilder: Failed autobuilding of package
 -> Aborting with an error
 -> unmounting dev/pts filesystem
 -> unmounting proc filesystem
 -> cleaning the build env
    -> removing directory /var/cache/pbuilder/build//3923 and its subdirectories

[Krzysztof Klimonda (kklimonda)]

That's because in clean target ``quild pop'' is called before ``./app clean'' and ``./app cleanALL''. Also clean should be dependent on configure target. Attached debdiff fixes it. Probably also should be send to to debian bugtracker.

[Julien Lavergne (gilir)]

Yes, it's the cause of the FTBFS.
You can also only push the patch before ``./app clean'' and ``./app cleanALL'' instead of the entire configure target.
I completed the debdiff, it's now a merge.

[Julien Lavergne (gilir)]

The patch of Krzysztof was uploaded on Debian with the 1.090-2 version. We can now sync it with Debian.

[James Westby (james-w)]

ACK from me.

Thanks,

James

[James Westby (james-w)]

[Updating] aap (1.072-1.1ubuntu1 [Ubuntu] < 1.090-2 [Debian])
 * Trying to add aap...
  - <aap_1.090-2.dsc: cached>
  - <aap_1.090.orig.tar.gz: cached>
  - <aap_1.090-2.diff.gz: cached>
I: aap [universe] -> aap_1.072-1.1ubuntu1 [universe].
I: aap [universe] -> aap-doc_1.072-1.1ubuntu1 [universe].