[debdiff] bunch of fixes for libvisual-plugins

[DarkMageZ]

This most likely fixes bugs #103393 & #109409 (thanks raof for testing that the patch does indeed fix a JESS 64-bit crasher)

Also disables the gdkpixbuf plugin as it is just a boring blank plugin (unless someone wants to fix it up so it'll load images from the users home directory... but then it's not really a visualization)

Fixes an issue wit the configure script so that lv_analyzer actually gets built.

fixes lv_flower & lv_gltest & nastyfft so that they actually get compiled against libgl so that they will work. (#115502)

[Emmet Hikory (persia)]

Thanks for the debdiff, with all the fixes. We don't process NMUs in Ubuntu (no "maintainer" concept), so you don't need that entry in your changelog. Also, it appears to be that bugs 103393 and 109409 are duplicates, especially as they are addressed by the same patch. While developing a final solution in this bug is now appropriate, please consider setting the bugs as duplicate, and attaching the debdiff to the master in the future. I have unsubscribed ubuntu-universe-sponsors pending an undated debdiff without the NMU reference, please resubscribe (and appropriately adjust the status) when complete.

[DarkMageZ (darkmagez)]

after advice on how to do this in a much cleaner fashion (go raof). i've tidied up the changes so it's using the cdbs patch system. (so i won't be instantly cleaning that up and reuploading)

i've appiled the patches, but apparently it's possible to clean up the autotool changes so that it won't be such a whale of a debdiff & diff.gz.

i'm attaching my current version of the .diff.gz (this makes the one i emailed to raof obsolete, it wasn't perfectly clean cause cdbs-edit-patch trips out if there's a space in the path to the sources. notice how the patches start in bloody, not libvisual-0.4-plugins or whatever :P)

i'd be interested in knowning how this autotools changes cutdown is done so i can apply it to the other package i'm also working on.

[DarkMageZ (darkmagez)]

this is my second attempt. the nmu comment has been removed and the autotooling is done + nice patch system.

this debdiff is x2 the size of the old one. but the actual diff is only 677KB compared to the ubuntu one @ 1.5MB and compared to my first attempt @ 2.5MB

[Emmet Hikory (persia)]

Thanks a lot for your work on this. It looks much better. A couple remaining notes:

1) Please adjust to comply with https://wiki.ubuntu.com/DebianMaintainerField
2) Why are you changing from automake1.9 to automake1.7? Does this fix something? It's not clear from the changelog.

I've unsubscribed ubuntu-universe-sponsors pending these adjustments. Please resubscribe when a new candidate is available. Also, if the patch is ready, please unassign yourself, and set "Confirmed" to encourage the sponsors to apply the changes.

[DarkMageZ (darkmagez)]

removed 99_autotools as it is now done @ build time. (with whatever version the package automake refers to) (tested with automake1.10)
hopefully fixed so it is now in compliance with the debianmaintainerfield spec.

awaiting confirmation that this patch is ready before unassigning & confirming as i considered attempt 1 & 2 as ready.

[Emmet Hikory (persia)]

This looks fairly good. Three points:

1) It's best to specify the preferred versions of virtual packages in build-depends, to be sure of what will be built.

2) Please re-enable the Spanish translations. This probably involves some further patching of op/Makefile.am or po/Makefile.in.in

3) It's always a good idea to discuss changes of this magnitude with the Debian maintainer. Otherwise, you'll end up maintaining the package for Ubuntu.

[DarkMageZ (darkmagez)]

2) removed 05_remove_po.patch and added 05_fix_po :)
theoretically fixes the translations. (yes, i'm a dirty hack)

1) refering to the control file build-dep on automake? this has been changed to automake1.10 | automake

3) email sent off on Saturday 07 Jul 2007 @ 15:24 +1000
no response yet

[Emmet Hikory (persia)]

