diff options
| author | Jelmer Vernooij <jelmer@jelmer.uk> | 2015-12-16 01:46:54 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@jelmer.uk> | 2015-12-16 01:46:54 +0000 |
| commit | 33f6044f35d6589f73822befd3630824932928ea (patch) | |
| tree | c4beac82f57ce9466be460a954a5beccdf759033 | |
| parent | 9da96cf08037c03c57ea8f1a30380bc96bcc077f (diff) | |
| parent | 5e12600692a44eb533d382aab4b2dbf9dd39893b (diff) | |
Merge in 2:4.1.21-2.HEADdebian/2%4.1.22+dfsg-1master
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/git-diff | 45 |
2 files changed, 51 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 1d71e8c7b4..e65cdd7998 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,12 @@ samba (2:4.1.22+dfsg-1) unstable; urgency=high -- Jelmer Vernooij <jelmer@debian.org> Wed, 16 Dec 2015 00:57:50 +0000 +samba (2:4.1.21+dfsg-2) unstable; urgency=medium + + * Rebuild against newer ldb. Closes: #805304 + + -- Jelmer Vernooij <jelmer@debian.org> Mon, 16 Nov 2015 23:14:19 +0000 + samba (2:4.1.21+dfsg-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/git-diff b/debian/patches/git-diff new file mode 100644 index 0000000000..6d10b06a31 --- /dev/null +++ b/debian/patches/git-diff @@ -0,0 +1,45 @@ +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + samba (2:4.1.21+dfsg-1) UNRELEASED; urgency=medium + . + * New upstream release. + * Fix epoch for dependency on ldb. Closes: #800331 + * Rebuild aginst newer ldb. Closes: #805176 +Author: Jelmer Vernooij <jelmer@debian.org> +Bug-Debian: https://bugs.debian.org/800331 +Bug-Debian: https://bugs.debian.org/805176 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: https://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- samba-4.1.21+dfsg.orig/README.packaging4 ++++ /dev/null +@@ -1,13 +0,0 @@ +-Debian +-====== +- +-Packages of Samba 4 are regularly uploaded to the Debian and Ubuntu archives. +- +-http://packages.debian.org/samba4 +- +-Please see http://wiki.samba.org/index.php/Samba4/Debian for instructions +-on building the Samba 4 Debian packages. +- +-Fedora +-====== +-A package of Samba 4 is maintained in Fedora. |