Merge menu 2.1.40 from Debian unstable

menu (2.1.40ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes: (LP: #256966)
    - debian/conffiles, debian/su-to-rootrc, debian/rules,
      doc/su-to-root.1:
      Set default of SU_TO_ROOT_SU to "sudo" in conffile.
      This is specific to Ubuntu.
  * Handling of l10n by Christian Perrier:
    + Menu sections translations:
      - Turkish updated by Mert Dirik. Closes: #484795
      - Macedonian updated by Georgi Stanojevski. Closes: #486005
      - Esperanto updated by Felipe Castro. Closes: #488591
      - Swedish added by Martin Bagge. Closes: #488668
      - Dutch updated by Benno Schulenberg. Closes: #490109
      - Arabic updated by Ossama Khayat. Closes: #491541
      - Italian updated by Milo Casagrande. Closes: #492387
    + Programs translations:
      - Esperanto updated by Felipe Castro. Closes: #488592

  * debian/control:
    + Bump Standards-Version to 3.8.0.

  * update-menus/update-menus.cc:
    + Accept states triggers-awaited and triggers-pending as installed.
      Thanks Joey Hess for his explanation. Closes: #489040

 -- Bhavani Shankar <email address hidden> Mon, 11 Aug 2008 19:28:05 +0530

Please, list only the Ubuntu specific changes in the changelog of a merge.

Okay here it is:

menu (2.1.40ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes: (LP: #256966)
    - debian/conffiles, debian/su-to-rootrc, debian/rules,
      doc/su-to-root.1:
      Set default of SU_TO_ROOT_SU to "sudo" in conffile.
      This is specific to Ubuntu.

 -- Bhavani Shankar <email address hidden> Mon, 11 Aug 2008 19:28:05 +0530

Update: Will submit the debdiff tomorrow.

menu (2.1.40ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes: (LP: #256966)
    - debian/conffiles, debian/su-to-rootrc, debian/rules,
     doc/su-to-root.1:
      Set default of SU_TO_ROOT_SU to "sudo" in conffile.
    - updated DebianMaintainerField
  * Updated Translation strings.
  * Bumped Standards version to 3.8.0.
  * update-menus/update-menus.cc:
    - Accepted states triggers-awaited and triggers-pending as installed.

 -- Bhavani Shankar <email address hidden> Wed, 13 Aug 2008 16:47:58 +0530

I haven't looked at your debdiff yet, but why do you still repeat the debian changes in the ubuntu changelog?

From the debian changelog:

  * Handling of l10n by Christian Perrier:
    + Menu sections translations:
      - Turkish updated by Mert Dirik. Closes: #484795
      - Macedonian updated by Georgi Stanojevski. Closes: #486005
      - Esperanto updated by Felipe Castro. Closes: #488591
      - Swedish added by Martin Bagge. Closes: #488668
      - Dutch updated by Benno Schulenberg. Closes: #490109
      - Arabic updated by Ossama Khayat. Closes: #491541
      - Italian updated by Milo Casagrande. Closes: #492387
    + Programs translations:
      - Esperanto updated by Felipe Castro. Closes: #488592

  * debian/control:
    + Bump Standards-Version to 3.8.0.

  * update-menus/update-menus.cc:
    + Accept states triggers-awaited and triggers-pending as installed.

?

Also, note that it was recently discussed to not include the DebianMaintainerField change in the ubuntu changelog anymore, please refer to this thread:

https://lists.ubuntu.com/archives/ubuntu-devel/2008-July/025825.html

cesare.. sorry.. I got hold of my errors now....

menu (2.1.40ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes: (LP: #256966)
    - debian/conffiles, debian/su-to-rootrc, debian/rules,
     doc/su-to-root.1:
      Set default of SU_TO_ROOT_SU to "sudo" in conffile.

 -- Bhavani Shankar <email address hidden> Wed, 13 Aug 2008 16:47:58 +0530

Thanks, I just looked at the debdiff and I think you have deleted the wrong line re. Standards-Version:

-Maintainer: Bill Allombert <email address hidden>
-Standards-Version: 3.8.0
+Maintainer: Ubuntu MOTU Developers <email address hidden>
+XSBC-Original-Maintainer: Bill Allombert <email address hidden>
 Build-Depends: debhelper (>= 4.0.0), texinfo, debiandoc-sgml, gettext
+Standards-Version: 3.8.0

You should carry over the one from Debian (so that there is no change shown in the debdiff).
The other changes look okay, even though I don't understand why you removed some blank spaces from the changelog:

 menu (2.1.37) unstable; urgency=low

   * the "what happened to release early, release often ?" release.
@@ -1131,6 +1189,7 @@
     Closes: #105674

  -- joost witteveen <email address hidden> Sun, 29 July 2001 15:02:27 +0300
+
 menu (2.1.5-9) unstable; urgency=low

   * Now only use the locale for LC_MESSAGES, also for install-menu
@@ -1138,6 +1197,7 @@

  -- joost witteveen <email address hidden> Mon, 2 May 2001 14:02:27 +0300
+
 menu (2.1.5-8) unstable; urgency=low

   * Now only use the locale for LC_MESSAGES. Closes: #90317, #95658
@@ -1239,7 +1299,6 @@

  -- joost witteveen <email address hidden> Sun, 5 Dec 1999 19:04:42 +0100

-
 menu (2.1.4-4) unstable; urgency=low

   * Applied patch in 47259, to fix spaces/tabs in menu.sgml.
@@ -1311,7 +1370,7 @@
     filehandles (this time the `32!=r' version)

  -- joost witteveen <email address hidden> Tue, 5 Oct 1999 22:28:08 +0200
-
+
 menu (2.1.3-2) unstable; urgency=low

   * Added menuentries for gpm, dpkg. (in default menu files, should be
@@ -1639,6 +1698,7 @@
     (should really fix this sometime)

  -- joost witteveen <email address hidden> Thu, 12 Mar 1998 21:23:13 +0100
+
 menu (1.5-8) unstable; urgency=low

   * Removed reference to README in all files where it was still referenced.
@@ -1816,7 +1876,7 @@
   * fixed typos in extended description (in control file).

  -- joost witteveen <email address hidden> Wed, 14 May 1997 22:13:01 +0200
-
+
 menu (1.3-1) frozen unstable; urgency=low

   * Only change: added ifeq(), ifneq(), ifeqelse(), ifroot() to install-menu

OK I ll change ;)

Ok cesare here it is:

Explanation of blank spaces in changelog

GPG couldnt verify gpg keys so blank spaces are there in changelog

Regards

Thanks,

I uploaded after having edited out the extra changes (a fault of the tool apparently).

This bug was fixed in the package menu - 2.1.40ubuntu1

---------------
menu (2.1.40ubuntu1) intrepid; urgency=low

  * Merge from debian unstable, remaining changes: (LP: #256966)
    - debian/conffiles, debian/su-to-rootrc, debian/rules,
      doc/su-to-root.1:
      Set default of SU_TO_ROOT_SU to "sudo" in conffile.
      This is specific to Ubuntu.

menu (2.1.40) unstable; urgency=low

  * The "Saint-Malo" release.
  * Handling of l10n by Christian Perrier:
    + Menu sections translations:
      - Turkish updated by Mert Dirik. Closes: #484795
      - Macedonian updated by Georgi Stanojevski. Closes: #486005
      - Esperanto updated by Felipe Castro. Closes: #488591
      - Swedish added by Martin Bagge. Closes: #488668
      - Dutch updated by Benno Schulenberg. Closes: #490109
      - Arabic updated by Ossama Khayat. Closes: #491541
      - Italian updated by Milo Casagrande. Closes: #492387
    + Programs translations:
      - Esperanto updated by Felipe Castro. Closes: #488592

  * debian/control:
    + Bump Standards-Version to 3.8.0.

  * update-menus/update-menus.cc:
    + Accept states triggers-awaited and triggers-pending as installed.
      Thanks Joey Hess for his explanation. Closes: #489040

 -- Bhavani Shankar <email address hidden> Fri, 15 Aug 2008 10:17:34 +0530