lp:~noskcaj/ubuntu/vivid/gksu/merge
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/vivid/gksu/merge
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 372 lines (+195/-32)12 files modified.pc/03_sudo(8).patch/man/gksu.1 (+103/-0)
.pc/applied-patches (+1/-0)
debian/changelog (+47/-0)
debian/control (+9/-11)
debian/control.in (+8/-9)
debian/patches/01_desktop_in.patch (+4/-6)
debian/patches/03_sudo(8).patch (+16/-0)
debian/patches/series (+2/-0)
debian/source/options (+1/-0)
debian/watch (+1/-2)
gksu.desktop.in (+1/-2)
man/gksu.1 (+2/-2)
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 46. By Jackson Doak
-
* 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.
* 01_desktop_in.patch: move from Utilities to System, for consistency
with the current GNOME menu.
* debian/control.in:
- make team the maintainer
* Team upload.
* Update repository URL.
* 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)
* Fix malformed patch 01_desktop_in.patch to be valid again. - 44. By Marc Deslauriers
-
* Merge from Debian Testing. 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.
* Patches dropped:
- debian/patches/ 21_strip_ blank_space. patch: No longer needed since we
don't build nautilus-gksu anymore. - 43. By Marc Deslauriers
-
debian/
patches/ 01_desktop_ in.patch: don't display root-terminal
menu entry. This inadvertently got dropped in 2.0.2-5ubuntu1. - 42. By Bilal Akhtar
-
* Merge from Debian Unstable. (LP: #683484) Remaining changes:
- debian/control.in:
+ remove build-dependency on sng (universe).
+ add sharutil b-d.
- do not do the sng->png at build time but instead include a static
uuencoded copy.
- debian/patches/ 02_always_ ask.patch: added new '--always-ask-pass'
commandline switch. This patch was 01_always_ask.patch earlier.
- debian/patches/ 21_strip_ blank_space. patch: strip blank spaces from
'cmd'.
* Changes merged with Debian:
- debian/patches/ 07_desktop_ in_ship. patch: don't display root-terminal
menu entry. - 41. By Lorenzo De Liso
-
* Merge from debian unstable (LP: #669705), remaining changes:
- debian/control.in:
+ remove build-dependency on sng (universe)
+ add sharutil b-d
- do not do the sng->png at build time but instead include a static
uuencoded copy
- debian/patches/ 01_always_ ask.patch: added new '--always-ask-pass'
commandline switch
- debian/patches/ 07_desktop_ in_ship. patch: don't display root-terminal
menu entry
- debian/patches/ 21_strip_ blank_space. patch: strip blank spaces from 'cmd' - 39. By Martin Pitt
-
Drop 14_set_
http_proxy_ env.patch, this has been obsoleted in lucid. sudo
now does not pass those variables any more, and gnome-network-properties
can now set the proxy system-wide. - 38. By Alexander Sack
-
rebuild rest of main for armel armv7/thumb2 optimization;
UbuntuSpec:mobile- lucid-arm- gcc-v7- thumb2 - 37. By Michael Vogt
-
* Merge from debian unstable, remaining changes:
- control.in: remove build-dependency on sng (universe)
- control.in: and add sharutil b-d
- do not do the sng->png at build time but
instead include a static uuencoded copy
- debian/patches/ 01_always_ ask.patch:
+ added new '--always-ask-pass' commandline switch
- debian/patches/ 07_desktop_ in_ship. patch:
+ don't display root-terminal menu entry
- debian/patches/ 14_set_ http_proxy_ env.patch:
+ set http_proxy environment from gconf
- 21_strip_blank_space. patch:
+ strip blank spaces from 'cmd'
* drop:
- debian/patches/ 15_configure
- debian/patches/ 16_fix_ ftbfs.patch
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/vivid/gksu