This latest debdiff looks good and clean, and appears to do the right thing. Please resubscribe ubuntu-universe-sponsors if your communication with Debian indicates that a migration to dpatch would be welcome. If the determination is that dpatch should not be used, please submit a new debdiff without the introduction of a patch system, and subscribe ubuntu-universe-sponsors for upload.

[DarkMageZ (darkmagez)]

new debdiff... since ubuntu likes to upload practically waste of time changes without checking to see if there are any worthwhile changes sitting around in the bug reports.

changes since last debdiff: (apart from even more regression testing)
removed a useless build-dep which is nolonger needed
added the new ubuntu changelog entre...
tidied up my changelog entre

So David Schleef, as the debian maintainer for libvisual-plugins. what do you think of the move to dpatch & the automated autotooling?

[DarkMageZ (darkmagez)]

debian maintainer has not responded in 3 months since first attempt of contact and over 2 weeks since last attempt.
if debian has a problem with the changes they don't have to integrate them. if the motu's want to follow debian again in the future with this package then all they need to do is either just raw import their package or apply the patches straight and remove the patch system & automated autotooling.

[Emmet Hikory (persia)]

The Sponsors team should never be assigned bugs. Subscribed is sufficient for attention.

[Daniel Holbach (dholbach)]

Thanks for your patch.

Instead of adding libtool & autoconf & automake1.10 | automake and having all the autogenerated stuff in the debdiff, could you please add a 90_autoreconf patch and move everything in there?

[DarkMageZ (darkmagez)]

new debdiff as requested with new icky 90_autoreconf.patch
makes the diff.gz huge and the debdiff even bigger XD

[Daniel Holbach (dholbach)]

Let's look at the diffstat together.

This is OK:
 debian/changelog | 25
 debian/control | 4
 debian/patches/01_disable-gforce-dfsg.patch | 52
 debian/patches/02_64-bit_JESS_fix.patch | 58
 debian/patches/03_build_against_gl_fixes.patch | 372
 debian/patches/04_lv_analyzer_build_fix.patch | 12
 debian/patches/05_fix_po.patch | 127
 debian/patches/90_autoreconf.patch |57204 +++++++++++++++++++++++++
 debian/rules | 3

