-
Committer:
Package Import Robot
-
Author(s):
Gianfranco Costamagna
-
Date:
2015-05-28 15:53:47 UTC
-
mfrom:
(3.4.56 sid)
-
Revision ID:
package-import@ubuntu.com-20150528155347-9m253tuskbpkkd1d
Tags: 7.42.1-2ubuntu1
* Merge from Debian (LP: #1459685). Remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel4 and libssh2-1-dev.
    + Drop libssh2-1-dev from binary package Depends.
* Dropped patches:
  - debian/patches/CVE-2015-3143.patch: upstream
  - debian/patches/CVE-2015-3148.patch: upstream
  - debian/patches/CVE-2015-3144.patch: upstream
  - debian/patches/CVE-2015-3153.patch: upstream
  - debian/patches/CVE-2014-8150.patch: upstream
  - debian/patches/CVE-2015-3145.patch: upstream
* Dropped the added udeb packages. They were empty since trusty and were
  originally added for LP: #831496, this change is likely not needed any
  more.