tags 469652 + patch
thanks

On 2008-03-06 12:26 +0100, Sven Joachim wrote:

> Package: vm-bonus-el
> Version: 29.0-1
> Severity: normal
>
> Please don't install vm-rfaddons.el any more, since a newer version of
> that file is part of vm in version 8.x, and your file might shadow it.
>
> If you remove that file, you should probably depend on vm (>= 8.0.9-1)
> to ensure that no functionality is lost.

I have created a patch which seems to work.  Apparently the removal of
vm-rfaddons.el also fixes the postinst failure reported in #469625.

It would probably be cleaner to remove vm-rfaddons from the source
package entirely, but I left that up to you (it is trivial anyway).
Here comes the patch:


--8<---------------cut here---------------start------------->8---
diff -ru emacs-goodies-el-29.0.old/debian/changelog 
emacs-goodies-el-29.0/debian/changelog
--- emacs-goodies-el-29.0.old/debian/changelog  2008-03-07 08:00:07.000000000 
+0100
+++ emacs-goodies-el-29.0/debian/changelog      2008-03-07 08:01:27.000000000 
+0100
@@ -1,3 +1,10 @@
+emacs-goodies-el (29.0-1sven1) unstable; urgency=low
+
+  * vm-bonus-el:
+    - Don't include vm-rfaddons.el and depend on vm versions
+      that ship that file (Closes: #469652). 
+ -- Sven Joachim <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 07:54:32 +0100
+
 emacs-goodies-el (29.0-1) unstable; urgency=low
 
   [ Cyril Brulebois ]
diff -ru emacs-goodies-el-29.0.old/debian/control 
emacs-goodies-el-29.0/debian/control
--- emacs-goodies-el-29.0.old/debian/control    2008-03-07 08:00:07.000000000 
+0100
+++ emacs-goodies-el-29.0/debian/control        2008-03-07 08:01:27.000000000 
+0100
@@ -182,7 +182,7 @@
 
 Package: vm-bonus-el
 Architecture: all
-Depends: vm
+Depends: vm (>= 8.0.9-1)
 Section: mail
 Description: Miscellaneous add-ons for VM
  This package contains a few Emacs-Lisp files that provide various
@@ -190,7 +190,6 @@
  .
  This package contains:
   u-vm-color.el - font-lock support for VM;
-  vm-rfaddons.el - a collections of various useful VM helper functions.
  .
  See /usr/share/doc/vm-bonus-el/README.Debian for a short description
  of all files.
diff -ru emacs-goodies-el-29.0.old/debian/vm-bonus-el.README.Debian 
emacs-goodies-el-29.0/debian/vm-bonus-el.README.Debian
--- emacs-goodies-el-29.0.old/debian/vm-bonus-el.README.Debian  2008-03-07 
08:00:07.000000000 +0100
+++ emacs-goodies-el-29.0/debian/vm-bonus-el.README.Debian      2008-03-07 
08:01:27.000000000 +0100
@@ -10,50 +10,6 @@
 Introduction to files in vm-bonus-el
 ------------------------------------
 
-vm-rfaddons.el
---------------
-
-vm-rfaddons.el is a collections of various useful VM helper functions.
-Enable them all by adding `(vm-rfaddons-infect-vm)' at the end of your .vm
-file.
-
-Author Commentary:
-
- Some of the functions should be unbundled into separate packages,
- but well I'm a lazy guy.  And some of them are not tested well. 
-
- In order to install this package you need to byte-compile it and put
- it into your load-path and add the following lines to the _end_ of your
- .vm file.  It should be the _end_ in order to ensure that variable you had
- been setting are honored!
-
-      (vm-rfaddons-infect-vm)
-
- When using only a subset of the functions you should have a
- look at the documentation of `vm-rfaddons-infect-vm' and modify
- its call as desired.  
- 
- Additional packages you may need are:
-
- * Package: Personality Crisis for VM
-   is a really cool package if you want to do automatic header rewriting,
-   e.g.  if you have various mail accounts and always want to use the right
-   from header, then check it out! 
-   It used to be on http://student.uq.edu.au/~s323140/pcrisis/
-   but it is no longer available there and thus I provide it on my site.
- * Package: BBDB
-   Homepage: http://bbdb.sourceforge.net
-
- All other packages should be included within standard (X)Emacs
- distributions.
-
- Feel free to sent me any comments or bug reports.
-
- As I am no active GNU Emacs user, I would be thankful for any patches to
- make things work with GNU Emacs!
-
-----------------------------------------------------------------------------
-
 u-vm-color.el 
 -------------
 
@@ -107,4 +63,4 @@
  XEmacs users might want to turn off `vm-use-lucid-highlighting', if
  this package works...
 
- -- Peter S Galbraith <[EMAIL PROTECTED]>, Mon Oct 24 21:06:25 2005
+ -- Sven Joachim <[EMAIL PROTECTED]>, Thu,  6 Mar 2008 21:55:24 +0100
diff -ru emacs-goodies-el-29.0.old/debian/vm-bonus-el.copyright 
emacs-goodies-el-29.0/debian/vm-bonus-el.copyright
--- emacs-goodies-el-29.0.old/debian/vm-bonus-el.copyright      2008-03-07 
08:00:07.000000000 +0100
+++ emacs-goodies-el-29.0/debian/vm-bonus-el.copyright  2008-03-07 
08:01:27.000000000 +0100
@@ -7,25 +7,6 @@
 Copyright info for files in vm-bonus-el
 -----------------------------------------
 
-Author/copyright info for vm-rfaddons.el
-,----
-| ;;; vm-rfaddons.el --- a collections of various useful VM helper functions
-| ;; 
-| ;; Copyright (C) 1999-2004 Robert Widhopf-Fenk
-| ;;
-| ;; Author:      Robert Widhopf-Fenk
-| ;; Status:      Tested with XEmacs 21.4.15 & VM 7.18
-| ;; Keywords:    VM helpers
-| ;; X-URL:       http://www.robf.de/Hacking/elisp
-| ;; Version:     $Id: vm-bonus-el.copyright,v 1.3 2005/10/22 15:14:38 
u11-guest Exp $
-| 
-| ;;
-| ;; This code is free software; you can redistribute it and/or modify
-| ;; it under the terms of the GNU General Public License as published by
-| ;; the Free Software Foundation; either version 1, or (at your option)
-| ;; any later version.
-`----
-
 Author/copyright info for u-vm-color.el
 ,----
 | ;;; u-vm-color.el --- Font-lock support for VM.
diff -ru emacs-goodies-el-29.0.old/debian/vm-bonus-el.emacsen-startup 
emacs-goodies-el-29.0/debian/vm-bonus-el.emacsen-startup
--- emacs-goodies-el-29.0.old/debian/vm-bonus-el.emacsen-startup        
2008-03-07 08:00:07.000000000 +0100
+++ emacs-goodies-el-29.0/debian/vm-bonus-el.emacsen-startup    2008-03-07 
08:01:27.000000000 +0100
@@ -7,7 +7,7 @@
   (message "Package vm-bonus-el removed but not purged.  Skipping setup."))
  ((not (file-exists-p (concat "/usr/share/"
                               (symbol-name debian-emacs-flavor)
-                              "/site-lisp/vm-bonus-el/vm-rfaddons.elc")))
+                              "/site-lisp/vm-bonus-el/u-vm-color.elc")))
   (message "Package vm-bonus-el not fully installed.  Skipping setup."))
  (t
   (debian-pkg-add-load-path-item
@@ -15,22 +15,10 @@
            (symbol-name debian-emacs-flavor)
            "/site-lisp/vm-bonus-el"))
 
