diff -Nru menu-2.1.41/debian/changelog menu-2.1.41ubuntu1/debian/changelog --- menu-2.1.41/debian/changelog 2008-10-24 20:03:06.000000000 +0100 +++ menu-2.1.41ubuntu1/debian/changelog 2008-11-08 15:54:32.000000000 +0000 @@ -1,3 +1,12 @@ +menu (2.1.41ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #295605), remaining changes: + + 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. + + -- Iulian Udrea Wed, 05 Nov 2008 04:35:31 +0000 + menu (2.1.41) unstable; urgency=low * The "true bubulle never burst" release @@ -12,6 +21,16 @@ -- Bill Allombert Fri, 24 Oct 2008 00:52:01 +0200 +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 Fri, 15 Aug 2008 10:17:34 +0530 + menu (2.1.40) unstable; urgency=low * The "Saint-Malo" release. @@ -36,6 +55,16 @@ -- Bill Allombert Thu, 24 Jul 2008 16:06:55 +0200 +menu (2.1.39ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - 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. + - DebianMaintainerField + + -- Daniel Hahler Thu, 19 Jun 2008 00:20:53 +0200 + menu (2.1.39) unstable; urgency=low * The "thanks for all the patches" release. @@ -70,6 +99,21 @@ -- Bill Allombert Mon, 12 May 2008 20:41:42 +0200 +menu (2.1.38ubuntu2) hardy; urgency=low + + * No-source-change upload to fix changelog about remaining Ubuntu changes. + + -- Daniel Hahler Fri, 07 Mar 2008 01:02:51 +0100 + +menu (2.1.38ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/conffiles, debian/su-to-rootrc, debian/rules, doc/su-to-root.1: + Set default of SU_TO_ROOT_SU to "sudo" in conffile. + - DebianMaintainerField + + -- Daniel Hahler Fri, 07 Mar 2008 00:28:17 +0100 + menu (2.1.38) unstable; urgency=low * The "little zebra" release. @@ -115,6 +159,30 @@ -- Bill Allombert Wed, 05 Mar 2008 16:59:55 +0100 +menu (2.1.37ubuntu2) hardy; urgency=low + + * debian/su-to-rootrc, debian/rules: + Instead of patching su-to-root, add a conffile in /etc/su-to-rootrc and + set SU_TO_ROOT_SU=sudo there. See Debian bug #465136. + - Revert changes from ubuntu1 + - Adjust text in doc/su-to-root.1 + * scripts/su-to-root: + - Fix quoting of $COMMAND for "sudo" and "sux", so that arguments can be + used for commands. + + -- Daniel Hahler Sun, 24 Feb 2008 17:22:02 +0100 + +menu (2.1.37ubuntu1) hardy; urgency=low + + * scripts/su-to-root, doc/su-to-root.1: + Use "sudo" as default for SU_TO_ROOT_SU, instead of "su". + This makes more sense for Ubuntu and should fix various + menu entries in /usr/share/menu, which use su-to-root. + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Daniel Hahler Sun, 10 Feb 2008 23:09:44 +0100 + menu (2.1.37) unstable; urgency=low * the "what happened to release early, release often ?" release. @@ -1145,6 +1213,7 @@ Closes: #105674 -- joost witteveen 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 @@ -1152,6 +1221,7 @@ -- joost witteveen 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 @@ -1253,7 +1323,6 @@ -- joost witteveen 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. @@ -1325,7 +1394,7 @@ filehandles (this time the `32!=r' version) -- joost witteveen 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 @@ -1653,6 +1722,7 @@ (should really fix this sometime) -- joost witteveen 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. @@ -1830,7 +1900,7 @@ * fixed typos in extended description (in control file). -- joost witteveen 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 diff -Nru menu-2.1.41/debian/conffiles menu-2.1.41ubuntu1/debian/conffiles --- menu-2.1.41/debian/conffiles 2005-09-11 21:49:30.000000000 +0100 +++ menu-2.1.41ubuntu1/debian/conffiles 2008-11-05 04:35:30.000000000 +0000 @@ -2,3 +2,4 @@ /etc/menu-methods/menu.h /etc/menu-methods/lang.h /etc/menu-methods/menu.config +/etc/su-to-rootrc diff -Nru menu-2.1.41/debian/control menu-2.1.41ubuntu1/debian/control --- menu-2.1.41/debian/control 2008-07-24 15:06:52.000000000 +0100 +++ menu-2.1.41ubuntu1/debian/control 2008-11-05 04:35:30.000000000 +0000 @@ -1,7 +1,8 @@ Source: menu Section: admin Priority: optional -Maintainer: Bill Allombert +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Bill Allombert Standards-Version: 3.8.0 Build-Depends: debhelper (>= 4.0.0), texinfo, debiandoc-sgml, gettext diff -Nru menu-2.1.41/debian/rules menu-2.1.41ubuntu1/debian/rules --- menu-2.1.41/debian/rules 2007-07-04 13:23:04.000000000 +0100 +++ menu-2.1.41ubuntu1/debian/rules 2008-11-05 04:35:30.000000000 +0000 @@ -70,6 +70,9 @@ # install -p -g root -o root -m 644 \ debian/bug.presubj debian/menu/usr/share/bug/menu/presubj + # Install defaults for Ubuntu: + install -p -g root -o root -m 644 \ + debian/su-to-rootrc debian/menu/etc/su-to-rootrc # touch install-stamp diff -Nru menu-2.1.41/debian/su-to-rootrc menu-2.1.41ubuntu1/debian/su-to-rootrc --- menu-2.1.41/debian/su-to-rootrc 1970-01-01 01:00:00.000000000 +0100 +++ menu-2.1.41ubuntu1/debian/su-to-rootrc 2008-08-15 12:44:27.000000000 +0100 @@ -0,0 +1 @@ +SU_TO_ROOT_SU=sudo diff -Nru menu-2.1.41/doc/su-to-root.1 menu-2.1.41ubuntu1/doc/su-to-root.1 --- menu-2.1.41/doc/su-to-root.1 2008-05-11 16:57:43.000000000 +0100 +++ menu-2.1.41ubuntu1/doc/su-to-root.1 2008-11-05 04:35:29.000000000 +0000 @@ -36,8 +36,8 @@ notice. .IP SU_TO_ROOT_SU Select the su-like program used in text mode. -Supported values are \fIsudo\fP, \fIsux\fP and \fIsu\fP, the later being -the default. +Supported values are \fIsudo\fP, \fIsux\fP and \fIsu\fP, the first being +the default in Ubuntu (configured in /etc/su\-to\-rootrc). .SH FILES .IP /etc/su\-to\-rootrc .IP ~/.su\-to\-rootrc