Merge lp:~noskcaj/ubuntu/vivid/gksu/merge into lp:ubuntu/vivid/gksu

[Jackson Doak]

Merge from debian

[Martin Pitt (pitti)]

This already got uploaded a while ago without closing the MP: https://launchpad.net/ubuntu/+source/gksu/2.0.2-9ubuntu1

=== added file '.pc/01_desktop_in.patch/.timestamp'
=== added file '.pc/02_format_security.patch/.timestamp'
=== added directory '.pc/03_sudo(8).patch'
=== added file '.pc/03_sudo(8).patch/.timestamp'
=== added directory '.pc/03_sudo(8).patch/man'
=== added file '.pc/03_sudo(8).patch/man/gksu.1'
--- .pc/03_sudo(8).patch/man/gksu.1	1970-01-01 00:00:00 +0000
+++ .pc/03_sudo(8).patch/man/gksu.1	2014-12-17 02:23:03 +0000
@@ -0,0 +1,103 @@
+.TH GKSU "1" "August 2006" "gksu version 2.0.x" "User Commands"
+.SH NAME
+gksu \- GTK+ frontend for su and sudo
+.SH SYNOPSIS
+.B gksu
+.PP
+.B gksu
+[\fI-u <user>\fR] [\fIoptions\fR] \fI<command>\fR
+.PP
+.B gksudo
+[\fI-u <user>\fR] [\fIoptions\fR] \fI<command>\fR
+.SH DESCRIPTION
+This manual page documents briefly
+.B gksu
+and
+.B gksudo
+.PP
+gksu is a frontend to su and gksudo is a frontend to sudo.
+Their primary purpose is to run graphical commands that need
+root without the need to run an X terminal emulator and using
+su directly.
+.PP
+Notice that all the magic is done by the underlying library,
+libgksu. Also notice that the library will decide if it should use su
+or sudo as backend using the
+.B /apps/gksu/sudo-mode
+gconf key, if you call the
+.B gksu
+command. You can force the backend by using the
+.B gksudo
+command, or by using the \fB\-\-sudo\-mode\fR and \fB\-\-su\-mode\fR
+options.
+.PP
+If no command is given, the
+.B gksu
+program will display a small window that allows you to type in a
+command to be run, and to select what user the program should be run
+as. The other options are disregarded, right now, in this mode.
+.SH OPTIONS
+\fB\-\-debug\fR, \fB\-d\fR
+.IP
+Print information on the screen that might be
+useful for diagnosing and/or solving problems.
+.HP
+\fB\-\-user\fR <user>, \fB\-u\fR <user>
+.IP
+Call <command> as the specified user.
+.HP
+\fB\-\-disable\-grab\fR, \fB\-g\fR
+.IP
+Disable the "locking" of the keyboard, mouse,
+and focus done by the program when asking for
+password.
+.HP
+\fB\-\-prompt\fR, \fB\-P\fR
+.IP
+Ask the user if they want to have their keyboard
+and mouse grabbed before doing so.
+.HP
+\fB\-\-preserve\-env\fR, \fB\-k\fR
+.IP
+Preserve the current environments, does not set $HOME
+nor $PATH, for example.
+.HP
+\fB\-\-login\fR, \fB\-l\fR
+.IP
+Make this a login shell. Beware this may cause
+problems with the Xauthority magic. Run xhost
+to allow the target user to open windows on your
+display!
+.HP
+\fB\-\-description\fR <description|file>, \fB\-D\fR <description|file>
+.IP
+Provide a descriptive name for the command to
+be used in the default message, making it nicer.
+You can also provide the absolute path for a
+\&.desktop file. The Name key for will be used in
+this case.
+.HP
+\fB\-\-message\fR <message>, \fB\-m\fR <message>
+.IP
+Replace the standard message shown to ask for
+password for the argument passed to the option.
+Only use this if \fB\-\-description\fR does not suffice.
+.HP
+\fB\-\-print\-pass\fR, \fB\-p\fR
+.IP
+Ask gksu to print the password to stdout, just
+like ssh\-askpass. Useful to use in scripts with
+programs that accept receiving the password on
+stdin.
+.PP
+.HP
+\fB\-\-su\-mode\fR, \fB\-w\fR
+.IP
+Force gksu to use su(1) as its backend for running the programs.
+.HP
+\fB\-\-sudo\-mode\fR, \fB\-S\fR
+.IP
+Force gksu to use sudo(1) as its backend for running the programs.
+.SH "SEE ALSO"
+.BR su (1),
+.BR sudo (1)

=== added file '.pc/50_always_ask.patch/.timestamp'
=== added file '.pc/99_intltool.patch/.timestamp'
=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-11-09 10:24:13 +0000
+++ .pc/applied-patches	2014-12-17 02:23:03 +0000
@@ -2,3 +2,4 @@
 02_format_security.patch
 50_always_ask.patch
 99_intltool.patch
