瀏覽代碼

scripts/dpkg-buildpackage.sh: support debsign
scripts/update-alternatives.8: fix wrong order of parameters in ACTION section
Updated Polish translation

Wichert Akkerman 26 年之前
父節點
當前提交
c4ab8d9470
共有 5 個文件被更改,包括 814 次插入325 次删除
  1. 8 0
      ChangeLog
  2. 8 0
      debian/changelog
  3. 785 324
      po/pl.po
  4. 12 0
      scripts/dpkg-buildpackage.sh
  5. 1 1
      scripts/update-alternatives.8

+ 8 - 0
ChangeLog

@@ -1,3 +1,11 @@
+Wed Jan  5 17:09:45 CET 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * Merge patch from Tom Lees <tom@lpsg.demon.co.uk>:
+    + scripts/dpkg-buildpackage.sh: support debsign
+  * scripts/update-alternatives.8: fix wrong order of parameters
+    in ACTION section
+  * Updated Polish translation
+
 Sun Dec 26 01:31:08 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Update copyright for Swedish translation to SPI instead of Debian

+ 8 - 0
debian/changelog

@@ -1,3 +1,11 @@
+dpkg (1.6.6) unstable; urgency=low
+
+  * dpkg-buildpackage supports debsign, Closes: Bug# 58333
+  * fix update-alternatives manpage, Closes: Bug# 53859
+  * Updated Polish translation
+
+ -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
+
 dpkg (1.6.5) unstable; urgency=low
 
   * Update Spanish translation

文件差異過大導致無法顯示
+ 785 - 324
po/pl.po


+ 12 - 0
scripts/dpkg-buildpackage.sh

@@ -17,6 +17,7 @@ Options: -r<gain-root-command>
 	 -k<keyid>     the key to use for signing
          -sgpg         the sign-command is called like GPG
          -spgp         the sign-command is called like PGP 
+         -sdebsign     the sign-command works like debsign
          -us           unsigned source
          -uc           unsigned changes
          -a<arch>      Debian architecture we build for
@@ -65,6 +66,7 @@ do
 	-k*)	signkey="$value" ;;
 	-sgpg)  forcesigninterface=gpg ;;
 	-spgp)  forcesigninterface=pgp ;;
+	-sdebsign)  forcesigninterface=debsign ;;
 	-us)	signsource=: ;;
 	-uc)	signchanges=: ;;
 	-ap)	usepause="true";;
@@ -92,6 +94,9 @@ if test -n "$forcesigninterface" ; then
 else
   signinterface=$signcommand
 fi
+if test "$signinterface" = "debsign"; then
+	signsource=:
+fi
 
 mustsetvar () {
 	if [ "x$2" = x ]; then
@@ -124,6 +129,13 @@ signfile () {
 		(cat "../$1" ; echo "") | \
 		$signcommand --local-user "${signkey:-$maintainer}" --clearsign --armor \
 			--textmode  > "../$1.asc" 
+	elif test "$signinterface" = "debsign"; then
+		if test x$signkey != x; then
+			$signcommand -k"$signkey" ../$1
+		else
+			$signcommand ../$1
+		fi
+		return
 	else
 		$signcommand -u "${signkey:-$maintainer}" +clearsig=on -fast <"../$1" \
 			>"../$1.asc"

+ 1 - 1
scripts/update-alternatives.8

@@ -239,7 +239,7 @@ Specifies the administrative directory, when this is to be
 different from the default.
 .SS ACTIONS
 .TP
-\fB--install\fR \fIgen link path pri\fR [\fB--slave\fR \fIsgen slink spath\fR] ...
+\fB--install\fR \fIlink gen path pri\fR [\fB--slave\fR \fIslink sgen spath\fR] ...
 Add a group of alternatives to the system.
 .I gen
 is the generic name for the master link,