[SCM] bristol packaging branch, master, updated. debian/0.60.2-1-10-g373ce2e

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

The following commit has been merged in the master branch:
commit 373ce2ebb76a92ce72ec948c555d07f445fc1b43
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Sun May 16 20:20:00 2010 +0200

    Ready to go.

diff --git a/debian/bristol.install b/debian/bristol.install
index ea2f954..ef95514 100644
--- a/debian/bristol.install
+++ b/debian/bristol.install
@@ -1,3 +1,4 @@
 debian/bristol.xpm usr/share/pixmaps
 usr/lib/bristol
 usr/bin
+usr/share/man
diff --git a/debian/changelog b/debian/changelog
index 367a73f..03de9b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,11 @@ bristol (0.60.3-1) unstable; urgency=low
   * New upstream release, Closes: #580728 too.
   * Remove 01-spelling_errors.patch, applied upstream.
   * debian/patches/01-destdir.patch:
+    - Compress manpages before installing them.
     - Fix installation path of manpages.
   * Remove bristol.1 manpage, now provided by upstream.
 
- -- Alessio Treglia <quadrispro at ubuntu.com>  Sun, 16 May 2010 19:44:00 +0200
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Sun, 16 May 2010 20:19:42 +0200
 
 bristol (0.60.2-1) unstable; urgency=low
 
diff --git a/debian/patches/01-destdir.patch b/debian/patches/01-destdir.patch
index 432de37..c42f206 100644
--- a/debian/patches/01-destdir.patch
+++ b/debian/patches/01-destdir.patch
@@ -1,15 +1,17 @@
 Author: Alessio Treglia <quadrispro at ubuntu.com>
-Description: Install manpages into the correct destination path.
+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 |    6 +++---
- Makefile.in |    6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ Makefile.am |    9 +++++----
+ Makefile.in |    9 +++++----
+ 2 files changed, 10 insertions(+), 8 deletions(-)
 
 --- bristol.orig/Makefile.am
 +++ bristol/Makefile.am
-@@ -6,9 +6,9 @@ ACLOCAL_AMFLAGS=-I m4
+@@ -6,9 +6,10 @@ ACLOCAL_AMFLAGS=-I m4
  bristoldir=${BRISTOL_DIR}
  
  install-man:
@@ -18,13 +20,23 @@ Bug: https://sourceforge.net/tracker/?func=detail&atid=803734&aid=2996403&group_
 -	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
++	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,9 @@ uninstall-info: uninstall-info-recursive
+@@ -653,9 +653,10 @@ uninstall-info: uninstall-info-recursive
  
  
  install-man:
@@ -33,7 +45,17 @@ Bug: https://sourceforge.net/tracker/?func=detail&atid=803734&aid=2996403&group_
 -	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
++	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:

-- 
bristol packaging