+03_sudo(8).patch

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-02 10:17:37 +0000
+++ debian/changelog	2014-12-17 02:23:03 +0000
@@ -1,3 +1,50 @@
+gksu (2.0.2-9ubuntu1) vivid; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - debian/patches/01_desktop_in.patch: don't display root-terminal 
+      menu entry.
+    - debian/patches/50_always_ask.patch: added new '--always-ask-pass'
+      commandline switch. This was renamed from 02_always_ask.patch.
+
+ -- Jackson Doak <[e-mail]>  Wed, 17 Dec 2014 13:11:20 +1100
+
+gksu (2.0.2-9) unstable; urgency=medium
+
+  * 01_desktop_in.patch: move from Utilities to System, for consistency 
+    with the current GNOME menu.
+
+ -- Josselin Mouette <[e-mail]>  Fri, 05 Dec 2014 17:56:37 +0100
+
+gksu (2.0.2-8) unstable; urgency=medium
+
+  * debian/control.in:
+  - make team the maintainer
+
+ -- Gustavo Noronha Silva <[e-mail]>  Mon, 01 Dec 2014 14:27:16 -0200
+
+gksu (2.0.2-7) unstable; urgency=low
+
+  * Team upload.
+
+  [ Josselin Mouette ]
+  * Update repository URL.
+
+  [ Jackson Doak ]
+  * Update debian/watch
+  * debian/control.in:
+    - Bump standards-version to 3.9.4 (no changes)
+    - Update description. Closes: #613897
+    - Use canonical URLs
+  * Remove encoding entry from 01_desktop_in.patch
+  * Add 03_sudo(8).patch. Closes: #715285
+  * Add debian/source/options to allow easier re-building
+    (The current patches create a diff of autoregenerated files)
+
+  [ Andreas Henriksson ]
+  * Fix malformed patch 01_desktop_in.patch to be valid again.
+
+ -- Andreas Henriksson <[e-mail]>  Thu, 09 Oct 2014 22:45:53 +0200
+
 gksu (2.0.2-6ubuntu2) quantal; urgency=low
 
   * Rebuild for new armel compiler default of ARMv5t.

=== modified file 'debian/control'
--- debian/control	2011-11-09 10:24:13 +0000
+++ debian/control	2014-12-17 02:23:03 +0000
@@ -2,13 +2,12 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: gksu
 Section: admin
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Gustavo Noronha Silva <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Josselin Mouette <[e-mail]>, Michael Biebl <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Gustavo Noronha Silva <[e-mail]>, Josselin Mouette <[e-mail]>, Michael Biebl <[e-mail]>
 Build-Depends: cdbs,
                debhelper (>= 8),
                intltool,
@@ -18,10 +17,10 @@
                libgksu2-dev (>= 2.0.8),
                libglib2.0-dev (>= 2.16),
                libgconf2-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: http://www.nongnu.org/gksu
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gksu/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gksu/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/attic/gksu/
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/attic/gksu/
 
 Package: gksu
 Architecture: any
@@ -33,9 +32,8 @@
           libgksu0
 Provides: gnome-sudo
 Conflicts: gnome-sudo (<= 0.3-1.1)
-Description: graphical frontend to su
- gksu is a Gtk+ frontend to /bin/su. It supports login shells
- and preserving environment when acting as a su frontend. It
- is useful to menu items or other graphical programs that need
- to ask a user's password to run another program as another user.
+Description: graphical front-end to su and sudo
+ This package provides GTK+ front-ends for su (gksu) and sudo (gksudo),
+ allowing users to give a password and run graphical commands as root
+ without needing to invoke su or sudo in a terminal emulator.
 

=== modified file 'debian/control.in'
--- debian/control.in	2011-11-09 10:24:13 +0000
+++ debian/control.in	2014-12-17 02:23:03 +0000
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Gustavo Noronha Silva <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs,
                debhelper (>= 8),
@@ -13,10 +13,10 @@
                libgksu2-dev (>= 2.0.8),
                libglib2.0-dev (>= 2.16),
                libgconf2-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: http://www.nongnu.org/gksu
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gksu/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gksu/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/attic/gksu/
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/attic/gksu/
 
 Package: gksu
 Architecture: any
@@ -28,9 +28,8 @@
           libgksu0
 Provides: gnome-sudo
 Conflicts: gnome-sudo (<= 0.3-1.1)
-Description: graphical frontend to su
- gksu is a Gtk+ frontend to /bin/su. It supports login shells
- and preserving environment when acting as a su frontend. It
- is useful to menu items or other graphical programs that need
- to ask a user's password to run another program as another user.
+Description: graphical front-end to su and sudo
+ This package provides GTK+ front-ends for su (gksu) and sudo (gksudo),
+ allowing users to give a password and run graphical commands as root
+ without needing to invoke su or sudo in a terminal emulator.
 

