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

libxpm: Changes to 'debian-unstable'



 debian/changelog       |    2 ++
 debian/control         |    1 -
 debian/libxpm-dev.docs |    2 +-
 debian/rules           |    4 ----
 4 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 450505d75f5acbffea29317b55d2fc4965507a3e
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Nov 20 22:04:34 2011 +0100

    Revert to shipping the doc as PS instead of PDF
    
    That way libxpm-dev can be Multi-Arch: same (ps2pdf generates a
    different file each time).  Thanks to Jakub Wilk.

diff --git a/debian/changelog b/debian/changelog
index dda98e0..aee3e46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libxpm (1:3.5.9-5) UNRELEASED; urgency=low
 
   * Clean up libtool m4 files.
+  * Revert to shipping the doc as PS instead of PDF, so libxpm-dev can be
+    Multi-Arch: same.  Thanks to Jakub Wilk.
 
  -- Julien Cristau <jcristau@debian.org>  Mon, 31 Oct 2011 18:18:12 +0100
 
diff --git a/debian/control b/debian/control
index 4d63906..83f3fe9 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends:
  x11proto-core-dev (>= 7.0.1),
  libxext-dev (>= 1:0.99.1),
  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
diff --git a/debian/libxpm-dev.docs b/debian/libxpm-dev.docs
index 08b6910..e8084ae 100644
--- a/debian/libxpm-dev.docs
+++ b/debian/libxpm-dev.docs
@@ -1 +1 @@
-doc/xpm.pdf
+doc/xpm.PS.gz
diff --git a/debian/rules b/debian/rules
index 06b37ee..ed7d3f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,8 +46,6 @@ 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:
@@ -63,8 +61,6 @@ clean:
 	rm -f INSTALL depcomp install-sh ltmain.sh missing mkinstalldirs
 	find -name Makefile.in -delete
 	rm -f m4/libtool*.m4 m4/lt*.m4
-	# Extra clean-up:
-	rm -f doc/xpm.pdf
 
 	dh_clean
 


Reply to: