Add new shlibs.default and shlibs.override files

diff --git a/ChangeLog b/ChangeLog
index d152239da5f58ad2e6eb801c91d576e8fc4d4b44..ad7d44a850243ab2d9072be616677fa0944eb76c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 21 16:29:32 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * debian/shlibs-default.template: removed
+  * debian/shlibs-{default,override}: new files
+  * debian/rules: install shlibs-{default,override} in /etc/dpkg in dpkg-dev
+
 Sun Sep 17 01:50:34 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/dpkg-source.1: document -k option for dpkg-buildpackage

diff --git a/debian/changelog b/debian/changelog
index fab4b9b7b0c0ce4bbb6f78d1a6105a43be702910..996570e5c28a3f2d415e8809aaa69d489de0c83a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ dpkg (1.7.0) unstable; urgency=low
   * dselect/main.cc: small fixups to get it to compile with gcc-2.96
   * Clean up fd handling in some places. Closes: Bug#69359,#69360,#69361
   * Document -k option for dpkg-buildpackage. Closes: Bug#71808
+  * Install dummy shlibs.default and shlibs.override files
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/debian/dpkg-dev.conffiles b/debian/dpkg-dev.conffiles
index 9b6587528103f261b9c4bdb73a49101c228a7baa..bd77cb27fe5bbb99d66e6340e2025be7e179967d 100644 (file)
--- a/debian/dpkg-dev.conffiles
+++ b/debian/dpkg-dev.conffiles
@@ -1 +1,3 @@
+/etc/dpkg/shlibs.default
+/etc/dpkg/shlibs.override
 /etc/emacs/site-start.d/50dpkg-dev.el

diff --git a/debian/rules b/debian/rules
index f99e2246a8e367a5c9c2f167ec2add631900d4b5..28c9d5a6a801174ff46d2322062f276f28a6194c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -135,6 +135,11 @@ binary-dpkg-dev: stamp-binary
        rm -rf $(TMP_DPKG_DEV)
        install -d -m 755 -o root -g root $(TMP_DPKG_DEV)
        chmod g-s $(TMP_DPKG_DEV)
+       install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/etc/dpkg
+       install -p -m 644 -o root -g root debian/shlibs.default \
+               $(TMP_DPKG_DEV)/etc/dpkg/
+       install -p -m 644 -o root -g root debian/shlibs.override \
+               $(TMP_DPKG_DEV)/etc/dpkg/
        install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/lib/dpkg
        install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share
        install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/bin

diff --git a/debian/shlibs.default b/debian/shlibs.default
new file mode 100644 (file)
index 0000000..1712dfd
--- /dev/null
+++ b/debian/shlibs.default
@@ -0,0 +1,12 @@
+# Dpkg shlibs defaults file
+#
+# This file contains shlibs entries that are used as a last resort when
+# no matching entries are found elsewhere. For more information see the
+# dpkg-shlibsdeps manual page. 
+#
+# The format used is:
+#   <library-name> <version-or-soname> <dependencies ...>
+#
+# Example:
+#   libfoo     1    libfoo1 (>= 1.0-1)
+#

diff --git a/debian/shlibs.default.template b/debian/shlibs.default.template
deleted file mode 100644 (file)
index 58f52e5..0000000
--- a/debian/shlibs.default.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Default shlibs or original porting
-libc 6         libc6
-libm 6         libc6
-libncurses 4  libncurses4
-libICE  6       xlib6g (>= 3.3-5)
-libPEX5 6       xlib6g (>= 3.3-5)
-libSM   6       xlib6g (>= 3.3-5)
-libX11  6       xlib6g (>= 3.3-5)
-libXIE  6       xlib6g (>= 3.3-5)
-libXaw  6       xlib6g (>= 3.3-5)
-libXext 6       xlib6g (>= 3.3-5)
-libXi   6       xlib6g (>= 3.3-5)
-libXmu  6       xlib6g (>= 3.3-5)
-libXt   6       xlib6g (>= 3.3-5)
-libXtst 6       xlib6g (>= 3.3-5)
-libXp   6       xlib6g (>= 3.3-5)

diff --git a/debian/shlibs.override b/debian/shlibs.override
new file mode 100644 (file)
index 0000000..2c0e25e
--- /dev/null
+++ b/debian/shlibs.override
@@ -0,0 +1,13 @@
+# Dpkg shlibs override file
+#
+# Entries in this file will override all others, only use if you
+# are really sure that is what you want!
+# 
+# For more information see the dpkg-shlibsdeps manual page. 
+#
+# The format used is:
+#   <library-name> <version-or-soname> <dependencies ...>
+#
+# Example:
+#   libfoo     1    libfoo1 (>= 1.0-1)
+#

diff --git a/po/dpkg.pot b/po/dpkg.pot
index 528ea48c454a94a339423c1eccd519255211fc20..482d8c22d91dd34165b4e6a79356a054f69ddb8a 100644 (file)
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-08 18:34+0200\n"
+"POT-Creation-Date: 2000-09-21 15:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1624,7 +1624,7 @@ msgid "no gcc-lib component"
 msgstr ""
 
 #: main/enquiry.c:721
-msgid "no hyphen after gcc-lib"
+msgid "no slash after gcc-lib"
 msgstr ""
 
 #: main/enquiry.c:733