hydrogen packaging
Hi Team, I am currently working on updating hydrogen package. Current lintian output $ lintian -IE --pedantic --no-tag-display-limit hydrogen_0.9.7-1_amd64.changes I: hydrogen source: quilt-patch-missing-description 1000_portaudio_v2.patch P: hydrogen source: debian-watch-may-check-gpg-signature I: hydrogen: hardening-no-fortify-functions usr/bin/h2cli I: hydrogen: hardening-no-fortify-functions usr/bin/h2player I: hydrogen: hardening-no-fortify-functions usr/bin/h2synth I: hydrogen: hardening-no-fortify-functions usr/bin/hydrogen I: hydrogen: arch-dep-package-has-big-usr-share 10457kB 63% W: hydrogen: binary-without-manpage usr/bin/h2cli W: hydrogen: binary-without-manpage usr/bin/h2player W: hydrogen: binary-without-manpage usr/bin/h2synth W: hydrogen: script-not-executable usr/share/hydrogen/data/i18n/updateTranslations.sh I am thinking to split package this way: hydrogen hydrogen-data hydrogen-doc any thoughts? best regards mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
2016-11-11 22:22 GMT+01:00 Jaromír Mikeš : > Hi Team, > > I am currently working on updating hydrogen package. > Current lintian output > > $ lintian -IE --pedantic --no-tag-display-limit hydrogen_0.9.7-1_amd64.changes > I: hydrogen source: quilt-patch-missing-description 1000_portaudio_v2.patch > P: hydrogen source: debian-watch-may-check-gpg-signature > I: hydrogen: hardening-no-fortify-functions usr/bin/h2cli > I: hydrogen: hardening-no-fortify-functions usr/bin/h2player > I: hydrogen: hardening-no-fortify-functions usr/bin/h2synth > I: hydrogen: hardening-no-fortify-functions usr/bin/hydrogen > I: hydrogen: arch-dep-package-has-big-usr-share 10457kB 63% > W: hydrogen: binary-without-manpage usr/bin/h2cli > W: hydrogen: binary-without-manpage usr/bin/h2player > W: hydrogen: binary-without-manpage usr/bin/h2synth > W: hydrogen: script-not-executable > usr/share/hydrogen/data/i18n/updateTranslations.sh > > I am thinking to split package this way: > hydrogen > hydrogen-data > hydrogen-doc After splitting package fail to build :( [100%] Built target hydrogen make[2]: Leaving directory '/build/hydrogen-0.9.7/obj-x86_64-linux-gnu' /usr/bin/cmake -E cmake_progress_start /build/hydrogen-0.9.7/obj-x86_64-linux-gnu/CMakeFiles 0 make[1]: Leaving directory '/build/hydrogen-0.9.7/obj-x86_64-linux-gnu' touch debian/stamp-makefile-build CDBS WARNING: DEB_MAKE_CHECK_TARGET unset, not running checks #inkscape -z -edata/img/gray/h2-icon.png -D -w32 -h32 --export-area-snap data/img/gray/h2-icon.svg rsvg-convert -w 32 -h 32 -f png -o data/img/gray/h2-icon.png data/img/gray/h2-icon.svg pngtopnm -alpha data/img/gray/h2-icon.png > data/img/gray/h2-icon.alpha.pgm pngtopnm data/img/gray/h2-icon.png | ppmtoxpm -alphamask=data/img/gray/h2-icon.alpha.pgm > data/img/gray/h2-icon.xpm ppmtoxpm: (Computing colormap... ppmtoxpm: ...Done. 340 colors found.) rm -f data/img/gray/h2-icon.png data/img/gray/h2-icon.alpha.pgm /usr/bin/make -C data/doc make[1]: Entering directory '/build/hydrogen-0.9.7/data/doc' make[1]: *** No rule to make target 'manual.docbook', needed by 'manual_en.docbook'. Stop. make[1]: Leaving directory '/build/hydrogen-0.9.7/data/doc' debian/rules:58: recipe for target 'debian/docs.stamp' failed make: *** [debian/docs.stamp] Error 2 Can some CDBS master have a look and help please? best regards mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
Hi Jaromír and all, while you're working around the Hydrogen packaging, can I humbly ask you to have a look at this bug : https://bugs.debian.org/629107 ? There is willingness upstream (which I'm part of regarding the manual) to update and improve the bundled update manual and not having it displayed/accessible in the GUI is frustrating. As said in bug 629107, I've been looking at it but am not knowledgeable/competent to resolve it. Help here would be appreciated. Olivier ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
2016-11-12 11:58 GMT+01:00 : > while you're working around the Hydrogen packaging, can I humbly > ask you to have a look at this bug : > https://bugs.debian.org/629107 ? > > There is willingness upstream (which I'm part of regarding the > manual) to update and improve the bundled update manual and not > having it displayed/accessible in the GUI is frustrating. > > As said in bug 629107, I've been looking at it but am not > knowledgeable/competent to resolve it. Help here would be > appreciated. Hi Olivier, I know about this bug and I am not ignoring it. I already tried fix it in past without success :( Hopefully some more skilled mate from team will give a hand with it. best regards mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
Ok almost happy with hydrogen package. I would like to close also this bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=591301 by adding libportmidi-dev [linux-any], to B-D ... How to do it right way in CDBS? There are B-D in d/rules file and d/control I guess I should add it to one file and regenerate the other. advice? best regards mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
2016-11-13 19:20 GMT+01:00 Jaromír Mikeš : > Ok almost happy with hydrogen package. > I would like to close also this bug: > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=591301 > by adding libportmidi-dev [linux-any], to B-D ... How to do it right > way in CDBS? > There are B-D in d/rules file and d/control I guess I should add it to > one file and regenerate the other. I think hydrogen package is ready for upload. As package has been split I think there is a need upload from DD. Can someone review and upload please? best regards mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
2016-11-13 21:23 GMT+01:00 Jaromír Mikeš : > I think hydrogen package is ready for upload. > As package has been split I think there is a need upload from DD. > Can someone review and upload please? ping? ;) best regards mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
Hi Jaromír,
On 13/11/16 20:23, Jaromír Mikeš wrote:
> 2016-11-13 19:20 GMT+01:00 Jaromír Mikeš :
>> Ok almost happy with hydrogen package.
>> I would like to close also this bug:
>> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=591301
>> by adding libportmidi-dev [linux-any], to B-D ... How to do it right
>> way in CDBS?
>> There are B-D in d/rules file and d/control I guess I should add it to
>> one file and regenerate the other.
>
> I think hydrogen package is ready for upload.
> As package has been split I think there is a need upload from DD.
> Can someone review and upload please?
Here's a review:
-- d/changelog
> + * Exclude .gitignore file from upstream tarball.
Can this be removed now?
> + * Split package.
I think you should say how the package is split up.
-- d/copyright_hints
The copyright hints are out of date. You should carefully look at
copyright_newhints (after built) and adjust d/copyright accordingly.
-- d/control
> - librubberband-dev,
> - libpulse-dev,
Was this change intentional?
> Package: hydrogen
[...]
> hydrogen-data
You almost certainly want something stricter than this like:
hydrogen-data (= ${source:Version})
> Package: hydrogen-data
[...]
> Breaks: hydrogen (<= 0.9.6.1-1)
> Replaces: hydrogen (<= 0.9.6.1-1)
The convention is to use something like (<< 0.9.7-1~) instead (ie << the
'fixed' version). Your version would break installations if someone
modified hydrogen and gave it a local package number. It will also force
Ubuntu to patch hydrogen since they have 0.9.6.1-1build1.
> Package: hydrogen-doc
[...]
> Breaks: hydrogen (<= 0.9.6.1-1)
> Replaces: hydrogen (<= 0.9.6.1-1)
Same as above.
-- d/hydrogen.install
> usr/share/hydrogen/data/img
It seems that the only reason for putting this in hydrogen instead of
hydrogen-data is the SVG icon?
> data/img/gray/h2-icon.xpm usr/share/pixmaps
Since there is no longer a menu file, installing an XPM icon seems a bit
pointless (they're ignored by .desktop files).
-- d/links
Rename to hydrogen.links?
-- d/patches/1010-spelling.patch
> +- ERRORLOG( "Could't locate two Jack input port" );
> ++ ERRORLOG( "Couldn't locate two Jack input port" );
Should be "...input ports" (plural ports)
> ++[...]more information about you can find here:[...]
Maybe "you can find more information here:"?
-- d/rules
> +DEB_CLEAN_EXCLUDE=debian/tmp
> +DEB_DESTDIR = $(CURDIR)/debian/tmp/
What is the purpose of this?
> + cp data/doc/manual_en.html data/doc/manual_en.html.bak
> + touch data/doc/manual.docbook data/doc/tutorial.docbook
> $(MAKE) -C data/doc
> touch $@
> + mv data/doc/manual_en.html.bak data/doc/manual_en.html
Doesn't restoring manual_en.html defeat the purpose of rebuilding the
documentation?
> -
> +
> imgstub = data/img/gray/h2-icon
Stray whitespace in diff. All the XPM stuff seems useless now. Possibly
could drop some build-dependencies after this (I haven't checked).
> # TODO: build-depend on help2man when solved using it with normal builds
> #CDBS_BUILD_DEPENDS += , librsvg2-bin, netpbm, help2man
This comment and the help2man bit is now obsolete now that upstream have
a manually written manpage.
Thanks,
James
signature.asc
Description: OpenPGP digital signature
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
On 24/11/16 22:30, Jaromír Mikeš wrote: > 2016-11-13 21:23 GMT+01:00 Jaromír Mikeš : > >> I think hydrogen package is ready for upload. >> As package has been split I think there is a need upload from DD. >> Can someone review and upload please? > > ping? ;) Didn't see this before replying - I never forgot, just hasn't had a lot of time lately :) James signature.asc Description: OpenPGP digital signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
2016-11-24 23:38 GMT+01:00 James Cowgill :
> On 13/11/16 20:23, Jaromír Mikeš wrote:
>> 2016-11-13 19:20 GMT+01:00 Jaromír Mikeš :
Hi James,
thank you for your time to review this ... more issues than I thought ;)
> Here's a review:
>
> -- d/changelog
>> + * Exclude .gitignore file from upstream tarball.
> Can this be removed now?
You mean from changelog or removing .gitignore file?
>> + * Split package.
> I think you should say how the package is split up.
Done.
> -- d/copyright_hints
> The copyright hints are out of date. You should carefully look at
> copyright_newhints (after built) and adjust d/copyright accordingly.
I can't find copyright_newhints file ... maybe because I build with pbuilder?
Need advise here ...
> -- d/control
>> - librubberband-dev,
>> - libpulse-dev,
>
> Was this change intentional?
This was done by my wrong manipulation with CDBS
libpulse-dev is back
librubberband-dev not as it is marked as experimental and mature ...
instead rubberband-cli is a dependency ... providing same
functionality
>> Package: hydrogen
> [...]
>> hydrogen-data
>
> You almost certainly want something stricter than this like:
> hydrogen-data (= ${source:Version})
Done
>> Package: hydrogen-data
> [...]
>> Breaks: hydrogen (<= 0.9.6.1-1)
>> Replaces: hydrogen (<= 0.9.6.1-1)
>
> The convention is to use something like (<< 0.9.7-1~) instead (ie << the
> 'fixed' version). Your version would break installations if someone
> modified hydrogen and gave it a local package number. It will also force
> Ubuntu to patch hydrogen since they have 0.9.6.1-1build1.
>
>> Package: hydrogen-doc
> [...]
>> Breaks: hydrogen (<= 0.9.6.1-1)
>> Replaces: hydrogen (<= 0.9.6.1-1)
>
> Same as above.
Fixed for both packages
> -- d/hydrogen.install
>> usr/share/hydrogen/data/img
> It seems that the only reason for putting this in hydrogen instead of
> hydrogen-data is the SVG icon?
Yes
>> data/img/gray/h2-icon.xpm usr/share/pixmaps
>
> Since there is no longer a menu file, installing an XPM icon seems a bit
> pointless (they're ignored by .desktop files).
Fixed ...
> -- d/links
> Rename to hydrogen.links?
Done ...
> -- d/patches/1010-spelling.patch
>> +- ERRORLOG( "Could't locate two Jack input port" );
>> ++ ERRORLOG( "Couldn't locate two Jack input port" );
>
> Should be "...input ports" (plural ports)
>
>> ++[...]more information about you can find here:[...]
>
> Maybe "you can find more information here:"?
Spelling patch improved ... but as you see it is already forwarded
> -- d/rules
>> +DEB_CLEAN_EXCLUDE=debian/tmp
>> +DEB_DESTDIR = $(CURDIR)/debian/tmp/
>
> What is the purpose of this?
This was committed by mistake ... :(
Cleaned.
>> + cp data/doc/manual_en.html data/doc/manual_en.html.bak
>> + touch data/doc/manual.docbook data/doc/tutorial.docbook
>> $(MAKE) -C data/doc
>> touch $@
>> + mv data/doc/manual_en.html.bak data/doc/manual_en.html
>
> Doesn't restoring manual_en.html defeat the purpose of rebuilding the
> documentation?
Exactly ...
>> -
>> +
>> imgstub = data/img/gray/h2-icon
>
> Stray whitespace in diff. All the XPM stuff seems useless now. Possibly
> could drop some build-dependencies after this (I haven't checked).
Removed from rules file
>> # TODO: build-depend on help2man when solved using it with normal builds
>> #CDBS_BUILD_DEPENDS += , librsvg2-bin, netpbm, help2man
>
> This comment and the help2man bit is now obsolete now that upstream have
> a manually written manpage.
comments cleaned ... related B-D removed
best regards
mira
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
-- d/patches/1010-spelling.patch +- ERRORLOG( "Could't locate two Jack input port" ); ++ ERRORLOG( "Couldn't locate two Jack input port" ); Should be "...input ports" (plural ports) ++[...]more information about you can find here:[...] Maybe "you can find more information here:"? Spelling patch improved ... but as you see it is already forwarded Committed on upstream: https://github.com/hydrogen-music/hydrogen/pull/439 https://github.com/hydrogen-music/hydrogen/pull/440 HTH ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
2016-11-25 1:59 GMT+01:00 Jaromír Mikeš : > 2016-11-24 23:38 GMT+01:00 James Cowgill : >> -- d/changelog >>> + * Exclude .gitignore file from upstream tarball. >> Can this be removed now? > > You mean from changelog or removing .gitignore file? So only this issue I don't understand. > >> -- d/copyright_hints >> The copyright hints are out of date. You should carefully look at >> copyright_newhints (after built) and adjust d/copyright accordingly. > > I can't find copyright_newhints file ... maybe because I build with pbuilder? > Need advise here ... Ok ... copyright file and copyright_hint fixed ;) best regards mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
On 25/11/16 00:59, Jaromír Mikeš wrote: > 2016-11-24 23:38 GMT+01:00 James Cowgill : >> On 13/11/16 20:23, Jaromír Mikeš wrote: >>> 2016-11-13 19:20 GMT+01:00 Jaromír Mikeš : > > Hi James, > > thank you for your time to review this ... more issues than I thought ;) > >> Here's a review: >> >> -- d/changelog >>> + * Exclude .gitignore file from upstream tarball. >> Can this be removed now? > > You mean from changelog or removing .gitignore file? Oh I thought you reverted this stuff but I see that you haven't (just removed the ~repack suffix). If you haven't worked out yet, I am of the opinion that repacking an orig tarball for the purposes of making git-buildpackage easier to use is unacceptable. See devref 6.7.8. >> -- d/rules >>> + cp data/doc/manual_en.html data/doc/manual_en.html.bak >>> + touch data/doc/manual.docbook data/doc/tutorial.docbook >>> $(MAKE) -C data/doc >>> touch $@ >>> + mv data/doc/manual_en.html.bak data/doc/manual_en.html >> >> Doesn't restoring manual_en.html defeat the purpose of rebuilding the >> documentation? > > Exactly ... I was suggesting that you remove the cp and mv. Thanks, James signature.asc Description: OpenPGP digital signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
2016-11-25 17:13 GMT+01:00 James Cowgill : > On 25/11/16 00:59, Jaromír Mikeš wrote: >> 2016-11-24 23:38 GMT+01:00 James Cowgill : >>> On 13/11/16 20:23, Jaromír Mikeš wrote: 2016-11-13 19:20 GMT+01:00 Jaromír Mikeš : >> >> Hi James, >> >> thank you for your time to review this ... more issues than I thought ;) >> >>> Here's a review: >>> >>> -- d/changelog + * Exclude .gitignore file from upstream tarball. >>> Can this be removed now? >> >> You mean from changelog or removing .gitignore file? > > Oh I thought you reverted this stuff but I see that you haven't (just > removed the ~repack suffix). > > If you haven't worked out yet, I am of the opinion that repacking an > orig tarball for the purposes of making git-buildpackage easier to use > is unacceptable. > > See devref 6.7.8. If this is ok solution than done. http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/2016-August/053680.html >>> -- d/rules + cp data/doc/manual_en.html data/doc/manual_en.html.bak + touch data/doc/manual.docbook data/doc/tutorial.docbook $(MAKE) -C data/doc touch $@ + mv data/doc/manual_en.html.bak data/doc/manual_en.html >>> >>> Doesn't restoring manual_en.html defeat the purpose of rebuilding the >>> documentation? >> >> Exactly ... > > I was suggesting that you remove the cp and mv. done! best regards mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
Hi, On 25/11/16 17:15, Jaromír Mikeš wrote: > 2016-11-25 17:13 GMT+01:00 James Cowgill : >> On 25/11/16 00:59, Jaromír Mikeš wrote: >>> 2016-11-24 23:38 GMT+01:00 James Cowgill : -- d/changelog > + * Exclude .gitignore file from upstream tarball. Can this be removed now? >>> >>> You mean from changelog or removing .gitignore file? >> >> Oh I thought you reverted this stuff but I see that you haven't (just >> removed the ~repack suffix). >> >> If you haven't worked out yet, I am of the opinion that repacking an >> orig tarball for the purposes of making git-buildpackage easier to use >> is unacceptable. >> >> See devref 6.7.8. > > If this is ok solution than done. > http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/2016-August/053680.html I didn't know about the filter option, but yes that looks like a good solution. >> -- d/hydrogen.install >>> usr/share/hydrogen/data/img >> It seems that the only reason for putting this in hydrogen instead of >> hydrogen-data is the SVG icon? > > Yes I don't think you should ship the entire data/img directory in the hydrogen package just for this. Either only install that one svg and move everything over to the -data package, or duplicate the svg since it's only 9kB. Thanks, James signature.asc Description: OpenPGP digital signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
Hi, 2016-11-26 0:15 GMT+01:00 James Cowgill : > On 25/11/16 17:15, Jaromír Mikeš wrote: >> 2016-11-25 17:13 GMT+01:00 James Cowgill : >> If this is ok solution than done. >> http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/2016-August/053680.html > > I didn't know about the filter option, but yes that looks like a good > solution. Ok ... it is also new for me and I like it ... I think I will adopt it on many other packages too. >>> -- d/hydrogen.install usr/share/hydrogen/data/img >>> It seems that the only reason for putting this in hydrogen instead of >>> hydrogen-data is the SVG icon? >> >> Yes > > I don't think you should ship the entire data/img directory in the > hydrogen package just for this. Either only install that one svg and > move everything over to the -data package, or duplicate the svg since > it's only 9kB. Ok ... I thought that icon make sense to be installed in binary package but as hydrogen package can't be installed without hydrogen-data package all img dir is now moved to -data package. Fixed. best regards mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
Hi, On 26/11/16 02:02, Jaromír Mikeš wrote: > 2016-11-26 0:15 GMT+01:00 James Cowgill : >> On 25/11/16 17:15, Jaromír Mikeš wrote: >>> 2016-11-25 17:13 GMT+01:00 James Cowgill : -- d/hydrogen.install > usr/share/hydrogen/data/img It seems that the only reason for putting this in hydrogen instead of hydrogen-data is the SVG icon? >>> >>> Yes >> >> I don't think you should ship the entire data/img directory in the >> hydrogen package just for this. Either only install that one svg and >> move everything over to the -data package, or duplicate the svg since >> it's only 9kB. > > Ok ... I thought that icon make sense to be installed in binary package > but as hydrogen package can't be installed without hydrogen-data package > all img dir is now moved to -data package. I agree that putting the icon in the main package does make sense - it just seemed like a lot of other stuff could have gone in the data package. One thing is that appstream (ie GNOME software center) requires the icon to be in the main package so hydrogen won't show up at the moment. Thanks, James signature.asc Description: OpenPGP digital signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
2016-11-26 13:44 GMT+01:00 James Cowgill : > Hi, > > On 26/11/16 02:02, Jaromír Mikeš wrote: >> 2016-11-26 0:15 GMT+01:00 James Cowgill : >>> On 25/11/16 17:15, Jaromír Mikeš wrote: 2016-11-25 17:13 GMT+01:00 James Cowgill : > -- d/hydrogen.install >> usr/share/hydrogen/data/img > It seems that the only reason for putting this in hydrogen instead of > hydrogen-data is the SVG icon? Yes >>> >>> I don't think you should ship the entire data/img directory in the >>> hydrogen package just for this. Either only install that one svg and >>> move everything over to the -data package, or duplicate the svg since >>> it's only 9kB. >> >> Ok ... I thought that icon make sense to be installed in binary package >> but as hydrogen package can't be installed without hydrogen-data package >> all img dir is now moved to -data package. > > I agree that putting the icon in the main package does make sense - it > just seemed like a lot of other stuff could have gone in the data > package. One thing is that appstream (ie GNOME software center) requires > the icon to be in the main package so hydrogen won't show up at the moment. Done ;) best regards mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
On 26/11/16 13:39, Jaromír Mikeš wrote: > 2016-11-26 13:44 GMT+01:00 James Cowgill : >> On 26/11/16 02:02, Jaromír Mikeš wrote: >>> 2016-11-26 0:15 GMT+01:00 James Cowgill : On 25/11/16 17:15, Jaromír Mikeš wrote: > 2016-11-25 17:13 GMT+01:00 James Cowgill : >> -- d/hydrogen.install >>> usr/share/hydrogen/data/img >> It seems that the only reason for putting this in hydrogen instead of >> hydrogen-data is the SVG icon? > > Yes I don't think you should ship the entire data/img directory in the hydrogen package just for this. Either only install that one svg and move everything over to the -data package, or duplicate the svg since it's only 9kB. >>> >>> Ok ... I thought that icon make sense to be installed in binary package >>> but as hydrogen package can't be installed without hydrogen-data package >>> all img dir is now moved to -data package. >> >> I agree that putting the icon in the main package does make sense - it >> just seemed like a lot of other stuff could have gone in the data >> package. One thing is that appstream (ie GNOME software center) requires >> the icon to be in the main package so hydrogen won't show up at the moment. > > Done ;) What you've done won't work - you've installed the same file into two separate packages which have to be installed together. James signature.asc Description: OpenPGP digital signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
2016-11-27 1:33 GMT+01:00 James Cowgill : > On 26/11/16 13:39, Jaromír Mikeš wrote: >> 2016-11-26 13:44 GMT+01:00 James Cowgill : >>> On 26/11/16 02:02, Jaromír Mikeš wrote: 2016-11-26 0:15 GMT+01:00 James Cowgill : > On 25/11/16 17:15, Jaromír Mikeš wrote: >> 2016-11-25 17:13 GMT+01:00 James Cowgill : >>> -- d/hydrogen.install usr/share/hydrogen/data/img >>> It seems that the only reason for putting this in hydrogen instead of >>> hydrogen-data is the SVG icon? >> >> Yes > > I don't think you should ship the entire data/img directory in the > hydrogen package just for this. Either only install that one svg and > move everything over to the -data package, or duplicate the svg since > it's only 9kB. Ok ... I thought that icon make sense to be installed in binary package but as hydrogen package can't be installed without hydrogen-data package all img dir is now moved to -data package. >>> >>> I agree that putting the icon in the main package does make sense - it >>> just seemed like a lot of other stuff could have gone in the data >>> package. One thing is that appstream (ie GNOME software center) requires >>> the icon to be in the main package so hydrogen won't show up at the moment. >> >> Done ;) > > What you've done won't work - you've installed the same file into two > separate packages which have to be installed together. Now h2-icon.svg file excluded from hydrogen-data package and installed only in hydrogen package. mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
On 27/11/16 01:00, Jaromír Mikeš wrote: > 2016-11-27 1:33 GMT+01:00 James Cowgill : >> On 26/11/16 13:39, Jaromír Mikeš wrote: >>> 2016-11-26 13:44 GMT+01:00 James Cowgill : On 26/11/16 02:02, Jaromír Mikeš wrote: > 2016-11-26 0:15 GMT+01:00 James Cowgill : >> On 25/11/16 17:15, Jaromír Mikeš wrote: >>> 2016-11-25 17:13 GMT+01:00 James Cowgill : -- d/hydrogen.install > usr/share/hydrogen/data/img It seems that the only reason for putting this in hydrogen instead of hydrogen-data is the SVG icon? >>> >>> Yes >> >> I don't think you should ship the entire data/img directory in the >> hydrogen package just for this. Either only install that one svg and >> move everything over to the -data package, or duplicate the svg since >> it's only 9kB. > > Ok ... I thought that icon make sense to be installed in binary package > but as hydrogen package can't be installed without hydrogen-data package > all img dir is now moved to -data package. I agree that putting the icon in the main package does make sense - it just seemed like a lot of other stuff could have gone in the data package. One thing is that appstream (ie GNOME software center) requires the icon to be in the main package so hydrogen won't show up at the moment. >>> >>> Done ;) >> >> What you've done won't work - you've installed the same file into two >> separate packages which have to be installed together. > > Now h2-icon.svg file excluded from hydrogen-data package and installed > only in hydrogen package. Ok just going over a few other things I spotted. CXXFLAGS is clobbered in CMakeLists.txt:109 These files exist in debian/tmp but are not installed anywhere. The appdata one must go in the hydrogen package for the same reason as the icon has to. /usr/share/appdata/hydrogen.appdata.xml /usr/share/man/man1/hydrogen.1 Your new debian/copyright file seems to contain some C++ code which should not be there. Other than that I think it's OK to upload assuming I don't find anything else :) Thanks, James signature.asc Description: OpenPGP digital signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
2016-11-27 12:32 GMT+01:00 James Cowgill : > Ok just going over a few other things I spotted. > > CXXFLAGS is clobbered in CMakeLists.txt:109 Fixed! > These files exist in debian/tmp but are not installed anywhere. The > appdata one must go in the hydrogen package for the same reason as the > icon has to. > > /usr/share/appdata/hydrogen.appdata.xml > /usr/share/man/man1/hydrogen.1 Fixed! > Your new debian/copyright file seems to contain some C++ code which > should not be there. Fixed! > Other than that I think it's OK to upload assuming I don't find anything > else :) As package has been split I think it must go to "NEW" and uploaded by DD. Am I right? Thank you ! mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
Hi, On 27/11/16 16:34, Jaromír Mikeš wrote: > 2016-11-27 12:32 GMT+01:00 James Cowgill : >> Other than that I think it's OK to upload assuming I don't find anything >> else :) > > As package has been split I think it must go to "NEW" and uploaded by DD. > Am I right? Yes, and uploaded! (with a minor changelog update) Thanks, James signature.asc Description: OpenPGP digital signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Re: hydrogen packaging
2016-11-29 23:33 GMT+01:00 James Cowgill : > Hi, > > On 27/11/16 16:34, Jaromír Mikeš wrote: >> 2016-11-27 12:32 GMT+01:00 James Cowgill : >>> Other than that I think it's OK to upload assuming I don't find anything >>> else :) >> >> As package has been split I think it must go to "NEW" and uploaded by DD. >> Am I right? > > Yes, and uploaded! (with a minor changelog update) Thank you again! mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#629107: hydrogen: No text in User Manual (Was: hydrogen packaging)
Control: tags -1 patch Hi, On 12/11/16 11:41, Jaromír Mikeš wrote: > 2016-11-12 11:58 GMT+01:00 : > >> while you're working around the Hydrogen packaging, can I humbly >> ask you to have a look at this bug : >> https://bugs.debian.org/629107 ? >> >> There is willingness upstream (which I'm part of regarding the >> manual) to update and improve the bundled update manual and not >> having it displayed/accessible in the GUI is frustrating. >> >> As said in bug 629107, I've been looking at it but am not >> knowledgeable/competent to resolve it. Help here would be >> appreciated. > > Hi Olivier, > > I know about this bug and I am not ignoring it. > I already tried fix it in past without success :( > Hopefully some more skilled mate from team will give a hand with it. How about the attached patch? I think the original purpose of that code in debian/rules was to force the manual to always be rebuilt. Unfortunately it moves 'manual.docbook' out of the way (as if it was autogenerated) but it looks like this is the master manual which is directly edited. My alternate implementation simply touches the master manuals which should hopefully force everything to be rebuilt as well. Thanks, James --- a/debian/rules +++ b/debian/rules @@ -35,23 +35,9 @@ DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^.*\.(flac|png|qm)|debian/(changelog|copyrigh # according to upstream INSTALL.txt this avoids potential clash with Qt3 export QTDIR=/usr/share/qt4 -# Put aside upstream-shipped autogenerated files during build -upstreamtmpfiles = $(wildcard data/doc/*.html data/doc/*.docbook) -upstreamtmpfiles_ = $(patsubst %.upstream,%,$(wildcard data/doc/*.html.upstream data/doc/*.docbook.upstream)) -pre-build:: debian/stamp-upstreamtmpstuff -debian/stamp-upstreamtmpstuff: debian/stamp-copyright-check - for file in $(upstreamtmpfiles); do \ - [ ! -e $$file ] || [ -e $$file.upstream ] || mv $$file $$file.upstream; \ - done - touch $@ -clean:: - for file in $(upstreamtmpfiles_); do \ - [ ! -e $$file.upstream ] || mv -f $$file.upstream $$file; \ - done - rm -f debian/stamp-upstreamtmpstuff - common-build-indep:: debian/docs.stamp debian/docs.stamp: + touch data/doc/manual.docbook data/doc/tutorial.docbook $(MAKE) -C data/doc touch $@ clean:: signature.asc Description: OpenPGP digital signature ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Bug#629107: hydrogen: No text in User Manual (Was: hydrogen packaging)
2016-11-13 11:55 GMT+01:00 James Cowgill : > Control: tags -1 patch > > Hi, > > On 12/11/16 11:41, Jaromír Mikeš wrote: >> 2016-11-12 11:58 GMT+01:00 : >> >>> while you're working around the Hydrogen packaging, can I humbly >>> ask you to have a look at this bug : >>> https://bugs.debian.org/629107 ? >>> >>> There is willingness upstream (which I'm part of regarding the >>> manual) to update and improve the bundled update manual and not >>> having it displayed/accessible in the GUI is frustrating. >>> >>> As said in bug 629107, I've been looking at it but am not >>> knowledgeable/competent to resolve it. Help here would be >>> appreciated. >> >> Hi Olivier, >> >> I know about this bug and I am not ignoring it. >> I already tried fix it in past without success :( >> Hopefully some more skilled mate from team will give a hand with it. > > How about the attached patch? > > I think the original purpose of that code in debian/rules was to force > the manual to always be rebuilt. Unfortunately it moves 'manual.docbook' > out of the way (as if it was autogenerated) but it looks like this is > the master manual which is directly edited. > > My alternate implementation simply touches the master manuals which > should hopefully force everything to be rebuilt as well. Works perfectly! Thank you James! mira ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
Processed: Bug#629107: hydrogen: No text in User Manual (Was: hydrogen packaging)
Processing control commands: > tags -1 patch Bug #629107 [hydrogen] hydrogen: No text in User Manual Added tag(s) patch. -- 629107: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629107 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
