After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 419863 - Please distribute Locations.xml.in
Please distribute Locations.xml.in
Status: RESOLVED FIXED
Product: gnome-applets
Classification: Other
Component: gweather
2.18.x
Other Linux
: Normal trivial
: ---
Assigned To: gnome-applets Maintainers
gnome-applets Maintainers
Depends on:
Blocks:
 
 
Reported: 2007-03-18 20:05 UTC by Josselin Mouette
Modified: 2008-03-12 15:51 UTC
See Also:
GNOME target: ---
GNOME version: 2.17/2.18

Attachments
Dist Locations.xml.in; cleanups (1.13 KB, patch)
2007-03-19 16:59 UTC, Loïc Minier 		none Details | Review
Dist Locations.xml.in and po-locations/; cleanups (1.88 KB, patch)
2007-03-19 20:33 UTC, Loïc Minier 		none Details | Review
Dist Locations.xml.in and po-locations/; cleanups (fixed) (2.15 KB, patch)
2007-03-23 16:36 UTC, Loïc Minier 		none Details | Review
01_location-dist-fixes.patch (1.99 KB, patch)
2008-03-12 15:27 UTC, Sebastian Dröge (slomo) 		committed Details | Review

Description Josselin Mouette 2007-03-18 20:05:52 UTC 
As Locations.xml.in is the real source behind Locations.xml, it should probably be distributed in the tarball instead. Generating it at build time would also make the tarball slightly smaller.
Comment 1 Loïc Minier 2007-03-19 16:59:20 UTC 
Created attachment 84891 [details] [review]
Dist Locations.xml.in; cleanups

Hi,

Can someone review this proposed patch?

It makes the Makefile.am slightly more readable by using dist_gweatherlocations_DATA instead of gweatherlocations_DATA and by wrapping the INTLTOOL_MERGE call, and it adds Locations.xml.in to EXTRA_DIST (_SOURCES doesn't seem to work with _DATA).

Bye,
Comment 2 Loïc Minier 2007-03-19 20:33:53 UTC 
Created attachment 84911 [details] [review]
Dist Locations.xml.in and po-locations/; cleanups

Ok; take 2: also dist po-locations, otherwise it's useless.

I've also dropped the intltool-merge dependency for %.xml, this means the Locations.xml isn't generated in normal builds (as it is disted), but will be if people change the po files or the .xml.in.
  This isn't a problem because you need to run configure to generate intltool-merge and the Makefile.

I did a make dist and verified that the Locations.xml isn't built by default and the presence of these files:
gnome-applets-2.18.0/po-locations/
gnome-applets-2.18.0/po-locations/Makefile.am
gnome-applets-2.18.0/po-locations/Makefile.in
gnome-applets-2.18.0/po-locations/ChangeLog
gnome-applets-2.18.0/po-locations/POTFILES.in
gnome-applets-2.18.0/po-locations/POTFILES.skip
gnome-applets-2.18.0/po-locations/*.po
gnome-applets-2.18.0/gweather/Locations.xml
gnome-applets-2.18.0/gweather/Locations.xml.in

(Locations.xml is generated)
Comment 3 Loïc Minier 2007-03-23 16:36:59 UTC 
Created attachment 85184 [details] [review]
Dist Locations.xml.in and po-locations/; cleanups (fixed)

Fixed the previous patch which missed po-locations/Makefile.am -- forgot to svn add this file before diffing; sorry.
Comment 4 Sebastian Dröge (slomo) 2008-03-12 15:27:27 UTC 
Created attachment 107150 [details] [review]
01_location-dist-fixes.patch
Comment 5 Matthias Clasen 2008-03-12 15:29:22 UTC 
The patch looks fine to me.
Comment 6 Sebastian Dröge (slomo) 2008-03-12 15:51:32 UTC 
2008-03-12  Sebastian Dröge  <slomo@circular-chaos.org>

        * Makefile.am:
        * configure.in:
        * data/Makefile.am:
        * po-locations/Makefile.am: Also dist Locations.xml.in and
        po-locations/*. Based on a patch by Loïc Minier.
        Closes bug #419863.