[mona] 12/13: drop the patch for mona-mode.el, just remove the file before dh_install

[Ralf Treinen]

This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch master
in repository mona.

commit 090dbce95b6b521f58e62c7a3fb9cd98ea759290
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon Aug 18 11:50:52 2014 +0200

    drop the patch for mona-mode.el, just remove the file before dh_install
---
 debian/changelog                       |  7 ++++---
 debian/patches/install-skip-emacs-mode | 30 ------------------------------
 debian/patches/series                  |  1 -
 debian/rules                           |  1 +
 4 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ac095e..b049da6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,10 @@ mona (1.4-15-1) unstable; urgency=medium
   * dh compatibility level 9
   * standards-version 3.9.5 (no change)
   * rewrite the package build system:
-    - use the standard dh file for debian/rules
-    - patch install-skip-emacs-mode: drop installation of mona-mode.el from
-      upstream makefile since it tries to install it at the wrong location.
+    - start with the standard dh file for debian/rules
+    - override dh_install to remove:
+       - mona-mode.el which upstream's makefile installs in the wrong dir
+       - usr/lib/*/*.la which we don't need
     - install mona-mode.el via debian/mona.install
   * we don't use chrpath any more, so we drop it from the build-dependencies
 
diff --git a/debian/patches/install-skip-emacs-mode b/debian/patches/install-skip-emacs-mode
deleted file mode 100644
index bdd6d1d..0000000
--- a/debian/patches/install-skip-emacs-mode
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Ralf Treinen <treinen at debian.org>
-Description: drop installation of mona-mode.el in makefile, since it tries to
-  install at the wrong location
-
-Index: mona/makefile.am
-===================================================================
---- mona.orig/makefile.am	2014-08-18 11:21:22.162905364 +0200
-+++ mona/makefile.am	2014-08-18 11:21:22.158905364 +0200
-@@ -4,7 +4,7 @@
- 	  config.h.in config.log config.status config/missing configure.lineno \
- 	  m4
- man_MANS = mona.1
--dist_data_DATA = mona-mode.el
-+dist_data_DATA =
- monadir = $(includedir)/mona
- mona_HEADERS = config.h
- ACLOCAL_AMFLAGS = -I m4
-Index: mona/makefile.in
-===================================================================
---- mona.orig/makefile.in	2014-08-18 11:21:22.162905364 +0200
-+++ mona/makefile.in	2014-08-18 11:21:22.158905364 +0200
-@@ -295,7 +295,7 @@
- 	  m4
- 
- man_MANS = mona.1
--dist_data_DATA = mona-mode.el
-+dist_data_DATA =
- monadir = $(includedir)/mona
- mona_HEADERS = config.h
- ACLOCAL_AMFLAGS = -I m4
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f5c6534..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-install-skip-emacs-mode
diff --git a/debian/rules b/debian/rules
index e3f23b3..7117822 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,4 +5,5 @@
 
 override_dh_install:
 	-rm debian/mona/usr/lib/*/*.la
+	-rm debian/mona/usr/share/mona-mode.el
 	dh_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mona.git