-  ;; autoloads for vm-rfaddons.el
-  (autoload 'vm-rfaddons-infect-vm "vm-rfaddons"
-    "setup the key bindings, advices and hooks to use all of vm-rfaddons.el
-Much more information is available when loaded."
-    t)
-
   (defgroup vm-bonus-el nil
     "Customize vm-bonus-el Debian packages."
     :group 'vm)
 
-  (defgroup vm-rfaddons nil
-    "Customize vm-rfaddons.el"
-    :group 'vm
-    :group 'vm-bonus-el
-    :load 'vm-rfaddons)
-
   ;; u-vm-color.el
   (defgroup u-vm-color nil
     "Font-lock support for vm."
diff -ru emacs-goodies-el-29.0.old/debian/vm-bonus-el.install 
emacs-goodies-el-29.0/debian/vm-bonus-el.install
--- emacs-goodies-el-29.0.old/debian/vm-bonus-el.install        2008-03-07 
08:00:07.000000000 +0100
+++ emacs-goodies-el-29.0/debian/vm-bonus-el.install    2008-03-07 
08:01:27.000000000 +0100
@@ -1,2 +1 @@
-elisp/vm-bonus-el/vm-rfaddons.el /usr/share/emacs/site-lisp/vm-bonus-el/
 elisp/vm-bonus-el/u-vm-color.el /usr/share/emacs/site-lisp/vm-bonus-el/
--8<---------------cut here---------------end--------------->8---


Regards,
        Sven



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to