[DRE-commits] r4161 - trunk/libhaml-ruby/debian

[Gunnar Wolf]

Author: gwolf
Date: 2009-09-18 22:57:04 +0000 (Fri, 18 Sep 2009)
New Revision: 4161

Added:
   trunk/libhaml-ruby/debian/README.source
Modified:
   trunk/libhaml-ruby/debian/changelog
   trunk/libhaml-ruby/debian/control
   trunk/libhaml-ruby/debian/haml-elisp.emacsen-install
Log:
Fixing minor annoyances (and a grave bug, yay!)

Added: trunk/libhaml-ruby/debian/README.source
===================================================================
--- trunk/libhaml-ruby/debian/README.source	                        (rev 0)
+++ trunk/libhaml-ruby/debian/README.source	2009-09-18 22:57:04 UTC (rev 4161)
@@ -0,0 +1,7 @@
+This package includes patches managed with the «quilt» patch
+management system. Changes to the upstream sources are stored as diffs
+in debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
+ -- Gunnar Wolf <gwolf at debian.org>, Fri, 18 Sep 2009 17:26:31 -0500

Modified: trunk/libhaml-ruby/debian/changelog
===================================================================
--- trunk/libhaml-ruby/debian/changelog	2009-09-18 22:16:02 UTC (rev 4160)
+++ trunk/libhaml-ruby/debian/changelog	2009-09-18 22:57:04 UTC (rev 4161)
@@ -1,8 +1,13 @@
 libhaml-ruby (2.2.5-1) unstable; urgency=low
 
   * New upstream release
+  * Standards-version → 3.8.3 (no changes)
+  * Added README.source, keeping lintian at ease
+  * Actually do the right thing to avoid being compiled with emacs21,
+    instead of just conflicting with the whole package. Thanks to Aaron
+    M. Ucko for pestering me in the right direction! (Closes: #536091)
 
- -- Gunnar Wolf <gwolf at debian.org>  Fri, 18 Sep 2009 17:15:07 -0500
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 18 Sep 2009 17:56:25 -0500
 
 libhaml-ruby (2.2.0-2) unstable; urgency=low
 

Modified: trunk/libhaml-ruby/debian/control
===================================================================
--- trunk/libhaml-ruby/debian/control	2009-09-18 22:16:02 UTC (rev 4160)
+++ trunk/libhaml-ruby/debian/control	2009-09-18 22:57:04 UTC (rev 4161)
@@ -6,7 +6,7 @@
  Ryan Niebur <ryanryan52 at gmail.com>
 Build-Depends: ruby-pkg-tools (>= 0.8), cdbs, debhelper (>= 7), libsetup-ruby1.8, graphviz, quilt
 Build-Depends-Indep: ruby1.8, rdoc
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://haml.hamptoncatlin.com/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libhaml-ruby/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libhaml-ruby/
@@ -66,7 +66,6 @@
 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

Modified: trunk/libhaml-ruby/debian/haml-elisp.emacsen-install
===================================================================
--- trunk/libhaml-ruby/debian/haml-elisp.emacsen-install	2009-09-18 22:16:02 UTC (rev 4160)
+++ trunk/libhaml-ruby/debian/haml-elisp.emacsen-install	2009-09-18 22:57:04 UTC (rev 4161)
@@ -4,6 +4,11 @@
 
 FLAVOR="$1"
 
+if [ "${FLAVOR}" = "emacs21" ];then
+    echo "Skipping byte-compilation for emacs21: Not supported"
+    exit 0;
+fi
+
 echo "install/haml-elisp: Handling install of emacsen flavor ${FLAVOR}"
 
 if [ "${FLAVOR}" != "emacs" ]; then