[sosi2osm] 01/01: Patch working

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository sosi2osm.

commit fa27ef0c465e2e953e416d588f73848ad056b616
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Mon Oct 13 22:24:21 2014 +0000

    Patch working
---
 debian/patches/02_fix_install.patch | 24 ++++++++++--------------
 debian/sosi2osm.install             |  2 --
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/debian/patches/02_fix_install.patch b/debian/patches/02_fix_install.patch
index 2c9016e..3ec0504 100644
--- a/debian/patches/02_fix_install.patch
+++ b/debian/patches/02_fix_install.patch
@@ -1,31 +1,27 @@
-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.
+Description: This patch fixes the DESTDIR target
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 --- sosi2osm-1.0.0.orig/Makefile
 +++ sosi2osm-1.0.0/Makefile
-@@ -13,14 +13,14 @@ $(PROGNAME): $(OBJFILES)
+@@ -13,14 +13,15 @@ $(PROGNAME): $(OBJFILES)
  	$(CXX) $^ $(LDFLAGS) -o $@
  
  install: sosi2osm
 -	install -m 0755 sosi2osm /usr/local/bin
 -	mkdir -p /usr/local/share/sosi2osm/lua
 -	install -m 0644 lua/*.lua /usr/local/share/sosi2osm/lua
-+	install -m 0755 sosi2osm $(DESTDIR)/bin
-+	mkdir -p $(DESTDIR)/share/sosi2osm/lua
-+	install -m 0644 lua/*.lua $(DESTDIR)/share/sosi2osm/lua
++	mkdir -p $(DESTDIR)/usr/bin
++	install -m 0755 sosi2osm $(DESTDIR)/usr/bin
++	mkdir -p $(DESTDIR)/usr/share/sosi2osm/lua
++	install -m 0644 lua/*.lua $(DESTDIR)/usr/share/sosi2osm/lua
  
  uninstall:
 -	rm /usr/local/share/sosi2osm/lua/*.lua
 -	rmdir /usr/local/share/sosi2osm/lua
 -	rmdir /usr/local/share/sosi2osm
 -	rm /usr/local/bin/sosi2osm
-+	rm $(DESTDIR)/share/sosi2osm/lua/*.lua
-+	rmdir $(DESTDIR)/share/sosi2osm/lua
-+	rmdir $(DESTDIR)/share/sosi2osm
-+	rm $(DESTDIR)/bin/sosi2osm
++	rm $(DESTDIR)/usr/share/sosi2osm/lua/*.lua
++	rmdir $(DESTDIR)/usr/share/sosi2osm/lua
++	rmdir $(DESTDIR)/usr/share/sosi2osm
++	rm $(DESTDIR)/usr/bin/sosi2osm
  
  .PHONY: install uninstall clean all
diff --git a/debian/sosi2osm.install b/debian/sosi2osm.install
deleted file mode 100644
index 753f6a7..0000000
--- a/debian/sosi2osm.install
+++ /dev/null
@@ -1,2 +0,0 @@
-sosi2osm usr/bin
-lua usr/share/sosi2osm

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sosi2osm.git