Hi, On Fri, Oct 05, 2012 at 10:24:02AM +0200, Mehdi Dogguy wrote: > Simon Paillard <spaill...@debian.org> wrote: > > I've prepared an NMU for sugar-0.96 (versioned as 0.96.1-2.1) and > > uploaded it to DELAYED/4. Please feel free to tell me if I > > should delay it longer.
Initial NMU canceled following Mehdi's report. > As far as I can see, your patch does not fix all problems. The > submitter did show the following errors at sugar's startup: > > > /usr/bin/sugar: 3: [: missing ] > > /usr/bin/sugar: 3: /usr/bin/sugar: 1000: not found > > and there is indeed "]" and "[" missing around the "||" operator. > Furthermore, the package is missing another dependency to be able to > use xrdb. So, afaics, it needs to depend on x11-xserver-utils. I guess > setting "-e" helps... sugar-emulator starts with -e on both sugar and sugar-emulator, with the updated nmu patch attached, versioned as 0.96.1-2.1. -- Simon Paillard
diffstat for sugar-0.96-0.96.1 sugar-0.96-0.96.1 changelog | 9 +++++++++ patches/fix_shell_posix_and_quoting.patch | 2 +- rules | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff -Nru sugar-0.96-0.96.1/debian/changelog sugar-0.96-0.96.1/debian/changelog --- sugar-0.96-0.96.1/debian/changelog 2012-05-27 18:04:37.000000000 +0200 +++ sugar-0.96-0.96.1/debian/changelog 2012-10-08 21:35:17.000000000 +0200 @@ -1,3 +1,12 @@ +sugar-0.96 (0.96.1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * sugar-emulator: python-carquinyol moved to depends (Closes: #678720) + * Fix shell test syntax for /u/b/sugar + * sugar-emulator: depends on x11-xserver-utils + + -- Simon Paillard <spaill...@debian.org> Mon, 08 Oct 2012 21:18:58 +0200 + sugar-0.96 (0.96.1-2) unstable; urgency=low * Fix stop depending on sugar-presence-service-*: Solely used by diff -Nru sugar-0.96-0.96.1/debian/patches/fix_shell_posix_and_quoting.patch sugar-0.96-0.96.1/debian/patches/fix_shell_posix_and_quoting.patch --- sugar-0.96-0.96.1/debian/patches/fix_shell_posix_and_quoting.patch 2012-05-27 00:50:31.000000000 +0200 +++ sugar-0.96-0.96.1/debian/patches/fix_shell_posix_and_quoting.patch 2012-10-08 21:35:17.000000000 +0200 @@ -18,7 +18,7 @@ #!/bin/sh -if [ "$(id -u)" -eq 0 -o "$(id -ru)" -eq 0 ] ; then -+if [ "$(id -u)" -eq 0 || "$(id -ru)" -eq 0 ] ; then ++if [ "$(id -u)" -eq 0 ] || [ "$(id -ru)" -eq 0 ] ; then echo Refusing to run as root. exit 3 fi diff -Nru sugar-0.96-0.96.1/debian/rules sugar-0.96-0.96.1/debian/rules --- sugar-0.96-0.96.1/debian/rules 2012-05-27 18:00:39.000000000 +0200 +++ sugar-0.96-0.96.1/debian/rules 2012-10-08 21:35:17.000000000 +0200 @@ -120,7 +120,7 @@ CDBS_DEPENDS_sugar-session-$(pkgbranch) += , python-gobject (>= 2.15.0), python-gtk2, python-dbus CDBS_DEPENDS_sugar-session-$(pkgbranch) += , python-wnck | python-gnome2-desktop (<= 2.24.0-1) CDBS_DEPENDS_sugar-session-$(pkgbranch) += , python-gconf | python-gnome2 (<= 2.22.3-2) -CDBS_DEPENDS_sugar-session-$(pkgbranch) += , metacity (>= 1:2.27.1), dbus-x11 +CDBS_DEPENDS_sugar-session-$(pkgbranch) += , metacity (>= 1:2.27.1), dbus-x11, python-carquinyol-$(pkgbranch), x11-xserver-utils CDBS_DEPENDS_sugar-emulator-$(pkgbranch) = sugar-session-$(pkgbranch), python-jarabe-$(pkgbranch) CDBS_DEPENDS_sugar-emulator-$(pkgbranch) += , dbus-x11, $(emulator_exec) CDBS_DEPENDS_sugar-tools-$(pkgbranch) = python-sugar-$(pkgbranch), python-sugar-toolkit-$(pkgbranch), python-jarabe-$(pkgbranch) @@ -128,7 +128,7 @@ CDBS_DEPENDS_python-jarabe-$(pkgbranch) += , python-hippocanvas, python-gobject (>= 2.15.0), python-gtk2, python-cairo, python-dbus, python-telepathy (>= 0.15.9), python-simplejson, python-gtksourceview2, python-xapian, python-gst0.10 CDBS_DEPENDS_python-jarabe-$(pkgbranch) += , python-wnck | python-gnome2-desktop (<= 2.24.0-1) CDBS_DEPENDS_python-jarabe-$(pkgbranch) += , python-gconf | python-gnome2 (<= 2.22.3-2) -CDBS_RECOMMENDS_sugar-session-$(pkgbranch) = sugar-emulator-$(pkgbranch), sugar-tools-$(pkgbranch), python-carquinyol-$(pkgbranch) +CDBS_RECOMMENDS_sugar-session-$(pkgbranch) = sugar-emulator-$(pkgbranch), sugar-tools-$(pkgbranch) CDBS_RECOMMENDS_sugar-session-$(pkgbranch) += , $(call session_expand_activities,true) CDBS_RECOMMENDS_sugar-session-$(pkgbranch) += , python-xklavier CDBS_RECOMMENDS_sugar-session-$(pkgbranch) += , $(jarabe_initprofile), $(session_nm), $(session_gio), $(session_pm), $(jarabe_cp_cli_exec)
