dpkg-dev-el:

- Generalise automatic invocation to files named debian/package.changelog
  Thanks to Trent W. Buck for the report and patch.  (Closes: #457047)

2 files changed, 15 insertions, 8 deletions

diff --git a/debian-changelog-mode.el b/debian-changelog-mode.el
index a9c1474..39cf858 100644
--- a/debian-changelog-mode.el
+++ b/debian-changelog-mode.el
@@ -4,6 +4,7 @@
 ;; Copyright (C) 1997 Klee Dienes
 ;; Copyright (C) 1999 Chris Waters
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Peter S Galbraith
+;; Copyright (C) 2006, 2007, 2008, Peter S Galbraith
 ;;
 ;; This file is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -326,6 +327,9 @@
 ;;    See http://bugs.debian.org/87725
 ;;  - Patch from Luca Capello <luca@pca.it> to add keys to generate the
 ;;    open bug alist.
+;; V1.88 12Apr2008 Trent W. Buck <trentbuck@gmail.com>
+;;  - Generalize auto-mode-alist entry.
+;;    See http://bugs.debian.org/457047
 
 ;;; Acknowledgements:  (These people have contributed)
 ;;   Roland Rosenfeld <roland@debian.org>
@@ -1741,8 +1745,11 @@ Also set keymap."
 (add-to-list 'auto-mode-alist '("/debian/*NEWS" . debian-changelog-mode))
 (add-to-list 'auto-mode-alist '("NEWS.Debian" . debian-changelog-mode))
 (add-to-list 'auto-mode-alist '("NEWS.Debian.gz" . debian-changelog-mode))
-(add-to-list 'auto-mode-alist
-             '("/debian/changelog\\'" . debian-changelog-mode))
+
+;;(add-to-list 'auto-mode-alist '("/debian/changelog\\'" . debian-changelog-mode))
+;;; Instead use this.  See http://bugs.debian.org/457047 by Trent W. Buck
+(add-to-list 'auto-mode-alist '("/debian/\\([[:lower:][:digit:].+-]\\.\\)?changelog\\'" . debian-changelog-mode))
+
 (add-to-list 'auto-mode-alist '("changelog.Debian" . debian-changelog-mode))
 (add-to-list 'auto-mode-alist '("changelog.Debian.gz" . debian-changelog-mode))
   ;; For debchange
@@ -1751,7 +1758,7 @@ Also set keymap."
 ;;;###autoload(add-to-list 'auto-mode-alist '("/debian/*NEWS" . debian-changelog-mode))
 ;;;###autoload(add-to-list 'auto-mode-alist '("NEWS.Debian" . debian-changelog-mode))
 ;;;###autoload(add-to-list 'auto-mode-alist '("NEWS.Debian.gz" . debian-changelog-mode))
-;;;###autoload(add-to-list 'auto-mode-alist '("/debian/changelog\\'" . debian-changelog-mode))
+;;;###autoload(add-to-list 'auto-mode-alist '("/debian/\\([[:lower:][:digit:].+-]\\.\\)?changelog\\'" . debian-changelog-mode))
 ;;;###autoload(add-to-list 'auto-mode-alist '("changelog.Debian" . debian-changelog-mode))
 ;;;###autoload(add-to-list 'auto-mode-alist '("changelog.Debian.gz" . debian-changelog-mode))
 ;;;###autoload(add-to-list 'auto-mode-alist '("changelog.dch" . debian-changelog-mode))
diff --git a/dpkg-dev-el-loaddefs.el b/dpkg-dev-el-loaddefs.el
index d76566f..53ad195 100644
--- a/dpkg-dev-el-loaddefs.el
+++ b/dpkg-dev-el-loaddefs.el
@@ -5,7 +5,7 @@
 (provide 'dpkg-dev-el-loaddefs)
 
 ;;;### (autoloads (debian-bts-control) "debian-bts-control" "debian-bts-control.el"
-;;;;;;  (18106 18843))
+;;;;;;  (18134 51684))
 ;;; Generated autoloads from debian-bts-control.el
 
 (autoload (quote debian-bts-control) "debian-bts-control" "\
@@ -21,8 +21,8 @@ in `debian-bts-control-modes-to-reuse'." t nil)
 ;;;***
 
 ;;;### (autoloads (debian-changelog-mode debian-changelog-add-entry)
-;;;;;;  "debian-changelog-mode" "debian-changelog-mode.el" (18106
-;;;;;;  17482))
+;;;;;;  "debian-changelog-mode" "debian-changelog-mode.el" (18432
+;;;;;;  47753))
 ;;; Generated autoloads from debian-changelog-mode.el
 
 (autoload (quote debian-changelog-add-entry) "debian-changelog-mode" "\
@@ -47,7 +47,7 @@ interface to set it, or simply set the variable
 (add-to-list 'auto-mode-alist '("/debian/*NEWS" . debian-changelog-mode))
 (add-to-list 'auto-mode-alist '("NEWS.Debian" . debian-changelog-mode))
 (add-to-list 'auto-mode-alist '("NEWS.Debian.gz" . debian-changelog-mode))
-(add-to-list 'auto-mode-alist '("/debian/changelog\\'" . debian-changelog-mode))
+(add-to-list 'auto-mode-alist '("/debian/\\([[:lower:][:digit:].+-]\\.\\)?changelog\\'" . debian-changelog-mode))
 (add-to-list 'auto-mode-alist '("changelog.Debian" . debian-changelog-mode))
 (add-to-list 'auto-mode-alist '("changelog.Debian.gz" . debian-changelog-mode))
 (add-to-list 'auto-mode-alist '("changelog.dch" . debian-changelog-mode))
@@ -55,7 +55,7 @@ interface to set it, or simply set the variable
 ;;;***
 
 ;;;### (autoloads (debian-control-mode) "debian-control-mode" "debian-control-mode.el"
-;;;;;;  (17283 54734))
+;;;;;;  (18410 57270))
 ;;; Generated autoloads from debian-control-mode.el
 
 (autoload (quote debian-control-mode) "debian-control-mode" "\