ubuntu/+source/gnome-keyring:applied/ubuntu/wily-proposed

Last commit made on 2015-07-13
Get this branch:
git clone -b applied/ubuntu/wily-proposed https://git.launchpad.net/ubuntu/+source/gnome-keyring
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/ubuntu/wily-proposed
Repository:
lp:ubuntu/+source/gnome-keyring

Recent commits

93d0e3d... by Iain Lane on 2015-07-13

Import patches-applied version 3.16.0-4ubuntu2 to applied/ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 86b7506d509d41a81cada1fa6e9e43767b8e85ee
Unapplied parent: 27771a22918465d37b75b01fcc42b3227eb87f59

New changelog entries:
  * Temporarily (until Debian bug #791411 is fixed) allow other pinentry
    methods to satisfy our dependency.

27771a2... by Iain Lane on 2015-07-13

Clean up Startup Applications dialog by hiding default apps

Gbp-Pq: 04_nodisplay_autostart.patch.

def14cf... by Iain Lane on 2015-07-13

03_kfreebsd.patch

No DEP3 Subject or Description header found

Gbp-Pq: 03_kfreebsd.patch.

0c766f1... by Iain Lane on 2015-07-13

Import patches-unapplied version 3.16.0-4ubuntu2 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 3a0b6e32c7c36d30bccd869f1fb24f65e458ad73

New changelog entries:
  * Temporarily (until Debian bug #791411 is fixed) allow other pinentry
    methods to satisfy our dependency.

86b7506... by Jackson Doak on 2015-07-10

Import patches-applied version 3.16.0-4ubuntu1 to applied/ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 328298700ef8dc2cab9a2daa3f1e4856802ca0b2
Unapplied parent: 1186e5b8b1cc1b73f0b06242f8ddbbf4be4eebd8

New changelog entries:
  * Merge from debian, remaining changes:
    - Provide upstart user session jobs.
    - Add Vcs-Bzr for Ubuntu
    - Add 04_nodisplay_autostart.patch to clean up the startup icons dialogue
    * debian/gnome-keyring.ubiquity, debian/rules:
      - Apply capabilities at the end of the ubiquity process to make sure new
        installs have gnome-keyring-daemon with cap_ipc_lock+ep.
    * debian/control, debian/*.install, debian/rules:
      - change for multiarch support, install pkcs11 in its own binary

3a0b6e3... by Jackson Doak on 2015-07-10

Import patches-unapplied version 3.16.0-4ubuntu1 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 634e8b96e537026684a40aaf1bc40b3266790458

New changelog entries:
  * Merge from debian, remaining changes:
    - Provide upstart user session jobs.
    - Add Vcs-Bzr for Ubuntu
    - Add 04_nodisplay_autostart.patch to clean up the startup icons dialogue
    * debian/gnome-keyring.ubiquity, debian/rules:
      - Apply capabilities at the end of the ubiquity process to make sure new
        installs have gnome-keyring-daemon with cap_ipc_lock+ep.
    * debian/control, debian/*.install, debian/rules:
      - change for multiarch support, install pkcs11 in its own binary

1186e5b... by Jackson Doak on 2015-07-10

Clean up Startup Applications dialog by hiding default apps

Gbp-Pq: 04_nodisplay_autostart.patch.

940b90e... by Jackson Doak on 2015-07-10

03_kfreebsd.patch

No DEP3 Subject or Description header found

Gbp-Pq: 03_kfreebsd.patch.

3282987... by Michael Biebl on 2015-07-03

Import patches-applied version 3.16.0-4 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 1f308118115be981c207f145a29b1138a6e78d81
Unapplied parent: 9224ea597c0ee92e2207dda7399c2aeabf9718e5

New changelog entries:
  * Fix the removal of /etc/xdg/autostart/gnome-keyring-gpg.desktop. This file
    is installed even when compiled with --disable-gpg-agent, so remove it
    manually.

634e8b9... by Michael Biebl on 2015-07-03

Import patches-unapplied version 3.16.0-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 286ff837d4a683c4f4c55f868d6296f0b7c3ffeb

New changelog entries:
  * Fix the removal of /etc/xdg/autostart/gnome-keyring-gpg.desktop. This file
    is installed even when compiled with --disable-gpg-agent, so remove it
    manually.