add conflict with dpkg-iasearch which intruded on our namespace and replace manpages...

diff --git a/ChangeLog b/ChangeLog
index f2ff7653fcc425c662336a5dbf95bf17c9aaffa5..0712e07ac7c36d2ff858c032b06074fd1743daed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,25 +1,7 @@
-Sun Jun 23 00:45:19 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
+Mon Jul  1 14:45:11 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
 
-  * scripts/dpkg-genchanges.pl: Add ~ to the list of legal characters
-    in a package filename
-
-Sat Jun 22 16:13:42 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
-
-  * scripts/dpkg-checkbuilddeps.pl: remove forced check for build-essential,
-    we should not hardcode Debian policy into dpkg
-
-Sat Jun 22 14:17:03 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
-
-  * debian/control, man/en/dpkg.8.sgml, main/dpkg.8: Apply (modified version
-    of) patch from Josip Rodin to improve bits of documentation
-
-Sat Jun 22 14:10:43 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
-
-  * debian/rules: Install dselect methods in dselect package
-
-Sat Jun 22 14:02:32 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
-
-  * version-nr, debian/changelog: Start 1.11
+  * debian/control: add conflict with dpkg-iasearch which intruded on
+    our namespace and replace manpages-de which includes one of our manpages
 
 Fri Jun 21 21:53:24 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
 

diff --git a/debian/changelog b/debian/changelog
index 0e9641829fa0f10a542c1de5404a31b1797ea992..b2bbdcbf9c53dcdea296e460622c5ba9f87f1e1b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,9 @@
-dpkg (1.11) unstable; urgency=low
+dpkg (1.10.1) unstable; urgency=low
 
-  * Move dselect methods to dselect package
-  * Improve long package descriptions
-  * Improve formatting of dpkg manpage
-  * dpkg-checkbuilddeps no longer checks for build-essential
-  * Make dpkg-genchanges accept ~ as part of a package filename.
-    Closes: Bug#150739
+  * Add conflict with dpkg-iasearch which intruded on our namespace
+  * Replace manpages-de which includes one of our manpages
 
- -- Wichert Akkerman <wakkerma@debian.org>  Sat, 22 Jun 2002 14:02:59 +0200
+ -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 
 dpkg (1.10) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index d9187b2728f28f774183d959a776df82fdb68176..3e445c2f1b657259dfedac60db7eafdcdd550a3c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Package: dpkg
 Architecture: any
 Essential: yes
 Pre-Depends: dselect, ${shlibs:Pre-Depends}
-Conflicts: sysvinit (<< 2.82-1)
-Replaces: dpkg-doc-ja, dpkg-static
+Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch
+Replaces: dpkg-doc-ja, dpkg-static, manpages-de (<= 0.4-3)
 Conflicts: dpkg-static
 Description: Package maintenance system for Debian
  This package contains the programs which handle the installation and
@@ -58,13 +58,11 @@ Suggests: gnupg, debian-keyring
 Conflicts: dpkgname
 Replaces: dpkgname, dpkg (<< 1.4.1.8), dpkg-doc-ja
 Description: Package building tools for Debian
- This package contains the necessary tools required to unpack
- (dpkg-source), build (dpkg-buildpackage, dpkg-architecture,
- dpkg-gencontrol, dpkg-shlibdeps) and prepare Debian source packages
- for upload (dpkg-distaddfile, dpkg-genchanges, dpkg-parsechangelog).
+ This package contains the tools (including dpkg-source) required to
+ unpack, build and upload Debian source packages.
  .
- Also included are the basic .deb package format documentation and
- utilities for building Packages and Sources files.
+ Most Debian source packages will require additional tools to build -
+ for example, most packages need the `make' and the C compiler `gcc'.
 
 Package: dpkg-doc
 Section: doc