Auto-generated stuff (which should probably be in 90_autoreconf.patch:
 Makefile.in | 269
 aclocal.m4 |10023 ++--
 configure | 8485 ++-
 plugins/Makefile.in | 170
 plugins/actor/JESS/Makefile.in | 227
 plugins/actor/Makefile.in | 169
 plugins/actor/bumpscope/Makefile.in | 222
 plugins/actor/corona/Makefile.in | 238
 plugins/actor/gdkpixbuf/Makefile.in | 221
 plugins/actor/gstreamer/Makefile.in | 221
 plugins/actor/infinite/Makefile.in | 225
 plugins/actor/jakdaw/Makefile.in | 222
 plugins/actor/lv_analyzer/Makefile.in | 221
 plugins/actor/lv_gltest/Makefile.in | 252
 plugins/actor/lv_scope/Makefile.in | 221
 plugins/actor/madspin/Makefile.in | 268
 plugins/actor/nastyfft/Makefile.in | 251
 plugins/actor/oinksie/Makefile.in | 235
 plugins/actor/pseudotoad_flower/Makefile.in | 324
 plugins/input/Makefile.in | 168
 plugins/input/alsa/Makefile.in | 204
 plugins/input/debug/Makefile.in | 203
 plugins/input/esd/Makefile.in | 203
 plugins/input/jack/Makefile.in | 204
 plugins/input/mplayer/Makefile.in | 203
 plugins/morph/Makefile.in | 168
 plugins/morph/alphablend/Makefile.in | 203
 plugins/morph/flash/Makefile.in | 203
 plugins/morph/slide/Makefile.in | 203
 plugins/morph/tentacle/Makefile.in | 203

Stuff that should probably be in another patch:
 plugins/actor/Makefile.am | 1
 configure.ac | 24

[DarkMageZ (darkmagez)]

explaination on why the debdiff is a whale =D

1ubuntu2 had autotool changes applied directly in the diff. so that was purged. then i've gone and made changes which make debians autotooling useless. then regenerated new useful copy into a patch aka 90_
so the debdiff shows the removing of debian autotool cruft and a big patch which is the retooling.

for a nicer view:
<libvisual guys> orig.tar.gz
<debian> regenerate autotool stuff
<me> unpack orig.tar.gz
<me> purge all autotool changes from the diff.gz then apply
<me> add patch system then remake / add patches (including some stuff debian applied directly in diff)
<me> reautotool in 90_*.patch

so this debdiff represents all of the removing of the debian autotooling and then a big patch which is the retooling. (since debians was directly in the diff and mine is in a .patch, they do not get compared which makes this huge)

[DarkMageZ (darkmagez)]

for the record about the diffstat in comment 15.
that diffstat was run against the debdiff. which includes showing that the debian autotooling was removed (which are the area's marked as bad).

if you diffstat the .diff tho you get OK results :)

 changelog | 65
 compat | 1
 control | 17
 copyright | 35
 libvisual-0.4-plugins.install | 1
 patches/01_disable-gforce-dfsg.patch | 52
 patches/02_64-bit_JESS_fix.patch | 58
 patches/03_build_against_gl_fixes.patch | 372
 patches/04_lv_analyzer_build_fix.patch | 12
 patches/05_fix_po.patch | 127
 patches/90_autoreconf.patch |57204 ++++++++++++++++++++++++++++++++
 rules | 13
 12 files changed, 57957 insertions(+)

[DarkMageZ (darkmagez)]

same as last upload cept now with --enable-debug as a configure option. this allows apport to give us proper stacktraces.

[Daniel Holbach (dholbach)]

Chris? Emmet?

[Chris Halse Rogers (raof)]

Thanks very much for your work. Sorry it took so long for us to do something about it! In the course of reviewing this, I created a minimal autoretooling patch (attached) which you may or may not want to look at for future reference. In the end though Emmet & I decided that having the autofoo files touched in two different places (Debian's diff.gz & debian/patches) was too confusing, so I re-did the full autoreconf patch.

Thanks again for your work! I've updated some of the LP bug numbers in the changelog, and added some more. Your package closes all but one of these bugs, and that's a wishlist. Hopefully the next bug you touch won't be such a complicated one :).

[Chris Halse Rogers (raof)]

libvisual-plugins (0.4.0.dfsg.1-1ubuntu3) gutsy; urgency=low

  [ Richard James Edmands ]
  [Patches by David Leverton]
  * debian/patches/02_64-bit_JESS_fix.patch:
    - Fix a crasher with JESS on 64-bit (LP: #103393, LP: #109409, LP: #85163)
  * debian/patches/03_build_against_gl_fixes.patch:
    - Fixes the makefiles to make sure GL visualizations get built against libGL
      (LP: #115502)
  * debian/patches/04_lv_analyzer_build_fix.patch:
    - Fixes configure so that lv_analyzer actually gets built

  [Richard Edmands]
  * debian/patches/01_disable-gforce-dfsg.patch:
    - Converted the old g-force disable change to a patch
  * debian/patches/05_fix_po.patch:
    - Fixed so translations work properly
  * debian/rules:
    - Disabling gdkpixbuf plugin as it is just a blank visualization
    - Enable Debugging (LP: #150781)
  * debian/control:
    - Bumped Standards version to 3.7.2
    - Remove build-dep on libgdk-pixbuf-dev as it is no longer needed

  [ Christopher James Halse Rogers ]
  * debian/90_autoreconf:
    - Run autoreconf to activate the build-system fixes.
    - Move all of Debian's auto* changes from the .diff.gz to this patch.
  * By combined power of above, close (LP: #123934). Thanks very much for your
    work!

 -- Christopher James Halse Rogers <email address hidden> Wed, 10 Oct 2007 22:00:24 +1000