> we want to see, which is a *source* debdiff of the *built* packages
> (i.e. debdiff the .changes).
Mea Culpa.
Here 'tis.
$ debdiff vala-mode-el_0.1-{1,2}.dsc > vala-mode-el_0.1-1_vs_0.1-2.debdiff
diff -Nru vala-mode-el-0.1/debian/changelog vala-mode-el-0.1/debian/changelog
--- vala-mode-el-0.1/debian/changelog 2014-12-17 14:23:30.000000000 +0000
+++ vala-mode-el-0.1/debian/changelog 2014-12-17 12:42:26.000000000 +0000
@@ -1,3 +1,14 @@
+vala-mode-el (0.1-2) unstable; urgency=medium
+
+ * Patch away `(lambda ... ,foo ...) ickiness (closes: #702714)
+ * Source option single-debian-patch for in-tree rather than quilt patch
+ * Bump debian standards version (no changes required)
+ * Update upstream location
+ * Fix grammar in comment in source code
+ * Add support to use C# semantics when ECB and CEDIT are both installed
+
+ -- Barak A. Pearlmutter <b...@debian.org> Wed, 05 Nov 2014 11:07:16 +0000
+
vala-mode-el (0.1-1) unstable; urgency=low
* Initial release
diff -Nru vala-mode-el-0.1/debian/control vala-mode-el-0.1/debian/control
--- vala-mode-el-0.1/debian/control 2014-12-17 14:23:30.000000000 +0000
+++ vala-mode-el-0.1/debian/control 2014-12-17 12:42:26.000000000 +0000
@@ -3,10 +3,10 @@
Priority: extra
Maintainer: Barak A. Pearlmutter <b...@debian.org>
Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.4
-Homepage: https://live.gnome.org/Vala/Emacs
-Vcs-Git: git://git.debian.org/collab-maint/vala-mode-el.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/vala-mode-el.git;a=summary
+Standards-Version: 3.9.6
+Homepage: https://wiki.gnome.org/Projects/Vala/Emacs
+Vcs-Git: git://anonscm.debian.org/collab-maint/vala-mode-el.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/vala-mode-el.git
Package: vala-mode-el
Architecture: all
diff -Nru vala-mode-el-0.1/debian/copyright vala-mode-el-0.1/debian/copyright
--- vala-mode-el-0.1/debian/copyright 2014-12-17 14:23:30.000000000 +0000
+++ vala-mode-el-0.1/debian/copyright 2014-12-17 12:42:26.000000000 +0000
@@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: vala-mode
-Source: <https://live.gnome.org/Vala/Emacs?action=AttachFile&do=view&target=vala-mode.el>
+Source: <https://wiki.gnome.org/Projects/Vala/Emacs?action=AttachFile&do=get&target=vala-mode.el>
Files: *
Copyright: 2005 Dylan R. E. Moonfire
diff -Nru vala-mode-el-0.1/debian/emacsen-compat vala-mode-el-0.1/debian/emacsen-compat
--- vala-mode-el-0.1/debian/emacsen-compat 1970-01-01 01:00:00.000000000 +0100
+++ vala-mode-el-0.1/debian/emacsen-compat 2014-12-17 12:42:26.000000000 +0000
@@ -0,0 +1 @@
+0
diff -Nru vala-mode-el-0.1/debian/emacsen-startup vala-mode-el-0.1/debian/emacsen-startup
--- vala-mode-el-0.1/debian/emacsen-startup 2014-12-17 14:23:30.000000000 +0000
+++ vala-mode-el-0.1/debian/emacsen-startup 2014-12-17 12:42:26.000000000 +0000
@@ -4,7 +4,7 @@
(let ((package-dir (concat "/usr/share/"
(symbol-name debian-emacs-flavor)
"/site-lisp/vala-mode-el")))
- ;; If package-dir does not exist, this package must have
+ ;; If package-dir does not exist, this package must have been
;; removed but not purged, and we should skip the setup.
(when (file-directory-p package-dir)
@@ -16,9 +16,15 @@
(t
(setq load-path (cons package-dir load-path))))
- ;; Installation snippet per https://live.gnome.org/Vala/Emacs
+ ;; Installation snippets per https://wiki.gnome.org/Projects/Vala/Emacs
+ ;; Direct support for Vala source code:
(autoload 'vala-mode "vala-mode" "Major mode for editing Vala code." t)
(add-to-list 'auto-mode-alist '("\\.vala$" . vala-mode))
(add-to-list 'auto-mode-alist '("\\.vapi$" . vala-mode))
(add-to-list 'file-coding-system-alist '("\\.vala$" . utf-8))
- (add-to-list 'file-coding-system-alist '("\\.vapi$" . utf-8))))
+ (add-to-list 'file-coding-system-alist '("\\.vapi$" . utf-8))
+
+ ;; Use C# semantics when ECB and CEDET are both installed:
+ (when (and (file-exists-p "/usr/share/emacs/site-lisp/ecb/ecb.el")
+ (fboundp 'wisent-csharp-default-setup))
+ (add-hook 'vala-mode-hook #'wisent-csharp-default-setup))))
diff -Nru vala-mode-el-0.1/debian/patches/debian-changes vala-mode-el-0.1/debian/patches/debian-changes
--- vala-mode-el-0.1/debian/patches/debian-changes 1970-01-01 01:00:00.000000000 +0100
+++ vala-mode-el-0.1/debian/patches/debian-changes 2014-12-17 14:23:05.000000000 +0000
@@ -0,0 +1,105 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vala-mode-el (0.1-2) unstable; urgency=medium
+ .
+ * Patch away `(lambda ... ,foo ...) ickiness (closes: #702714)
+ * Source option single-debian-patch for in-tree rather than quilt patch
+ * Bump debian standards version (no changes required)
+ * Update upstream location
+ * Fix grammar in comment in source code
+ * Add support to use C# semantics when ECB and CEDIT are both installed
+Author: Barak A. Pearlmutter <b...@debian.org>
+Bug-Debian: https://bugs.debian.org/702714
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- vala-mode-el-0.1.orig/vala-mode.el
++++ vala-mode-el-0.1/vala-mode.el
+@@ -1,4 +1,4 @@
+-;;; vala-mode.el --- Vala mode derived mode
++;;; vala-mode.el --- Vala mode derived mode -*- lexical-binding: t -*-
+
+ ;; Author: 2005 Dylan R. E. Moonfire
+ ;; 2008 Étienne BERSAC
+@@ -46,6 +46,8 @@
+ ;; 0.1 : Initial version based on csharp-mode
+ ;;
+
++(require 'cl)
++
+ ;; This is a copy of the function in cc-mode which is used to handle
+ ;; the eval-when-compile which is needed during other times.
+ (defun c-filter-ops (ops opgroup-filter op-filter &optional xlate)
+@@ -55,13 +57,15 @@
+ (cond ((eq opgroup-filter t)
+ (setq opgroup-filter (lambda (opgroup) t)))
+ ((not (functionp opgroup-filter))
+- (setq opgroup-filter `(lambda (opgroup)
+- (memq opgroup ',opgroup-filter)))))
++ (let ((opgroup-filter-orig opgroup-filter))
++ (setq opgroup-filter (lambda (opgroup)
++ (memq opgroup opgroup-filter-orig))))))
+ (cond ((eq op-filter t)
+ (setq op-filter (lambda (op) t)))
+ ((stringp op-filter)
+- (setq op-filter `(lambda (op)
+- (string-match ,op-filter op)))))
++ (let ((op-filter-orig op-filter))
++ (setq op-filter (lambda (op)
++ (string-match op-filter-orig op))))))
+ (unless xlate
+ (setq xlate 'identity))
+ (c-with-syntax-table (c-lang-const c-mode-syntax-table)
+@@ -149,22 +153,20 @@
+ ;; Fontify leading identifiers in fully
+ ;; qualified names like "Foo.Bar".
+ ,@(when (c-lang-const c-opt-identifier-concat-key)
+- `((,(byte-compile
+- `(lambda (limit)
+- (while (re-search-forward
+- ,(concat "\\(\\<" ; 1
+- "\\(" (c-lang-const c-symbol-key)
+- "\\)" ; 2
+- "[ \t\n\r\f\v]*"
+- (c-lang-const
+- c-opt-identifier-concat-key)
+- "[ \t\n\r\f\v]*"
+- "\\)"
+- "\\("
+- (c-lang-const
+- c-opt-after-id-concat-key)
+- "\\)")
+- limit t)
++ (let ((regexp (concat "\\(\\<" ; 1
++ "\\(" (c-lang-const c-symbol-key)
++ "\\)" ; 2
++ "[ \t\n\r\f\v]*"
++ (c-lang-const
++ c-opt-identifier-concat-key)
++ "[ \t\n\r\f\v]*"
++ "\\)"
++ "\\("
++ (c-lang-const
++ c-opt-after-id-concat-key)
++ "\\)")))
++ `((,(lambda (limit)
++ (while (re-search-forward regexp limit t)
+ (unless (progn
+ (goto-char (match-beginning 0))
+ (c-skip-comments-and-strings limit))
diff -Nru vala-mode-el-0.1/debian/patches/series vala-mode-el-0.1/debian/patches/series
--- vala-mode-el-0.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ vala-mode-el-0.1/debian/patches/series 2014-12-17 14:23:05.000000000 +0000
@@ -0,0 +1 @@
+debian-changes
diff -Nru vala-mode-el-0.1/debian/README.source vala-mode-el-0.1/debian/README.source
--- vala-mode-el-0.1/debian/README.source 2014-12-17 14:23:30.000000000 +0000
+++ vala-mode-el-0.1/debian/README.source 2014-12-17 12:42:26.000000000 +0000
@@ -1,8 +1,8 @@
vala-mode-el for Debian
---------------------------
-The version number is in a comment in the sole upstream file.
-Said file is an attachment to https://live.gnome.org/Vala/Emacs
+The version number is in a comment in the sole upstream file. Said
+file is an attachment to https://wiki.gnome.org/Projects/Vala/Emacs
and as such, I am repackaging it into a tar file manually.
- -- Barak A. Pearlmutter <b...@debian.org>, Wed, 26 Sep 2012 21:49:10 +0100
+ -- Barak A. Pearlmutter <b...@debian.org>, Wed, 5 Nov 2014 10:45:06 +0000