=== modified file 'debian/patches/01_desktop_in.patch'
--- debian/patches/01_desktop_in.patch	2011-02-23 10:03:03 +0000
+++ debian/patches/01_desktop_in.patch	2014-12-17 02:23:03 +0000
@@ -1,16 +1,14 @@
-diff -Naur gksu-2.0.2.ori//gksu.desktop.in gksu-2.0.2/gksu.desktop.in
---- gksu-2.0.2.ori//gksu.desktop.in	1969-12-31 19:00:00.000000000 -0500
-+++ gksu-2.0.2/gksu.desktop.in	2011-02-23 10:01:41.000000000 -0500
-@@ -0,0 +1,12 @@
+--- /dev/null	2010-10-30 06:08:50.107935125 +0200
++++ gksu-2.0.2/gksu.desktop.in	2010-10-30 15:29:53.549770597 +0200
+@@ -0,0 +1,11 @@
 +[Desktop Entry]
 +_Name=Root Terminal
 +_Comment=Opens a terminal as the root user, using gksu to ask for the password
-+Encoding=UTF-8
 +Exec=gksu /usr/bin/x-terminal-emulator
 +Icon=gksu-root-terminal
 +StartupNotify=true
 +Terminal=false
 +X-MultipleArgs=false
 +Type=Application
-+Categories=GTK;Utility;TerminalEmulator;
++Categories=GTK;System;TerminalEmulator;
 +NoDisplay=true

=== added file 'debian/patches/03_sudo(8).patch'
--- debian/patches/03_sudo(8).patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03_sudo(8).patch	2014-12-17 02:23:03 +0000
@@ -0,0 +1,16 @@
+Description: Change from sudo(1) to sudo(8)
+Author: Jackson Doak <[e-mail]>
+Bug-Debian: http://bugs.debian.org/715285
+
+--- gksu-2.0.2.orig/man/gksu.1
++++ gksu-2.0.2/man/gksu.1
+@@ -97,7 +97,7 @@ Force gksu to use su(1) as its backend f
+ .HP
+ \fB\-\-sudo\-mode\fR, \fB\-S\fR
+ .IP
+-Force gksu to use sudo(1) as its backend for running the programs.
++Force gksu to use sudo(8) as its backend for running the programs.
+ .SH "SEE ALSO"
+ .BR su (1),
+-.BR sudo (1)
++.BR sudo (8)

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-11-09 10:24:13 +0000
+++ debian/patches/series	2014-12-17 02:23:03 +0000
@@ -2,3 +2,5 @@
 02_format_security.patch
 50_always_ask.patch
 99_intltool.patch
+03_sudo(8).patch
+

=== added file 'debian/source/options'
--- debian/source/options	1970-01-01 00:00:00 +0000
+++ debian/source/options	2014-12-17 02:23:03 +0000
@@ -0,0 +1,1 @@
+extend-diff-ignore = "(^|/)(gksu\.desktop|Makefile)$"
\ No newline at end of file

=== modified file 'debian/watch'
--- debian/watch	2007-12-05 18:25:19 +0000
+++ debian/watch	2014-12-17 02:23:03 +0000
@@ -1,3 +1,2 @@
 version=3
-http://people.debian.org/~kov/gksu/gksu-(.*)\.tar\.gz \
-	debian uupdate
+http://www.nongnu.org/gksu .*/gksu-(\d.*?)(?:[\.\-]src)?.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)).*
\ No newline at end of file

=== modified file 'gksu.desktop.in'
--- gksu.desktop.in	2011-11-09 10:24:13 +0000
+++ gksu.desktop.in	2014-12-17 02:23:03 +0000
@@ -1,12 +1,11 @@
 [Desktop Entry]
 _Name=Root Terminal
 _Comment=Opens a terminal as the root user, using gksu to ask for the password
-Encoding=UTF-8
 Exec=gksu /usr/bin/x-terminal-emulator
 Icon=gksu-root-terminal
 StartupNotify=true
 Terminal=false
 X-MultipleArgs=false
 Type=Application
-Categories=GTK;Utility;TerminalEmulator;
+Categories=GTK;System;TerminalEmulator;
 NoDisplay=true

=== modified file 'man/gksu.1'
--- man/gksu.1	2006-11-22 16:37:57 +0000
+++ man/gksu.1	2014-12-17 02:23:03 +0000
@@ -97,7 +97,7 @@
 .HP
 \fB\-\-sudo\-mode\fR, \fB\-S\fR
 .IP
-Force gksu to use sudo(1) as its backend for running the programs.
+Force gksu to use sudo(8) as its backend for running the programs.
 .SH "SEE ALSO"
 .BR su (1),
-.BR sudo (1)
+.BR sudo (8)