[glibc-doc-reference] 11/13: Drop ancient conflicts.

[Aurelien Jarno <aurel32@moszumanska.debian.org>]

This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch sid
in repository glibc-doc-reference.

commit ae3625f0fd36d33b17bdd2fb01b88ee170c16528
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Sat Dec 2 22:28:28 2017 +0100

    Drop ancient conflicts.
---
 debian/changelog | 1 +
 debian/control   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6d09dc2..45080fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ glibc-doc-reference (2.25-1) UNRELEASED; urgency=medium
   * Remove Jeff Bailey from uploaders (closes: #835616).
   * Remove GOTO Masanori from uploaders (closes: #839678).
   * Remove Daniel Jacobowitz from uploaders (closes: #869306).
+  * Drop ancient conflicts.
 
  -- Aurelien Jarno <aurel32@debian.org>  Sat, 02 Dec 2017 15:39:35 +0100
 
diff --git a/debian/control b/debian/control
index 42dfda8..32ed668 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,5 @@ Standards-Version: 4.1.2
 Package: glibc-doc-reference
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: glibc-doc (<< 2.4)
 Description: GNU C Library: Documentation
  Contains The GNU C Library Reference manual in info, pdf and html format.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc-doc-reference.git