sync with upstream

This commit is contained in:
Kai Tetzlaff 2010-04-21 07:18:09 +02:00
parent dcbdc55089
commit effbe8f128
4 changed files with 9 additions and 5 deletions

View File

@ -1,7 +1,7 @@
dvc (0r20091206-1) unstable; urgency=low dvc (0r20100420-1) unstable; urgency=low
* New snapshot. * New snapshot.
* Add dvc.texinfo license to debian/copyright. * Add dvc.texinfo license to debian/copyright.
* Julien Danjou is the sponsor for DVC (Closes: #496930). * Julien Danjou is the sponsor for DVC (Closes: #496930).
-- Daniel Dehennin <daniel.dehennin@baby-gnu.org> Sun, 06 Dec 2009 11:54:58 +0100 -- Daniel Dehennin <daniel.dehennin@baby-gnu.org> Tue, 20 Apr 2010 09:43:34 +0200

View File

@ -3,14 +3,14 @@ Section: devel
Priority: optional Priority: optional
Maintainer: Daniel Dehennin <daniel.dehennin@baby-gnu.org> Maintainer: Daniel Dehennin <daniel.dehennin@baby-gnu.org>
Build-Depends: cdbs (>= 0.4.50), debhelper (>= 7) Build-Depends: cdbs (>= 0.4.50), debhelper (>= 7)
Build-Depends-Indep: autoconf, emacs22 | emacs21 | xemacs21 | emacsen, texinfo Build-Depends-Indep: autoconf, emacs23 | emacs22 | emacs21 | xemacs21 | emacs-snapshot, texinfo
Standards-Version: 3.8.3 Standards-Version: 3.8.4
Vcs-Bzr: http://bzr.xsteve.at/dvc/ Vcs-Bzr: http://bzr.xsteve.at/dvc/
Homepage: http://download.gna.org/dvc/ Homepage: http://download.gna.org/dvc/
Package: dvc Package: dvc
Architecture: all Architecture: all
Depends: emacs22 | emacs21 | xemacs21 | emacs-snapshot, dpkg (>= 1.15.4) | install-info, ${misc:Depends} Depends: emacs23 | emacs22 | emacs21 | xemacs21 | emacs-snapshot, dpkg (>= 1.15.4) | install-info, ${misc:Depends}
Recommends: tla | bazaar | bzr | git | mercurial | darcs | monotone Recommends: tla | bazaar | bzr | git | mercurial | darcs | monotone
Description: Emacs front-end to distributed version control systems Description: Emacs front-end to distributed version control systems
DVC is an attempt to build a common infrastructure for various DVC is an attempt to build a common infrastructure for various

1
dvc/debian/source/format Normal file
View File

@ -0,0 +1 @@
3.0 (quilt)

View File

@ -335,6 +335,9 @@ fixed in Emacs after 21.3."
;; Insert some preload forms into the autoload file. ;; Insert some preload forms into the autoload file.
(with-temp-file --autoloads-filename (with-temp-file --autoloads-filename
(insert-file-contents --autoloads-filename) (insert-file-contents --autoloads-filename)
;; Prevent "changed on disk query"
(if (not (null (find-buffer-visiting --autoloads-filename)))
(kill-buffer (find-buffer-visiting --autoloads-filename)))
(let ((blurb ";;; DVC PRELOAD\n")) (let ((blurb ";;; DVC PRELOAD\n"))
(unless (save-excursion (unless (save-excursion
;; The preload forms are not guaranteed to be at beginning ;; The preload forms are not guaranteed to be at beginning