[SCM] bristol packaging branch, master, updated. debian/0.60.2-1-9-g362cb22

[quadrispro-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 362cb22939276310b0224cc93929534fa7002369
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Sun May 16 19:51:48 2010 +0200

    Add Makefile.in to the makefile patch.

diff --git a/debian/patches/01-destdir.patch b/debian/patches/01-destdir.patch
index 1ffda66..432de37 100644
--- a/debian/patches/01-destdir.patch
+++ b/debian/patches/01-destdir.patch
@@ -4,7 +4,8 @@ Forwarded: yes
 Bug: https://sourceforge.net/tracker/?func=detail&atid=803734&aid=2996403&group_id=157415
 ---
  Makefile.am |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ Makefile.in |    6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
 
 --- bristol.orig/Makefile.am
 +++ bristol/Makefile.am
@@ -21,3 +22,18 @@ Bug: https://sourceforge.net/tracker/?func=detail&atid=803734&aid=2996403&group_
  
  installdb:
  	mkdir -p -m 755 $(DESTDIR)$(bristoldir)
+--- bristol.orig/Makefile.in
++++ bristol/Makefile.in
+@@ -653,9 +653,9 @@ uninstall-info: uninstall-info-recursive
+ 
+ 
+ install-man:
+-	$(INSTALL) -d $(mandir)/man1
+-	$(INSTALL) -m 644 $(srcdir)/bristol.1 $(mandir)/man1/
+-	cd $(mandir)/man1 && ln -sf bristol.1 brighton.1 && ln -sf bristol.1 startBristol.1
++	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
++	$(INSTALL) -m 644 $(srcdir)/bristol.1 $(DESTDIR)$(mandir)/man1/
++	cd $(DESTDIR)$(mandir)/man1 && ln -sf bristol.1 brighton.1 && ln -sf bristol.1 startBristol.1
+ 
+ installdb:
+ 	mkdir -p -m 755 $(DESTDIR)$(bristoldir)

-- 
bristol packaging