[SCM] bristol packaging branch, master, updated. debian/0.60.3-1-5-g4afde4e

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

The following commit has been merged in the master branch:
commit 4afde4e5e9334a014bee13876c94ef921ac4c9b7
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Thu May 27 15:31:56 2010 +0200

    debian/patches/01-destdir.patch: Removed, applied upstream.

diff --git a/debian/patches/01-destdir.patch b/debian/patches/01-destdir.patch
deleted file mode 100644
index c42f206..0000000
--- a/debian/patches/01-destdir.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Author: Alessio Treglia <quadrispro at ubuntu.com>
-Description:
- Compress manpages before installing them.
- 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 |    9 +++++----
- Makefile.in |    9 +++++----
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
---- bristol.orig/Makefile.am
-+++ bristol/Makefile.am
-@@ -6,9 +6,10 @@ 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/
-+	gzip -9fn $(DESTDIR)$(mandir)/man1/bristol.1
-+	cd $(DESTDIR)$(mandir)/man1 && ln -sf bristol.1.gz brighton.1.gz && ln -sf bristol.1.gz startBristol.1.gz
- 
- installdb:
- 	mkdir -p -m 755 $(DESTDIR)$(bristoldir)
-@@ -29,7 +30,7 @@ uninstall: uninstall-recursive uninstall
- 	rm -rf $(DESTDIR)$(bristoldir)/memory
- 	rm -rf $(DESTDIR)$(bristoldir)/bitmaps
- 	rm -rf  $(DESTDIR)$(bristoldir)
--	rm -rf $(mandir)/man1/bristol.1 $(mandir)/man1/brighton.1 $(mandir)/man1/startBristol.1
-+	rm -rf $(DESTDIR)$(mandir)/man1/bristol.1 $(DESTDIR)$(mandir)/man1/brighton.1 $(DESTDIR)$(mandir)/man1/startBristol.1
- 
- EXTRA_DIST=include bitmaps memory COPYING COPYING.GPL bristol.1
- 
---- bristol.orig/Makefile.in
-+++ bristol/Makefile.in
-@@ -653,9 +653,10 @@ 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/
-+	gzip -9fn $(DESTDIR)$(mandir)/man1/bristol.1
-+	cd $(DESTDIR)$(mandir)/man1 && ln -sf bristol.1.gz brighton.1.gz && ln -sf bristol.1.gz startBristol.1.gz
- 
- installdb:
- 	mkdir -p -m 755 $(DESTDIR)$(bristoldir)
-@@ -676,7 +677,7 @@ uninstall: uninstall-recursive uninstall
- 	rm -rf $(DESTDIR)$(bristoldir)/memory
- 	rm -rf $(DESTDIR)$(bristoldir)/bitmaps
- 	rm -rf  $(DESTDIR)$(bristoldir)
--	rm -rf $(mandir)/man1/bristol.1 $(mandir)/man1/brighton.1 $(mandir)/man1/startBristol.1
-+	rm -rf $(DESTDIR)$(mandir)/man1/bristol.1 $(DESTDIR)$(mandir)/man1/brighton.1 $(DESTDIR)$(mandir)/man1/startBristol.1
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/debian/patches/series b/debian/patches/series
index aebdbc4..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-01-destdir.patch

-- 
bristol packaging