[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libxpm: Changes to 'debian-unstable'



 debian/changelog       |    9 +++++++++
 debian/control         |    3 ++-
 debian/libxpm-dev.docs |    1 +
 debian/rules           |    4 ++++
 4 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 43ffd61a74df7ec2409daa655098b9acba30c92f
Author: Cyril Brulebois <kibi@debian.org>
Date:   Sat Jan 15 00:44:50 2011 +0100

    Add ghostscript build-dep, for ps2pdf.

diff --git a/debian/changelog b/debian/changelog
index aefe923..aff9370 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxpm (1:3.5.9-2) UNRELEASED; urgency=low
   * Build xpm.pdf from xpm.PS.gz, and use debian/libxpm-dev.docs to
     install it. That's the only available documentation we've got, so
     let's ship it (Closes: #466081).
+  * Add ghostscript build-dep, for ps2pdf.
 
  -- Cyril Brulebois <kibi@debian.org>  Sat, 15 Jan 2011 00:34:23 +0100
 
diff --git a/debian/control b/debian/control
index f45b491..eefa3bb 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Build-Depends:
  libxt-dev (>= 1:0.99.1-5),
  x11proto-core-dev (>= 7.0.1),
  libxext-dev (>= 1:0.99.1),
- pkg-config
+ pkg-config,
+ ghostscript,
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxpm
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxpm.git

commit 82076a6048a7e93b3d4cebcab4f123df45f909fa
Author: Cyril Brulebois <kibi@debian.org>
Date:   Sat Jan 15 00:44:29 2011 +0100

    Ship it.

diff --git a/debian/changelog b/debian/changelog
index 44cb8e4..aefe923 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libxpm (1:3.5.9-2) UNRELEASED; urgency=low
 
-  * Build xpm.pdf from xpm.PS.gz.
+  * Build xpm.pdf from xpm.PS.gz, and use debian/libxpm-dev.docs to
+    install it. That's the only available documentation we've got, so
+    let's ship it (Closes: #466081).
 
  -- Cyril Brulebois <kibi@debian.org>  Sat, 15 Jan 2011 00:34:23 +0100
 
diff --git a/debian/libxpm-dev.docs b/debian/libxpm-dev.docs
new file mode 100644
index 0000000..08b6910
--- /dev/null
+++ b/debian/libxpm-dev.docs
@@ -0,0 +1 @@
+doc/xpm.pdf

commit 9a6faa8e22c1f4102f1a947c22c2316f2450378f
Author: Cyril Brulebois <kibi@debian.org>
Date:   Sat Jan 15 00:35:17 2011 +0100

    Build xpm.pdf from xpm.PS.gz.

diff --git a/debian/changelog b/debian/changelog
index 872838a..44cb8e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxpm (1:3.5.9-2) UNRELEASED; urgency=low
+
+  * Build xpm.pdf from xpm.PS.gz.
+
+ -- Cyril Brulebois <kibi@debian.org>  Sat, 15 Jan 2011 00:34:23 +0100
+
 libxpm (1:3.5.9-1) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/rules b/debian/rules
index 07c8e19..f049670 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,8 @@ build-stamp:
 	             --infodir=\$${prefix}/share/info $(confflags) \
 	             CFLAGS="$(CFLAGS)" 
 	cd build && $(MAKE)
+	# PDF can be searched into, so prefer this format:
+	zcat doc/xpm.PS.gz | ps2pdf - doc/xpm.pdf
 	>$@
 
 clean:
@@ -58,6 +60,8 @@ clean:
 	rm -f aclocal.m4 compile config.guess config.h.in config.sub configure
 	rm -f INSTALL depcomp install-sh ltmain.sh missing mkinstalldirs
 	rm -f $$(find -name Makefile.in)
+	# Extra clean-up:
+	rm -f doc/xpm.pdf
 
 	dh_clean
 


Reply to: