conflicts with gnome-doc-utils #2

Closed
raveit65 opened this Issue Mar 9, 2012 · 15 comments

Projects

None yet

4 participants

@raveit65
raveit65 commented Mar 9, 2012

conflicting files:
/usr/share/xml/mallard/1.0/mallard.rnc
/usr/share/xml/mallard/1.0/mallard.rng
/usr/share/pkgconfig/xml2po.pc
/usr/bin/xml2po
/usr/lib/python2.7/site-packages/xml2po/init.py
/usr/lib/python2.7/site-packages/xml2po/modes/init.py
/usr/lib/python2.7/site-packages/xml2po/init.pyc
//usr/lib/python2.7/site-packages/xml2po/modes/init.pyc
//usr/lib/python2.7/site-packages/xml2po/init.pyo
/usr/lib/python2.7/site-packages/xml2po/modes/init.pyo
/usr/lib/python2.7/site-packages/xml2po/modes/basic.py
/usr/lib/python2.7/site-packages/xml2po/modes/basic.pyc
/usr/lib/python2.7/site-packages/xml2po/modes/basic.pyo
/usr/lib/python2.7/site-packages/xml2po/modes/docbook.py
/usr/lib/python2.7/site-packages/xml2po/modes/docbook.pyc
/usr/lib/python2.7/site-packages/xml2po/modes/docbook.pyo
/usr/lib/python2.7/site-packages/xml2po/modes/gs.py
/usr/lib/python2.7/site-packages/xml2po/modes/gs.pyc
/usr/lib/python2.7/site-packages/xml2po/modes/gs.pyo
/usr/lib/python2.7/site-packages/xml2po/modes/mallard.py
/usr/lib/python2.7/site-packages/xml2po/modes/mallard.pyc
/usr/lib/python2.7/site-packages/xml2po/modes/mallard.pyo
/usr/lib/python2.7/site-packages/xml2po/modes/ubuntu.py
/usr/lib/python2.7/site-packages/xml2po/modes/ubuntu.pyc
/usr/lib/python2.7/site-packages/xml2po/modes/ubuntu.pyo
/usr/lib/python2.7/site-packages/xml2po/modes/xhtml.py
/usr/lib/python2.7/site-packages/xml2po/modes/xhtml.pyc
/usr/lib/python2.7/site-packages/xml2po/modes/xhtml.pyo
/usr/share/man/man1/xml2po.1.gz

This patch fix the conflict: http://dl.dropbox.com/u/49862637/Mate-desktop/mate-doc-utils_rename.patch
The patch is a little bit tricky because the patched mate-doc-utils needs /usr/bin/matexml2po during package compiling.
If you build on a desktop you've rename /usr/bin/xml2po to /usr/bin/matexml2po for building the package.
If you build on a build system like me you've to installed a patched package first in the build system.
After installing the first version of the patched mate-doc-utils the build problem is gone.

I've build some new mate packages with the patched version and /usr/bin/matexml2po works well.

Ok, a normal user doesn't effect by this issue but a package mantainer who needs gnome3-devel can't install mate-doc-utils without this patch.

@stefano-k

can you solve this issue in the same way we fixed it in debian package?

check here https://github.com/mate-desktop/debian-packages/tree/master/mate-doc-utils/debian

@raveit65

If you mean this commit mate-desktop/debian-packages@27e0580
can you explain it more detailed why this solve the conflict?
?????????

@stefano-k

you should make a package "mate-doc-utils-gnome" which contains file in conflict, and all packages should depends on "mate-doc-utils-gnome" OR "gnome-doc-utils". see debian/control file

@raveit65

Thanks Stefano,
this might be a easier solution. I'll try to do that.
But i think than it's better comple removed the conflicting files in the build process and make 'BuidRequires' and 'package Requires' for packages to mate-doc-utils and gnome-doc-utils.
Can this work?

@stefano-k

but if in future gnome-doc-utils change something, we need to update all of our packages. I think in future we need to rename conflicts.

@stefano-k

Wolfgang: did you solve this issue?

@raveit65

It's fixed Stefano.
I remove the conflicting files and add gnome-doc-utils as an dependency for fedora.
See fedora-packages / mate-doc-utils / mate-doc-utils.spec under %install

@raveit65 raveit65 closed this Mar 29, 2012
@stefano-k

thanks!

@mariobl
mariobl commented Jul 29, 2012

For future releases, we should think about to migrate all dependencies of gnome-doc-utils and mate-doc-utils to itstool [1]. It can handle DocBook and Mallard docs as well, and it has some abilities which the old g-d-u stuff doesn't have, such as (for the output invisible) xml comments which mark sequences as not translatable.

[1] http://itstool.org/

@raveit65 raveit65 reopened this Jul 29, 2012
@raveit65

agree,
better than this mixing construct with gnome-doc-utils

@mariobl
mariobl commented Jul 29, 2012

I could help out to migrate the appropriate modules, in my humble abilities. Don't expect too much, but I have some experiences with such XML things, and I think I can. Keep in mind, it's a lot of work, and it will take some time...

@szesch
szesch commented Jul 29, 2012

itstool would fully replace mate-doc-utils? If so, we would need to make sure itstool is available for the vast majority of available distributions.

@mariobl
mariobl commented Jul 29, 2012

itstool is available for our mainstream distributions:
http://pkgs.org/search/?keyword=itstool

@mariobl
mariobl commented Aug 9, 2012

Unfortunately, itstool cannot replace mate-doc-utils (or even gnome-doc-utils) completely. As far as I can see, the conflicting files refer to the xml2po script. That one can be replaced by itstool. But I've no idea for the time being how we could handle with the Mallard stuff, which comes from gnome-doc-utils-stylesheets (in Fedora).

@stefano-k

http://wiki.mate-desktop.org/roadmap#release_18
we'll replace mate-doc-utils with yelp-tools

@stefano-k stefano-k closed this Jul 15, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment