[SCM] bristol packaging branch, master, updated. debian/0.60.2-1-7-g09b2a65

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

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

    debian/patches/01-destdir.patch: Install the manpages properly.

diff --git a/debian/patches/01-destdir.patch b/debian/patches/01-destdir.patch
new file mode 100644
index 0000000..1ffda66
--- /dev/null
+++ b/debian/patches/01-destdir.patch
@@ -0,0 +1,23 @@
+Author: Alessio Treglia <quadrispro at ubuntu.com>
+Description: Install manpages into the correct destination path.
+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(-)
+
+--- bristol.orig/Makefile.am
++++ bristol/Makefile.am
+@@ -6,9 +6,9 @@ ACLOCAL_AMFLAGS=-I m4
+ bristoldir=${BRISTOL_DIR}
+ 
+ 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)
diff --git a/debian/patches/series b/debian/patches/series
index b1cfe26..aebdbc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# Empty
\ No newline at end of file
+01-destdir.patch

-- 
bristol packaging