From effbe8f1280e30562b95e6430c230923cf8b258a Mon Sep 17 00:00:00 2001 From: Kai Tetzlaff Date: Wed, 21 Apr 2010 07:18:09 +0200 Subject: [PATCH] sync with upstream --- dvc/debian/changelog | 4 ++-- dvc/debian/control | 6 +++--- dvc/debian/source/format | 1 + dvc/lisp/dvc-build.el | 3 +++ 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 dvc/debian/source/format diff --git a/dvc/debian/changelog b/dvc/debian/changelog index 40a779a..7c80957 100644 --- a/dvc/debian/changelog +++ b/dvc/debian/changelog @@ -1,7 +1,7 @@ -dvc (0r20091206-1) unstable; urgency=low +dvc (0r20100420-1) unstable; urgency=low * New snapshot. * Add dvc.texinfo license to debian/copyright. * Julien Danjou is the sponsor for DVC (Closes: #496930). - -- Daniel Dehennin Sun, 06 Dec 2009 11:54:58 +0100 + -- Daniel Dehennin Tue, 20 Apr 2010 09:43:34 +0200 diff --git a/dvc/debian/control b/dvc/debian/control index a138681..78890d9 100644 --- a/dvc/debian/control +++ b/dvc/debian/control @@ -3,14 +3,14 @@ Section: devel Priority: optional Maintainer: Daniel Dehennin Build-Depends: cdbs (>= 0.4.50), debhelper (>= 7) -Build-Depends-Indep: autoconf, emacs22 | emacs21 | xemacs21 | emacsen, texinfo -Standards-Version: 3.8.3 +Build-Depends-Indep: autoconf, emacs23 | emacs22 | emacs21 | xemacs21 | emacs-snapshot, texinfo +Standards-Version: 3.8.4 Vcs-Bzr: http://bzr.xsteve.at/dvc/ Homepage: http://download.gna.org/dvc/ Package: dvc 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 Description: Emacs front-end to distributed version control systems DVC is an attempt to build a common infrastructure for various diff --git a/dvc/debian/source/format b/dvc/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/dvc/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/dvc/lisp/dvc-build.el b/dvc/lisp/dvc-build.el index f775d8b..bd04723 100644 --- a/dvc/lisp/dvc-build.el +++ b/dvc/lisp/dvc-build.el @@ -335,6 +335,9 @@ fixed in Emacs after 21.3." ;; Insert some preload forms into the autoload file. (with-temp-file --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")) (unless (save-excursion ;; The preload forms are not guaranteed to be at beginning