[DRE-commits] r3871 - in packages/libhaml-ruby/trunk/debian: . patches

[Gunnar Wolf]

Author: gwolf
Date: 2009-08-04 21:37:46 +0000 (Tue, 04 Aug 2009)
New Revision: 3871

Added:
   packages/libhaml-ruby/trunk/debian/patches/fix-emacs-mode
Modified:
   packages/libhaml-ruby/trunk/debian/changelog
   packages/libhaml-ruby/trunk/debian/control
   packages/libhaml-ruby/trunk/debian/patches/series
Log:
Fixed RC bug! Preparing upload

Modified: packages/libhaml-ruby/trunk/debian/changelog
===================================================================
--- packages/libhaml-ruby/trunk/debian/changelog	2009-07-31 19:09:24 UTC (rev 3870)
+++ packages/libhaml-ruby/trunk/debian/changelog	2009-08-04 21:37:46 UTC (rev 3871)
@@ -1,10 +1,18 @@
 libhaml-ruby (2.2.0-2) unstable; urgency=low
 
+  [ Ryan Niebur ]
   * Add myself to Uploaders
   * install VERSION_NAME, fixing the errors during load
 
- -- Ryan Niebur <ryanryan52 at gmail.com>  Sun, 19 Jul 2009 15:27:01 -0700
+  [ Gunnar Wolf ]
+  * Patched haml-mode.el to avoid compile-time (and thus, install-time)
+    error. Had to also declare Conflicts: on emacs21 (which is going
+    away soon anyway) as author will explicitly not support it. (Closes:
+    #536091)
+  * Thanks to Axel Beckert for his help with elisp!
 
+ -- Gunnar Wolf <gwolf at debian.org>  Tue, 04 Aug 2009 16:19:07 -0500
+
 libhaml-ruby (2.2.0-1) unstable; urgency=low
 
   [ Ryan Niebur ]

Modified: packages/libhaml-ruby/trunk/debian/control
===================================================================
--- packages/libhaml-ruby/trunk/debian/control	2009-07-31 19:09:24 UTC (rev 3870)
+++ packages/libhaml-ruby/trunk/debian/control	2009-08-04 21:37:46 UTC (rev 3871)
@@ -66,6 +66,7 @@
 Section: editors
 Architecture: all
 Depends: ${misc:Depends}, emacs | emacsen
+Conflicts: emacs21
 Recommends: libhaml-ruby
 Description: Haml (and Sass) modes for Emacsen
  This package provides the emacs-lisp for syntax-highlighting Haml and

Added: packages/libhaml-ruby/trunk/debian/patches/fix-emacs-mode
===================================================================
--- packages/libhaml-ruby/trunk/debian/patches/fix-emacs-mode	                        (rev 0)
+++ packages/libhaml-ruby/trunk/debian/patches/fix-emacs-mode	2009-08-04 21:37:46 UTC (rev 3871)
@@ -0,0 +1,13 @@
+Index: libhaml-ruby-2.2.0/extra/haml-mode.el
+===================================================================
+--- libhaml-ruby-2.2.0.orig/extra/haml-mode.el	2009-08-04 16:16:52.000000000 -0500
++++ libhaml-ruby-2.2.0/extra/haml-mode.el	2009-08-04 16:17:16.000000000 -0500
+@@ -486,7 +486,7 @@
+   (save-excursion
+     (while t
+       (beginning-of-line)
+-      (if (looking-at (eval-when-compile (concat haml-tag-beg-re "\\([{(]\\)")))
++      (if (looking-at (concat haml-tag-beg-re "\\([{(]\\)"))
+           (progn
+             (goto-char (- (match-end 0) 1))
+             (haml-limited-forward-sexp (save-excursion (end-of-line) (point)))

Modified: packages/libhaml-ruby/trunk/debian/patches/series
===================================================================
--- packages/libhaml-ruby/trunk/debian/patches/series	2009-07-31 19:09:24 UTC (rev 3870)
+++ packages/libhaml-ruby/trunk/debian/patches/series	2009-08-04 21:37:46 UTC (rev 3871)
@@ -1,2 +1,3 @@
+fix-emacs-mode
 fix-hardcoded-gem-paths
 get-version-from-right-path