gnome-menus 3.10.1 update

[Emilio Pozuelo Monfort]

Hi Pierangelo,

Thanks for your patch! I have a couple of nitpicks, but the next version should
be perfect.

On 14/07/14 00:41, Pierangelo Mancusi wrote:
> Hi all,
> 
> here the patch to update gnome-menus from 3.8.0 to 3.10.1
> the new entry in changelog was for testing the new pkg building.
> apply the patch at the root of the svn project.
> 
> let me know everything :)
> 
> cheers,
> Pierangelo
> 
> 
> Index: debian/changelog
> ===================================================================
> --- debian/changelog (revision 8)
> +++ debian/changelog (working copy)
> @@ -1,3 +1,12 @@
> +gnome-menus (3.10.1) UNRELEASED; urgency=low
> +
> +  [ Pierangelo Mancusi ]
> +  * New upstream release.
> +  * debian/patches/30-gnome-calculator-desktop-file.patch:
> +    + Removed from series. It was integrated in the new upstream release.
> +
> + -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 13 Jul 2014 21:38:06
> +0200

You don't need to add me in the timestamp. Just doing "dch" should add you
there, and you can leave it like that. Then when somebody (me or another DD)
uploads the package to the archive, they will run "dch -r" to change UNRELEASED
to unstable and update the timestamp.

> +
>  gnome-menus (3.8.0-3) UNRELEASED; urgency=low

Note how the previous entry is UNRELEASED. So what you want to do here is to add
your changelog entry under 3.8.0-3, and change the version. Again, just do
"dch", then add your changelog entry, and change the upstream version.

>    [ Emilio Pozuelo Monfort ]
> Index: debian/patches/08_settings-menus.patch
> ===================================================================
> --- debian/patches/08_settings-menus.patch (revision 11)
> +++ debian/patches/08_settings-menus.patch (working copy)

You have updated some patches but you don't mention it in the changelog. If you
have just refreshed them (with quilt refresh?) say so in the changelog. E.g.

  * debian/patches/:
    + Refreshed patches to apply cleanly.

Everything else looks good! Please address those comments and I'll commit your
next revision.

Emilio

> @@ -1,11 +1,12 @@
> -Index: gnome-menus-3.8.0/layout/gnome-applications.menu
> +Index: a/layout/gnome-applications.menu
>  ===================================================================
> ---- gnome-menus-3.8.0.orig/layout/gnome-applications.menu 2013-06-14
> 15:48:17.509604188 -0400
> -+++ gnome-menus-3.8.0/layout/gnome-applications.menu 2013-06-14
> 15:57:09.689581931 -0400
> -@@ -233,6 +233,118 @@
> -         <Not><Filename>gnome-system-monitor.desktop</Filename></Not>
> -       </And>
> -     </Include>
> +--- a/layout/gnome-applications.menu (revision 9)
> ++++ b/layout/gnome-applications.menu (working copy)
> +@@ -259,6 +259,119 @@
> +       <Filename>dconf-editor.desktop</Filename>
> +       <Filename>setroubleshoot.desktop</Filename>
> +     </Exclude>
> ++
>  +    <Menu>
>  +      <Name>Preferences</Name>
>  +      <Directory>Settings.directory</Directory>
> Index: debian/patches/09_games-menu.patch
> ===================================================================
> --- debian/patches/09_games-menu.patch (revision 5)
> +++ debian/patches/09_games-menu.patch (working copy)
> @@ -1,11 +1,11 @@
> ---- a/layout/gnome-applications.menu
> -+++ b/layout/gnome-applications.menu
> -@@ -99,8 +99,107 @@
> +Index: a/layout/gnome-applications.menu
> +===================================================================
> +--- a/layout/gnome-applications.menu (revision 10)
> ++++ b/layout/gnome-applications.menu (working copy)
> +@@ -115,8 +115,107 @@
>       <Include>
>         <And>
>           <Category>Game</Category>
> --      </And>
> --    </Include>
>  +        <Not><Category>ActionGame</Category></Not>
>  +        <Not><Category>AdventureGame</Category></Not>
>  +        <Not><Category>ArcadeGame</Category></Not>
> @@ -17,8 +17,8 @@
>  +        <Not><Category>Simulation</Category></Not>
>  +        <Not><Category>SportsGame</Category></Not>
>  +        <Not><Category>StrategyGame</Category></Not>
> -+      </And>
> -+    </Include>
> +       </And>
> +     </Include>
>  +    <DefaultLayout inline="true" inline_limit="6" inline_header="false">
>  +      <Merge type="menus"/>
>  +      <Merge type="files"/>
> @@ -110,11 +110,12 @@
>     </Menu> <!-- End Games -->
> 
>     <!-- Graphics -->
> -@@ -223,6 +322,7 @@
> +@@ -238,6 +337,7 @@
> +     <Include>
>         <And>
>           <Category>System</Category>
> -         <Not><Category>Settings</Category></Not>
>  +        <Not><Category>Game</Category></Not>
> -         <Not><Filename>baobab.desktop</Filename></Not>
> -         <Not><Filename>gnome-system-log.desktop</Filename></Not>
> -         <Not><Filename>gnome-system-monitor.desktop</Filename></Not>
> +         <Not><Category>Settings</Category></Not>
> +         <Not><Category>X-GNOME-Utilities</Category></Not>
> +       </And>
> +
> Index: debian/patches/series
> ===================================================================
> --- debian/patches/series (revision 8)
> +++ debian/patches/series (working copy)
> @@ -5,4 +5,3 @@
>  08_settings-menus.patch
>  09_games-menu.patch
>  11_science-menu.patch
> -30-gnome-calculator-desktop-file.patch
> 
> 
> 
> _______________________________________________
> pkg-gnome-maintainers mailing list
> pkg-gnome-maintainers at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-gnome-maintainers
>