On Sat, Jan 08, 2005 at 02:08:08AM +0100, Adeodato Simó wrote: > > The proper solution here is probably to continue using the bundled smokeqt > > code on mips/mipsel, and build-depend on libsmokeqt-dev on the other > > architectures. This is certain to last through the sarge timeframe, as > > fixing gij for mips(el) is a post-sarge task. > Patch implementing that attached, sending here as accorded on irc. > Including a gzipped copy to prevent charset mangling. I'm uploading an NMU based on this patch. Attached is the final patch, which includes some small fixes for rpath handling introduced by the previous NMU. Thanks, -- Steve Langasek postmodern programmer
diff -u libqt-perl-3.008/debian/changelog libqt-perl-3.008/debian/changelog
--- libqt-perl-3.008/debian/changelog
+++ libqt-perl-3.008/debian/changelog
@@ -1,3 +1,17 @@
+libqt-perl (3.008-1.2) unstable; urgency=high
+
+ * Non-maintainer upload, with thanks to Adeodato Simó for his help in
+ preparing it
+ * High-urgency upload for sarge-targetted RC bugfix
+ * Revert the changes in the previous upload for mips and mipsel,
+ required for libqt-perl to be buildable on all arches and eligible
+ for sarge. (See discussion in Bug#274779).
+ * Make sure to keep --disable-rpath on all architectures and re-add
+ LD_RUN_PATH='', as this is still needed.
+ * Make libqt-perl conflict libsmokeqt1 and libsmokeqt-dev on mipsen.
+
+ -- Steve Langasek <vorlon@debian.org> Fri, 7 Jan 2005 18:13:13 -0800
+
libqt-perl (3.008-1.1) unstable; urgency=low
* Non maintainer upload.
@@ -10,7 +24,7 @@
- remove chrpath on no-longer built libsmokeqt.so, remove Build-Dependency
on chrpath too.
- -- Adeodato Sim�sp16@alu.ua.es> Thu, 07 Oct 2004 20:55:04 +0200
+ -- Adeodato Simó <asp16@alu.ua.es> Thu, 07 Oct 2004 20:55:04 +0200
libqt-perl (3.008-1) unstable; urgency=low
diff -u libqt-perl-3.008/debian/rules libqt-perl-3.008/debian/rules
--- libqt-perl-3.008/debian/rules
+++ libqt-perl-3.008/debian/rules
@@ -13,6 +13,16 @@
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+MISSING_LIBSMOKEQT_ARCHES = mips mipsel
+
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(MISSING_LIBSMOKEQT_ARCHES)))
+ EXTRA_CONFIGURE_ARGS := --enable-smoke
+ CONFLICTS := libsmokeqt1, libsmokeqt-dev
+else
+ RUN_CHRPATH := /bin/true
+endif
CFLAGS = -Wall -g
@@ -32,7 +42,7 @@
aclocal-1.7
automake-1.7
autoconf
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-qt-dir=/usr/share/qt3
+ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-qt-dir=/usr/share/qt3 --disable-rpath $(EXTRA_CONFIGURE_ARGS)
build: build-stamp
@@ -40,9 +50,9 @@
dh_testdir
# Add here commands to compile the package.
- $(MAKE) #LD_RUN_PATH=
+ $(MAKE) LD_RUN_PATH=
- #chrpath -d smoke/qt/.libs/libsmokeqt.so
+ $(RUN_CHRPATH) chrpath -d smoke/qt/.libs/libsmokeqt.so
touch build-stamp
@@ -125,7 +135,7 @@
dh_installdeb
# dh_perl
dh_shlibdeps
- dh_gencontrol
+ dh_gencontrol -- "-Vmipsen:Conflicts=$(CONFLICTS)"
dh_md5sums
dh_builddeb
diff -u libqt-perl-3.008/debian/control libqt-perl-3.008/debian/control
--- libqt-perl-3.008/debian/control
+++ libqt-perl-3.008/debian/control
@@ -2,13 +2,14 @@
Section: perl
Priority: optional
Maintainer: Peter Hawkins <peterh@debian.org>
-Build-Depends: debhelper (>> 3.0.0), libqt3-mt-dev, perl (>= 5.8.0), automake1.7, autoconf, libsmokeqt-dev (>> 4:3.2.3-1)
+Build-Depends: debhelper (>> 3.0.0), libqt3-mt-dev, perl (>= 5.8.0), automake1.7, autoconf, chrpath [mips mipsel], libsmokeqt-dev (>> 4:3.2.3-1) [!mips !mipsel]
Build-Conflicts: libqt-perl
Standards-Version: 3.6.1
Package: libqt-perl
Architecture: any
Depends: ${perl:Depends}, ${shlibs:Depends}
+Conflicts: ${mipsen:Conflicts}
Description: Perl bindings for the Qt library
This module lets you use the Qt library from Perl.
It provides an object-oriented interface and is easy to use.
Attachment:
signature.asc
Description: Digital signature