Hello, I have a few minor fixes in packages that are in unstable right now that while not release critical, I think would be helpful to have in the next release. I've attached patches below for ease of reviewing. automake 1:1.4-p6-11 -> 1:1.4-p6-12 This just removes the provides of automake, since we're moving away from supporting automake 1.4, and also adds a versioned conflict on automake, which allows automake1.4 and the new automake package be able to be installed at the same time, which would be good. Low risk. automake1.8 1.8.5+nogfdl-1 -> 1.8.5+nogfdl-2 Remove a doc-base file which removes an annoying warning at install time. Very low risk. opensc 0.11.1-2 -> 0.11.1-3 Biggest fix here is to put the mozilla-signer plugin in the right place. Also some documentation and path fix. Low risk. post-el 2004.07.23-3 -> 2004.07.23-5 Fixes to make it work with emacs22. I'm a heavy user of this so tested very well. Low risk. sqlfairy 0.07-4 -> 0.07-5 Small fix for some broken argument variables. Very low risk. And FYI there will probably be new security fix upstream releases for gnupg2 and iceweasel within the week. -- Eric Dorland <eric@kuroneko.ca> ICQ: #61138586, Jabber: hooty@jabber.com 1024D/16D970C6 097C 4861 9934 27A0 8E1C 2B0A 61E9 8ECF 16D9 70C6
Index: debian/control =================================================================== --- debian/control (.../1.4-p6-11) (revision 47609) +++ debian/control (.../1.4-p6-12) (revision 47609) @@ -2,15 +2,15 @@ Section: devel Priority: optional Maintainer: Eric Dorland <eric@debian.org> -Standards-Version: 3.7.2.0 +Standards-Version: 3.7.2.2 Build-Depends: debhelper (>> 4.0), Build-Depends-Indep: autotools-dev (>= 20010511.2), texinfo Package: automake1.4 Architecture: all Section: devel -Provides: automaken, automake, automake1.4-doc -Conflicts: automake, automake1.5, automake1.4-doc +Provides: automake1.4-doc +Conflicts: automake (<< 1:1.4-p6-3), automake1.5, automake1.4-doc Replaces: automake, automake1.4-doc Depends: autoconf, autotools-dev (>= 20010511.2) Description: A tool for generating GNU Standards-compliant Makefiles Index: debian/changelog =================================================================== --- debian/changelog (.../1.4-p6-11) (revision 47609) +++ debian/changelog (.../1.4-p6-12) (revision 47609) @@ -1,3 +1,14 @@ +automake (1:1.4-p6-12) unstable; urgency=high + + * Urgency high, I love doing things at the last minute. + * debian/control: + - Standards-Version to 3.7.2.2. + - Don't provide automake and automaken anymore, we are too old. + - Versioned conflict on automake, since we now have a new automake + package. + + -- Eric Dorland <eric@debian.org> Thu, 19 Oct 2006 00:35:56 -0400 + automake (1:1.4-p6-11) unstable; urgency=low * debian/copyright: Update FSF address.
Index: debian/automake1.8.doc-base =================================================================== --- debian/automake1.8.doc-base (.../1.8.5+nogfdl-1) (revision 47611) +++ debian/automake1.8.doc-base (.../1.8.5+nogfdl-2) (revision 47611) @@ -1,17 +0,0 @@ -Document: automake-1.8 -Title: automake-1.8 -Abstract: Automake is a tool for automatically generating `Makefile.in's from - files called `Makefile.am'. - . - The goal of Automake is to remove the burden of Makefile maintenance - from the back of the individual GNU maintainer (and put it on the back - of the Automake maintainer). - . - The `Makefile.am' is basically a series of `make' macro definitions - (with rules being thrown in occasionally). The generated - `Makefile.in's are compliant with the GNU Makefile standards. -Section: Apps/programming - -Format: info -Index: /usr/share/info/automake-1.8.info.gz -Files: /usr/share/info/automake-1.8.info* Index: debian/changelog =================================================================== --- debian/changelog (.../1.8.5+nogfdl-1) (revision 47611) +++ debian/changelog (.../1.8.5+nogfdl-2) (revision 47611) @@ -1,3 +1,10 @@ +automake1.8 (1.8.5+nogfdl-2) unstable; urgency=high + + * debian/automake1.8.doc-base: Forgot to remove. Thanks Daniel + Leidert. (Closes: #404097) + + -- Eric Dorland <eric@debian.org> Mon, 29 Jan 2007 02:08:46 -0500 + automake1.8 (1.8.5+nogfdl-1) unstable; urgency=low * New tarball with GFDL documentation stripped out because of Cover
Index: debian/control
===================================================================
--- debian/control (.../0.11.1-2) (revision 47611)
+++ debian/control (.../0.11.1-3) (revision 47611)
@@ -72,6 +72,7 @@
Section: web
Architecture: any
Depends: ${shlibs:Depends}
+Recommends: pinentry-gtk2 | pinentry-x11
Replaces: libopensc-openssl (<< 0.9.4-6)
Description: Mozilla plugin for authentication using OpenSC
A plugin for mozilla that allows S/MIME and SSL authentication using
Index: debian/changelog
===================================================================
--- debian/changelog (.../0.11.1-2) (revision 47611)
+++ debian/changelog (.../0.11.1-3) (revision 47611)
@@ -1,3 +1,17 @@
+opensc (0.11.1-3) unstable; urgency=high
+
+ * src/signer/dialog.c, debian/control: Fix path to pinentry and
+ recommend pinentry for mozilla-opensc. Thanks Antti S. Lankila for the
+ suggestion. (Closes: #392241)
+ * opensc.docs: Install new and improved html docs. (Closes: #399838)
+ * mozilla-opensc.links: Install links for iceweasel and iceape rather
+ than firefox and mozilla. Considering who I am I should have picked up
+ on this sooner. (Closes: #409946)
+ * etc/opensc.conf.in: Document that lock_login is actually true by
+ default. Thanks Antti-Juhani Kaijanaho. (Closes: #410024)
+
+ -- Eric Dorland <eric@debian.org> Sat, 10 Feb 2007 23:27:03 -0500
+
opensc (0.11.1-2) unstable; urgency=low
* debian/libopensc2.links: Link /usr/lib/opensc/opensc-pkcs11.so to
Index: debian/mozilla-opensc.links
===================================================================
--- debian/mozilla-opensc.links (.../0.11.1-2) (revision 47611)
+++ debian/mozilla-opensc.links (.../0.11.1-3) (revision 47611)
@@ -1,2 +1,2 @@
-usr/lib/opensc-signer.so usr/lib/firefox/plugins/opensc-signer.so
-usr/lib/opensc-signer.so usr/lib/mozilla/plugins/opensc-signer.so
+usr/lib/opensc-signer.so usr/lib/iceweasel/plugins/opensc-signer.so
+usr/lib/opensc-signer.so usr/lib/iceape/plugins/opensc-signer.so
Index: debian/opensc.docs
===================================================================
--- debian/opensc.docs (.../0.11.1-2) (revision 47611)
+++ debian/opensc.docs (.../0.11.1-3) (revision 47611)
@@ -1,2 +1,3 @@
-doc/html/tools.html
+doc/*.html
+doc/*.css
Index: src/signer/dialog.c
===================================================================
--- src/signer/dialog.c (.../0.11.1-2) (revision 47611)
+++ src/signer/dialog.c (.../0.11.1-3) (revision 47611)
@@ -3,7 +3,7 @@
#include <stdarg.h>
#ifndef PIN_ENTRY
-#define PIN_ENTRY "/usr/local/bin/gpinentry"
+#define PIN_ENTRY "/usr/bin/pinentry"
#endif
struct entry_parm_s {
Index: etc/opensc.conf.in
===================================================================
--- etc/opensc.conf.in (.../0.11.1-2) (revision 47611)
+++ etc/opensc.conf.in (.../0.11.1-3) (revision 47611)
@@ -319,7 +319,7 @@
# has done a C_Logout or C_Finalize. In the case of
# Netscape or Mozilla, this does not happen until
# you exit the browser.
- # Default: false
+ # Default: true
# lock_login = true;
# Normally, the pkcs11 module will not cache PINs
Index: debian/changelog
===================================================================
--- debian/changelog (.../2004.07.23-3) (revision 47611)
+++ debian/changelog (.../2004.07.23-5) (revision 47611)
@@ -1,3 +1,17 @@
+post-el (2004.07.23-5) unstable; urgency=low
+
+ * post.el: Add some missing characters to the post-url-pattern.
+
+ -- Eric Dorland <eric@debian.org> Thu, 8 Mar 2007 03:50:37 -0500
+
+post-el (2004.07.23-4) unstable; urgency=low
+
+ * post.el:
+ - Replace how-many with a wrapper for emacs >= 22. (Closes: #364525)
+ - Replace insert-string calls with insert for emacs >= 22.
+
+ -- Eric Dorland <eric@debian.org> Tue, 6 Mar 2007 03:59:54 -0500
+
post-el (2004.07.23-3) unstable; urgency=low
* debian/control:
Index: post.el
===================================================================
--- post.el (.../2004.07.23-3) (revision 47611)
+++ post.el (.../2004.07.23-5) (revision 47611)
@@ -446,7 +446,7 @@
:group 'post)
(defcustom post-url-pattern
- '("\\<\\(\\(https?\\|news\\|mailto\\|ftp\\|gopher\\):\\|\\(www\\|ftp\\)\\.\\)[-~A-Za-z0-9._/%$+?#:]+[A-Za-z0-9/#]" "<URL:[^ ]+>")
+ '("\\<\\(\\(https?\\|news\\|mailto\\|ftp\\|gopher\\):\\|\\(www\\|ftp\\)\\.\\)[-~A-Za-z0-9._/%$+?#:;&=]+[A-Za-z0-9/#&=]" "<URL:[^ ]+>")
"Pattern to detect URL addresses."
:type '(repeat regexp)
:group 'post)
@@ -765,8 +765,7 @@
(interactive "r")
(while (< start end)
(goto-char start)
- (insert "_")
- (insert (char-to-string 8))
+ (insert "_" (char-to-string 8))
(setq start (+ start 3))
(setq end (+ end 2))))
@@ -840,8 +839,7 @@
(nth r marks-st) (nth r marks-end))))
(kill-buffer (current-buffer)))
(goto-char (post-kill-signature))
- (insert-string "-- \n")
- (insert sig)
+ (insert "-- \n" sig)
(if (file-readable-p post-fixed-signature-source)
(insert-file-contents post-fixed-signature-source)
(insert "I really need a `post-fixed-signature-source'!\n")))))
@@ -877,8 +875,7 @@
(let ((sig (buffer-substring-no-properties sig-start sig-end)))
(switch-to-buffer post-select-signature-last-buffer)
(goto-char (post-kill-signature))
- (insert-string "-- \n")
- (insert sig))
+ (insert "-- \n" sig))
(if (file-readable-p post-fixed-signature-source)
(insert-file-contents post-fixed-signature-source))
(post-select-signature-quit)))
@@ -912,7 +909,7 @@
(setq sig-to-load (buffer-substring-no-properties sig-start (point)))
(switch-to-buffer post-select-signature-last-buffer)
(goto-char (post-kill-signature))
- (insert-string "-- \n")
+ (insert "-- \n")
(insert-file (concat post-signature-directory sig-to-load))
(message "Signature set to %s%s" post-signature-directory sig-to-load)
(post-select-signature-quit)))
@@ -1124,15 +1121,20 @@
"Check if attach appears in the body."
(post-goto-body)
- ;; Aargh it's annoying that how-many returns a string,
+ ;; Aargh it's annoying that how-many returns a string under emacs < 22,
;; "13 occurences" instead of a number, 13.
- (let ((total-attach (string-to-int (how-many post-attachment-regexp))))
+ (defun how-many-wrapper (regexp)
+ (let ((result (how-many regexp)))
+ (if (stringp result)
+ (string-to-int result)
+ result)))
+
+ (let ((total-attach (how-many-wrapper post-attachment-regexp)))
;; And this mess is just to catch the unlikely false alarm of
;; "attach" being in the signature, but not in the body.
(if (> total-attach 0)
(progn (post-goto-signature)
- (> total-attach (string-to-int (how-many
- post-attachment-regexp)))))))
+ (> total-attach (how-many-wrapper post-attachment-regexp))))))
(defun post-prompt-for-attachment ()
"Prompt for an attachment."
@@ -1185,7 +1187,7 @@
(when (re-search-forward (concat "^\\($\\|" field ": \\)"))
(if (looking-at "^$")
(progn
- (insert-string field ": \n")
+ (insert field ": \n")
(forward-char -1))
(header-position-on-value))))))
@@ -1218,8 +1220,8 @@
(widen)
(goto-char (point-min))
(search-forward-regexp "^$")
- (insert-string (concat "Attach: " (file-truename file) " "
- description "\n"))
+ (insert (concat "Attach: " (file-truename file) " "
+ description "\n"))
(message (concat "Attached '" file "'."))
(setq post-has-attachment t))))))
@@ -1327,7 +1329,7 @@
(cond ((post-find-header-line header)
(beginning-of-line)
(kill-line)
- (insert-string (concat header ": " value)))
+ (insert header ": " value))
(t
(header-append-value header value))))
(message "%s set to %s" header value))
@@ -1336,7 +1338,7 @@
"Add a HEADER and set it's VALUE (if header exists, will add multiple headers)."
(goto-char (point-min))
(search-forward-regexp "^$" nil t)
- (insert-string (concat header ": " value "\n")))
+ (insert header ": " value "\n"))
;;; Setup the mode map for the select-signature buffer.
(if post-select-signature-mode-map nil
Index: debian/changelog
===================================================================
--- debian/changelog (.../0.07-4) (revision 47611)
+++ debian/changelog (.../0.07-5) (revision 47611)
@@ -1,3 +1,10 @@
+sqlfairy (0.07-5) unstable; urgency=low
+
+ * bin/sqlt-graph: Patch from Didrik Pinte to fix some variable reference
+ typos. (Closes: #406488)
+
+ -- Eric Dorland <eric@debian.org> Thu, 18 Jan 2007 02:17:25 -0500
+
sqlfairy (0.07-4) unstable; urgency=low
* debian/control: Depend on libgd-gd2-noxpm-perl | libgd-gd2-perl
Index: bin/sqlt-graph
===================================================================
--- bin/sqlt-graph (.../0.07-4) (revision 47611)
+++ bin/sqlt-graph (.../0.07-5) (revision 47611)
@@ -116,9 +116,9 @@
'natural-join' => \$natural_join,
'natural-join-pk' => \$join_pk_only,
's|skip:s' => \$skip_fields,
- 'show-datatypes' => $show_datatypes,
- 'show-sizes' => $show_sizes,
- 'show-constraints' => $show_constraints,
+ 'show-datatypes' => \$show_datatypes,
+ 'show-sizes' => \$show_sizes,
+ 'show-constraints' => \$show_constraints,
'debug' => \$debug,
'h|help' => \$help,
) or die pod2usage;
Attachment:
signature.asc
Description: Digital signature