Wichert Akkerman лет назад: 27
Родитель
Сommit
10dc030854
6 измененных файлов с 25 добавлено и 7 удалено
  1. 10 0
      ChangeLog
  2. 9 0
      debian/changelog
  3. 3 4
      debian/rules
  4. 1 1
      doc/deb.5
  5. 1 1
      doc/ja/deb.5
  6. 1 1
      po/Makefile.in.in

+ 10 - 0
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

+ 9 - 0
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.

+ 3 - 4
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} \

+ 1 - 1
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

+ 1 - 1
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 書式

+ 1 - 1
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