diff -u qtparted-0.4.5/debian/qtparted-root qtparted-0.4.5/debian/qtparted-root --- qtparted-0.4.5/debian/qtparted-root +++ qtparted-0.4.5/debian/qtparted-root @@ -11,40 +11,10 @@ # See '/usr/share/common-licenses/GPL' for more information. # -auth="" - -if [ -x /usr/bin/kdesudo ]; then - auth="/usr/bin/kdesudo" -elif [ -x /usr/bin/kdesu ]; then - auth="/usr/bin/kdesu" +if [ $(id -u) == 0 ]; then + exec $auth /usr/sbin/qtparted fi -if [ -z $auth ] || [ -n "`ps -A | grep gnome-panel`" ]; then - if [ -x /usr/bin/gksudo ]; then - auth="/usr/bin/gksudo" - elif [ -x /usr/bin/gksu ]; then - auth="/usr/bin/gksu" - fi -fi - -if [ -z $auth ]; then - echo "Warning: Couldn't find any way to obtain sudo privilegies." -fi - -$auth /usr/sbin/qtparted -#! /bin/sh -# -# QtParted Launcher -# -# This little script will execute QtParted with administrator privilegies -# It will try to autodetect which application should be used to gain -# those, choosing between kdesu, kdesudo and gksudo. -# -# By Siegfried-A. Gevatter -# Licensed under the GNU General Public License, version 2 or later -# See '/usr/share/common-licenses/GPL' for more information. -# - auth="" if [ -x /usr/bin/kdesudo ]; then @@ -65,4 +35,4 @@ - echo "Warning: Couldn't find any way to obtain sudo privilegies." + xmessage "Warning: Couldn't find any way to obtain sudo privilegies." fi -$auth /usr/sbin/qtparted +exec $auth /usr/sbin/qtparted reverted: --- qtparted-0.4.5/debian/install +++ qtparted-0.4.5.orig/debian/install @@ -1,2 +0,0 @@ -debian/qtparted-root usr/sbin/ -debian/qtparted-root usr/sbin/ diff -u qtparted-0.4.5/debian/rules qtparted-0.4.5/debian/rules --- qtparted-0.4.5/debian/rules +++ qtparted-0.4.5/debian/rules @@ -61,6 +61,9 @@ # FIXME: Cleanup some mistakes by qtparted installation rm -rf $(CURDIR)/debian/qtparted/usr/man + # Install the wrapper script + install -m 755 $(CURDIR)/debian/qtparted-root $(CURDIR)/debian/qtparted/usr/sbin/ + # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. diff -u qtparted-0.4.5/debian/postrm qtparted-0.4.5/debian/postrm --- qtparted-0.4.5/debian/postrm +++ qtparted-0.4.5/debian/postrm @@ -12,11 +11,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "purge" ]; then - rm -rf /var/log/qtparted-2???????-??h??m??s.log -fi - -#DEBHELPER# - -exit 0 diff -u qtparted-0.4.5/debian/changelog qtparted-0.4.5/debian/changelog --- qtparted-0.4.5/debian/changelog +++ qtparted-0.4.5/debian/changelog @@ -1,3 +1,16 @@ +qtparted (0.4.5-4ubuntu1.1) jaunty; urgency=low + + * Actually install qtparted-root (LP: #257220) + * Edit qtparted-root: + - Check if the user is already root + - Use xmessage to display the error message, as the script will normally + be running in X + - Remove duplicated parts + * Edit debian/postrm: + - Remove duplicated parts + + -- Terence Simpson Tue, 27 Jan 2009 10:40:10 +0000 + qtparted (0.4.5-4ubuntu1) intrepid; urgency=low * Merge from debian unstable, remaining changes: