GNOME Bugzilla – Bug 769860
Rename to libgnome-games-support
Last modified: 2016-08-15 20:25:09 UTC
See discussion at https://bugs.debian.org/824130
Created attachment 333244 [details] [review] Rename to libgnome-games-support
Created attachment 333245 [details] [review] Adapt to renaming of libgames-support to libgnome-games-support
^ That patch is for gnome-nibbles
Created attachment 333246 [details] [review] gnome-klotski: Adapt to renaming of libgames-support to libgnome-games-support
Created attachment 333247 [details] [review] gnome-robots: Adapt to renaming of libgames-support to libgnome-games-support
Created attachment 333248 [details] [review] jhbuild 3.22: libgames-support is now libgnome-games-support
Hey Jeremy, you can stop uploading new patches for the remaining games as they are all the same, I'll make the change to the remaining games and push them before the next release
mcatanzaro@ would need to approve these patches though. I can see his comment on https://bugs.debian.org/824130 where he mentions "I don't want to change it at this point, though, because it's been packaged by several other distros (Fedora, openSUSE, Arch) for roughly a year now, all of which chose to name the package libgames-support. I'd prefer to keep the upstream name in sync with these downstreams, and I think it's unlikely that another project would want to use this name." Not sure if this comes from something new at GUADEC which I missed
Sahil, see mcatanzaro's comments #45 and #60 on the Debian bug. No, I don't think this wasn't discussed at GUADEC. Once these patches are committed, I'll request that the git repo be moved and the bugzilla product renamed.
I see, I'll help you get this change in for all the games for 3.21.91 release on the 29th of August. If you have any more patches apart from the same change that needs to be done to all the games you can upload them here and I can take a look after the 3.21.90 release on the 15th Aug.
I apologize for the urgency but I think this needs to land now if we want this done for GNOME 3.22. Otherwise, we'd have to get permission from the Release Team since the Freeze is Monday. https://wiki.gnome.org/ThreePointTwentyone I've already attached all the patches needed. There's one minor patch for gnome-continuous that shouldn't be committed until the git repo name changes so I didn't include that here.
I'm just finishing wrapping up some appdata changes on the games, will look into this immediately and will get this in tonight.
Review of attachment 333244 [details] [review]: LGTM
Review of attachment 333245 [details] [review]: LGTM
Review of attachment 333248 [details] [review]: LGTM
Review of attachment 333247 [details] [review]: LGTM
I don't currently have git.gnome.org commit privileges. Could you commit these for me?
I can commit these, have dropped mcatanzaro@ an email, I'd like to see his thumbs up and I can update the remaining games for this. Is it okay to defer this for a couple of hours?
Even though this is just a renaming I'd definitely like another pair of eyes to go over this change as it affects all the games.
A few hours is not a problem since the Freeze isn't supposed to happen until Monday.
Thanks for understanding, I'll make sure this gets in before Monday.
Review of attachment 333244 [details] [review]: Thanks Jeremy. This has conflicts with the patch in bug #766334, which we should land at the same time. (Note the patch in that bug also changes the include directory name.) Please, check that bug as well, iron out the differences and submit a new patch that incorporates both sets of changes... or just apply my patch and base your patch on mine. My patch in that bug also changes the header file install location, but we'd want something else after this rename, I guess $(includedir)/libgnome-games-support ::: games/Makefile.am @@ +31,3 @@ --pkg gio-2.0 \ --pkg gee-0.8 \ + --header=libgnome-games-support.h \ Nit: please add another tab to the lines above, to keep it aligned properly.
Created attachment 333251 [details] [review] Rename to libgnome-games-support Thanks Michael for the review. Rebased to apply on top of the patch from bug 766334 . I'm not sure I understand what you'd prefer for the games_includedir line.
Bug#766334 patch pushed, now on to this one.
Review of attachment 333251 [details] [review]: LGTM
libgnome-games-support repository created on git.gnome
Review of attachment 333251 [details] [review]: Hey Jeremy Your patch didn't apply cleanly. [sssareen@localhost libgames-support]$ git am Rename-to-libgnome-games-support.patch Applying: Rename to libgnome-games-support error: patch failed: po/es.po:1 error: po/es.po: patch does not apply Patch failed at 0001 Rename to libgnome-games-support The copy of the patch that failed is found in: /home/sssareen/jhbuild/checkout/libgames-support/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Also please fix this style issue: Validating the diff ... test-scores.vala => Line 49 is greater than 120 characters Guideline checker found one issue.
Created attachment 333303 [details] [review] Rename to libgnome-games-support Try this patch then. The problem with po/es.po is that it uses Windows line endings (!) so we'll need to fix that separately. Could you fix test-scores.vala ? The line was already over 120 characters before I touched it.
Created attachment 333305 [details] [review] manifest: libgames-support is now libgnome-games-support Here's the gnome-continuous patch now that you have a new git repo. For my previous comment, see https://help.github.com/articles/dealing-with-line-endings/
(In reply to Jeremy Bicha from comment #28) > Created attachment 333303 [details] [review] [review] > Rename to libgnome-games-support > > Try this patch then. The problem with po/es.po is that it uses Windows line > endings (!) so we'll need to fix that separately. > > Could you fix test-scores.vala ? The line was already over 120 characters > before I touched it. Pushed! To ssh://ssareen@git.gnome.org/git/libgnome-games-support c93471c..28b4dd8 master -> master
(In reply to Jeremy Bicha from comment #6) > Created attachment 333248 [details] [review] [review] > jhbuild > > 3.22: libgames-support is now libgnome-games-support Pushed! To ssh://ssareen@git.gnome.org/git/jhbuild 37d427d..f74b4b4 master -> master
(In reply to Jeremy Bicha from comment #29) > Created attachment 333305 [details] [review] [review] > manifest: libgames-support is now libgnome-games-support > > Here's the gnome-continuous patch now that you have a new git repo. > > For my previous comment, see > https://help.github.com/articles/dealing-with-line-endings/ Pushed! To ssh://ssareen@git.gnome.org/git/gnome-continuous ae27a68..4b8c247 master -> master
I'm doing releases now, so I'll take care of updating games....
Ah, the style checkers will all be broken... Sahil, do you want to do the grunt work of updating all the autogen.sh files for the new location? :/ I will take care of the games already using libgnome-games-support (Klotski, Mines, Nibbles, Robots) and leave you the rest, OK?
(In reply to Jeremy Bicha from comment #23) > I'm not sure I understand what you'd prefer for the games_includedir line. $(includedir)/gnome-games-support-$(LIBGNOME_GAMES_SUPPORT_API_VERSION) -- what you did!
(In reply to Michael Catanzaro from comment #34) > Ah, the style checkers will all be broken... Sahil, do you want to do the > grunt work of updating all the autogen.sh files for the new location? :/ > > I will take care of the games already using libgnome-games-support (Klotski, > Mines, Nibbles, Robots) and leave you the rest, OK? Yeah, I can update those
Ah, I forgot to tell Robert about this and he already released Mines... I will do another one. Robert, this is why, sorry....