> 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.
Thanks.
--
Adeodato Simó
EM: asp16 [ykwim] alu.ua.es | PK: DA6AE621
The reasonable man adapts himself to the world; the unreasonable one
persists in trying to adapt the world to himself. Therefore all
progress depends on the unreasonable man.
-- George Bernard Shaw
diff -u -r libqt-perl-3.008-1.1/debian/changelog
libqt-perl-3.008-1.2/debian/changelog
--- libqt-perl-3.008-1.1/debian/changelog 2005-01-08 02:00:16.000000000
+0100
+++ libqt-perl-3.008-1.2/debian/changelog 2005-01-08 02:00:28.000000000
+0100
@@ -1,3 +1,13 @@
+libqt-perl (3.008-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Revert the changes in the previous upload for mips and mipsel. This has
+ been suggested by Steve Langasek to permit libqt-perl entering Sarge. (See
+ discussion in Bug#274779).
+ * Make libqt-perl conflict libsmokeqt1 and libsmokeqt-dev on mipsen.
+
+ -- Adeodato Simó <[EMAIL PROTECTED]> Sat, 08 Jan 2005 01:36:35 +0100
+
libqt-perl (3.008-1.1) unstable; urgency=low
* Non maintainer upload.
@@ -10,7 +20,7 @@
- remove chrpath on no-longer built libsmokeqt.so, remove Build-Dependency
on chrpath too.
- -- Adeodato Sim� <[EMAIL PROTECTED]> Thu, 07 Oct 2004 20:55:04 +0200
+ -- Adeodato Simó <[EMAIL PROTECTED]> Thu, 07 Oct 2004 20:55:04 +0200
libqt-perl (3.008-1) unstable; urgency=low
diff -u -r libqt-perl-3.008-1.1/debian/control
libqt-perl-3.008-1.2/debian/control
--- libqt-perl-3.008-1.1/debian/control 2005-01-08 02:00:16.000000000 +0100
+++ libqt-perl-3.008-1.2/debian/control 2005-01-08 02:00:28.000000000 +0100
@@ -2,13 +2,14 @@
Section: perl
Priority: optional
Maintainer: Peter Hawkins <[EMAIL PROTECTED]>
-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.
diff -u -r libqt-perl-3.008-1.1/debian/rules libqt-perl-3.008-1.2/debian/rules
--- libqt-perl-3.008-1.1/debian/rules 2005-01-08 02:00:16.000000000 +0100
+++ libqt-perl-3.008-1.2/debian/rules 2005-01-08 02:01:01.000000000 +0100
@@ -13,6 +13,17 @@
# 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 := --disable-rpath --enable-smoke
+ EXTRA_MAKE_ARGS := LD_RUN_PATH=
+ CONFLICTS := libsmokeqt1, libsmokeqt-dev
+else
+ RUN_CHRPATH := /bin/true
+endif
CFLAGS = -Wall -g
@@ -32,7 +43,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 $(EXTRA_CONFIGURE_ARGS)
build: build-stamp
@@ -40,9 +51,9 @@
dh_testdir
# Add here commands to compile the package.
- $(MAKE) #LD_RUN_PATH=
+ $(MAKE) $(EXTRA_MAKE_ARGS)
- #chrpath -d smoke/qt/.libs/libsmokeqt.so
+ $(RUN_CHRPATH) chrpath -d smoke/qt/.libs/libsmokeqt.so
touch build-stamp
@@ -125,7 +136,7 @@
dh_installdeb
# dh_perl
dh_shlibdeps
- dh_gencontrol
+ dh_gencontrol -- "-Vmipsen:Conflicts=$(CONFLICTS)"
dh_md5sums
dh_builddeb
second-NMU-for-274779.diff.gz
Description: Binary data
