see ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c16420c1a54e252a738cb8b03ac2628e4cabf6ab..c8bafffc35e4dd719ce0e4924ae180b7cffb8e32 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,17 @@
+Tue Oct  5 04:08:41 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Change datadir to just $(prefix) in po/Makefile.in.in, otherwise
+    localedir would become /usr/share/share/locale
+  * Make /usr/share/doc/dpkg-dev a symlink to /usr/share/doc/dpkg
+
 Mon Oct  4 15:38:42 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Update GPL and documentation location in debian/copyright
 
+Sat Oct  2 16:00:38 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Update deb.5 to say it's in section 5, not 8
+
 Tue Sep 28 13:38:50 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Make dpkg-source work again on empty diffs, patch from Roman Hodek

diff --git a/debian/changelog b/debian/changelog
index 9f58a66ca5cf1e28f74729f9f0ad20839c73a6cf..ce2f1242ecd948ad38f15406def6f6b8572c0cc7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dpkg (1.4.1.14) unstable; urgency=low
+
+  * Non-maintainer release.
+  * dpkg-source works again on empty diffs, Closes: Bug# 46159
+  * Install locale-files in /usr/share, Closes: Bug# 46631
+  * Make /usr/share/doc/dpkg-dev a symlink to /usr/share/doc/dpkg
+
+ -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
+
 dpkg (1.4.1.13) unstable; urgency=low
 
   * Non-maintainer release.

diff --git a/debian/rules b/debian/rules
index e9c2031d61dad6e7e51576afed164bf0e5d65a06..eedbef785d920cff3d1002f5a3115da50db50c57 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -86,11 +86,11 @@ binary-trees: build
        install -c debian/50dpkg-dev.el debian/tmp-dev/etc/emacs/site-start.d/.
        install -d debian/tmp-dev/usr/lib/emacsen-common/packages/{install,remove}
        install -m 755 debian/emacsen-common-remove \
-       debian/tmp-dev/usr/lib/emacsen-common/packages/remove/dpkg-dev
+           debian/tmp-dev/usr/lib/emacsen-common/packages/remove/dpkg-dev
        install -m 755 debian/emacsen-common-install \
        debian/tmp-dev/usr/lib/emacsen-common/packages/install/dpkg-dev
        cp scripts/debian-changelog-mode.el \
-       debian/tmp-dev/usr/share/emacs/site-lisp/dpkg-dev
+           debian/tmp-dev/usr/share/emacs/site-lisp/dpkg-dev
        rm -f debian/tmp-main/usr/share/{x,}emacs/site-lisp/debian-changelog-mode.el*
        chmod +x $(mcidir)/{postinst,prerm,preinst}
        find debian/tmp-main/usr/share/man -type f | xargs gzip -9vf
@@ -102,8 +102,7 @@ binary-trees: build
        ln -s ../man7/undocumented.7.gz debian/tmp-main/usr/share/man/man1/dpkg-divert.1.gz
        gzip -9vf debian/tmp-main/usr/share/doc/dpkg/changelog*
        cp debian/copyright debian/tmp-main/usr/share/doc/dpkg/copyright
-       cp debian/copyright debian/tmp-dev/usr/share/doc/dpkg-dev/copyright
-       cp debian/dev-README debian/tmp-dev/usr/share/doc/dpkg-dev/README
+       ln -s dpkg debian/tmp-dev/usr/share/doc/dpkg-dev
        set -e; for f in \
  usr/share/doc/dpkg/{internals.html,changelog.manuals.gz} \
  usr/bin/dpkg-{source,genchanges,gencontrol,shlibdeps,buildpackage,parsechangelog} \

diff --git a/doc/deb.5 b/doc/deb.5
index 3f88888dfbd9444dedaba69bb628b2c886758bbd..c36f89efdb2ff1e0a4af75fe50b156558262d8b6 100644 (file)
--- a/doc/deb.5
+++ b/doc/deb.5
@@ -1,6 +1,6 @@
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
 .\" Authors: Raul Miller, Ian Jackson
-.TH DEB 8 "1st July 1996" "Debian Project" "Debian GNU/Linux"
+.TH DEB 5 "1st July 1996" "Debian Project" "Debian GNU/Linux"
 .SH NAME 
 deb - Debian GNU/Linux binary package format
 .SH SYNOPSIS

diff --git a/doc/ja/deb.5 b/doc/ja/deb.5
index 83eeba728dd9585bc5ea393efba21abd63c0d6b3..28c042e0acad867c3f03b02de9a1acc01f37c83b 100644 (file)
--- a/doc/ja/deb.5
+++ b/doc/ja/deb.5
@@ -2,7 +2,7 @@
 .\" Authors: Raul Miller, Ian Jackson
 .\"WORD     package control information   ¥Ñ¥Ã¥±¡¼¥¸À©¸æ¾ðÊó
 .\"WORD            gzipped ustar                 °µ½Ì tar ·Á¼°
-.TH DEB 8 "1st July 1996" "Debian Project" "Debian GNU/Linux"
+.TH DEB 5 "1st July 1996" "Debian Project" "Debian GNU/Linux"
 .SH ̾¾Î
 deb - Debian GNU/Linux ¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸·Á¼°
 .SH ½ñ¼°

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 111b40fcbb6664771b9f09c3cd91fff9dccffe75..6465d0fe7991b34bb90fea7b705397276b0e957e 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -18,7 +18,7 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = $(prefix)
 localedir = $(datadir)/locale
 gnulocaledir = $(prefix)/share/locale
 gettextsrcdir = $(prefix)/share/gettext/po