Package: libspe2
Followup-For: Bug #483278

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

attached.

- -- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: powerpc (ppc64)

Kernel: Linux 2.6.26-1-powerpc64 (SMP w/2 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkj/YwgACgkQynjLPm522B3O/QCdF2n/NsD7PT2W8Glr2fy/Hy90
6wkAn3/FhQ7RaZ+5ToGR8xBa9S/2F8Zn
=XGzU
-----END PGP SIGNATURE-----
diff -u libspe2-2.2.80-95/debian/changelog libspe2-2.2.80-95/debian/changelog
--- libspe2-2.2.80-95/debian/changelog
+++ libspe2-2.2.80-95/debian/changelog
@@ -1,3 +1,14 @@
+libspe2 (2.2.80-95-3.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Fix FTBFS for non-powerpc arches in debian/rules (closes: #483278). 
+  * Add missing build-depends on graphviz.
+  * Install doxy/html documentation
+  * Install missing pkgconfig files (closes: #503009).
+  * RC bugfix, high upload urgency.
+
+ -- Sean Finney <[EMAIL PROTECTED]>  Tue, 21 Oct 2008 18:00:42 -0400
+
 libspe2 (2.2.80-95-3) unstable; urgency=low
 
   * debian/rules: Only build the doc package on !powerpc !ppc64.
diff -u libspe2-2.2.80-95/debian/control libspe2-2.2.80-95/debian/control
--- libspe2-2.2.80-95/debian/control
+++ libspe2-2.2.80-95/debian/control
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Arthur Loiret <[EMAIL PROTECTED]>
 Uploaders: Aurélien GÉRÔME <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 6), quilt (>= 0.40), gcc-multilib [powerpc ppc64], doxygen, xsltproc, texlive-extra-utils, ghostscript, texlive-latex-recommended, texlive-fonts-recommended
+Build-Depends: debhelper (>= 6), quilt (>= 0.40), gcc-multilib [powerpc ppc64], doxygen, xsltproc, texlive-extra-utils, ghostscript, graphviz, texlive-latex-recommended, texlive-fonts-recommended
 Standards-Version: 3.7.3
 Homepage: http://sourceforge.net/projects/libspe
 XS-DM-Upload-Allowed: yes
diff -u libspe2-2.2.80-95/debian/rules libspe2-2.2.80-95/debian/rules
--- libspe2-2.2.80-95/debian/rules
+++ libspe2-2.2.80-95/debian/rules
@@ -46,10 +46,11 @@
 #	QUILT_PATCHES=debian/patches quilt pop -a || test $$? = 2
 	rm -f patch-stamp
 
-build: $(if $(on_powerpc),build64-stamp build-stamp,)
+build: build64-stamp build-stamp
 build-doc: build-doc-stamp
 
 build64-stamp: patch-stamp
+ifneq (,$(on_powerpc))
 	$(MAKE) SHELL=/bin/bash clean
 # EXTRA_CFLAGS includes -m32 for i386/amd64 ...
 	$(MAKE) $(set_optflags) \
@@ -69,9 +70,11 @@
 	    prefix=/$(prefix) libdir=/usr/lib64 \
 	    DESTDIR=$(CURDIR)/debian/tmp64 \
 		install
+endif
 	touch $@
 
 build-stamp: patch-stamp build64-stamp
+ifneq (,$(on_powerpc))
 	$(MAKE) SHELL=/bin/bash clean
 	$(MAKE) $(set_optflags) \
 	    CC="gcc -m32" \
@@ -86,6 +89,7 @@
 	    prefix=/$(prefix) libdir=/$(libdir) \
 		elfspe-all
 endif
+endif
 	touch $@
 
 build-doc-stamp: patch-stamp
@@ -105,12 +109,13 @@
 	rm -f *-stamp
 	dh_clean
 
-install:
+install: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
 
+ifneq (,$(on_powerpc))
 # don't set SYSROOT for the install, move things after calling
 # dh_install (which cannot handle variables or macros).
 	$(MAKE) $(set_optflags) \
@@ -120,14 +125,12 @@
 	    DESTDIR=$(CURDIR)/debian/tmp \
 		install
 
-ifneq (,$(on_powerpc))
 	$(MAKE) $(set_optflags) \
 	    SHELL=/bin/bash \
 	    SYSROOT= \
 	    prefix=/$(prefix) libdir=/$(libdir) \
 	    DESTDIR=$(CURDIR)/debian/tmp \
 		elfspe-install
-endif
 
 	dh_install -plibspe2-2 --sourcedir=debian/tmp \
 		'$(sysroot)/usr/lib/*2.so.*' $(sysroot)/usr/lib
@@ -139,11 +142,15 @@
 	dh_install -plibspe2-dev --sourcedir=debian/tmp \
 		'$(sysroot)/usr/spu/include/*.h' usr/spu/include
 
+	dh_install -plibspe2-dev --sourcedir=debian/tmp \
+		'$(sysroot)/usr/lib/pkgconfig/libspe2.pc' usr/lib/pkgconfig
+
 	dh_install -plib64spe2-2 --sourcedir=debian/tmp64 \
 		'$(sysroot)/usr/lib64/*2.so.*' $(sysroot)/usr/lib64
 
 	dh_install -plib64spe2-dev --sourcedir=debian/tmp64 \
 		'$(sysroot)/usr/lib64/*2.so' '$(sysroot)/usr/lib64/*2.a' $(sysroot)/usr/lib64
+endif
 
 ifneq (,$(on_powerpc))
 	dh_install -pelfspe2 --sourcedir=debian/tmp \
@@ -158,8 +165,8 @@
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs -i
-	dh_installdocs -i doc/*.pdf
-	dh_compress -i -X.pdf
+	dh_installdocs -i doc/*.pdf html
+	dh_compress -i -X.pdf -X.html
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_gencontrol -i
@@ -167,8 +174,8 @@
 	dh_builddeb -i
 
 # Build architecture dependant packages using the common target.
-binary-arch: $(if $(on_powerpc),build install,) build-doc
-binary-arch-ppc: build install
+binary-arch: install build-doc
+ifneq (,$(on_powerpc))
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs -s
@@ -177,14 +184,13 @@
 	dh_strip -s
 	dh_compress -s -X.pdf
 	dh_fixperms -s
-ifneq (,$(on_powerpc))
 	dh_makeshlibs -s
 	dh_shlibdeps -s
-endif
 	dh_installdeb -s
 	dh_gencontrol -s
 	dh_md5sums -s
 	dh_builddeb -s
+endif
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary-arch-ppc binary install configure

Reply via email to