Bug#384082: fixed patch
Oops. There are a few mistakes in my previous patch (wrong paths, missing
*.install files..). Please use this one instead.
--
Robert Millan
My spam trap is honeypot@aybabtu.com. Note: this address is only intended for
spam harvesters. Writing to it will get you added to my black list.
diff -Nur libxdmcp-1.0.1.old/debian/control libxdmcp-1.0.1/debian/control
--- libxdmcp-1.0.1.old/debian/control 2006-08-21 21:19:26.000000000 +0200
+++ libxdmcp-1.0.1/debian/control 2006-08-21 21:19:48.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, x11proto-core-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, x11proto-core-dev, libc6-dev-i386 [amd64]
Standards-Version: 3.7.2.0
Package: libxdmcp6
@@ -54,3 +54,41 @@
.
This module can be found as the module 'lib/Xdmcp' at
:pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+
+Package: lib32xdmcp6
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common (>= 1:7.0.0)
+Description: X11 Display Manager Control Protocol library
+ This package provides the main interface to the X11 display manager control
+ protocol library, which allows for remote logins to display managers.
+ .
+ More information about X.Org can be found at:
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This module can be found as the module 'lib/Xdmcp' at
+ :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+ .
+ This package supports the 32-bit ABI variant of your system's
+ architecure.
+
+Package: lib32xdmcp-dev
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, lib32xdmcp6 (= ${Source-Version}), x11proto-core-dev, lib32c-dev, libxdmcp-dev (= ${Source-Version})
+Pre-Depends: x11-common (>= 1:7.0.0)
+Description: X11 authorisation library (development headers)
+ This package provides the main interface to the X11 display manager control
+ protocol library, which allows for remote logins to display managers.
+ .
+ This package contains the development headers for the library found in
+ libxdmcp6. Non-developers likely have little use for this package.
+ .
+ More information about X.Org can be found at:
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This module can be found as the module 'lib/Xdmcp' at
+ :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+ .
+ This package supports the 32-bit ABI variant of your system's
+ architecure.
diff -Nur libxdmcp-1.0.1.old/debian/lib32xdmcp6.install libxdmcp-1.0.1/debian/lib32xdmcp6.install
--- libxdmcp-1.0.1.old/debian/lib32xdmcp6.install 1970-01-01 01:00:00.000000000 +0100
+++ libxdmcp-1.0.1/debian/lib32xdmcp6.install 2006-08-21 21:24:29.000000000 +0200
@@ -0,0 +1 @@
+emul/ia32-linux/usr/lib/libXdmcp.so.6*
diff -Nur libxdmcp-1.0.1.old/debian/lib32xdmcp-dev.install libxdmcp-1.0.1/debian/lib32xdmcp-dev.install
--- libxdmcp-1.0.1.old/debian/lib32xdmcp-dev.install 1970-01-01 01:00:00.000000000 +0100
+++ libxdmcp-1.0.1/debian/lib32xdmcp-dev.install 2006-08-21 21:24:23.000000000 +0200
@@ -0,0 +1,3 @@
+emul/ia32-linux/usr/lib/libXdmcp.a
+emul/ia32-linux/usr/lib/libXdmcp.so
+emul/ia32-linux/usr/lib/pkgconfig/xdmcp.pc
diff -Nur libxdmcp-1.0.1.old/debian/rules libxdmcp-1.0.1/debian/rules
--- libxdmcp-1.0.1.old/debian/rules 2006-08-21 21:19:26.000000000 +0200
+++ libxdmcp-1.0.1/debian/rules 2006-08-21 21:23:11.000000000 +0200
@@ -25,12 +25,12 @@
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
- confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
+ifeq ($(DEB_HOST_ARCH), amd64)
+build32-target = i686-$(DEB_HOST_GNU_SYSTEM)
+lib32 = /emul/ia32-linux/lib
+usr_lib32 = /emul/ia32-linux/usr/lib
+endif
build: build-stamp
build-stamp:
@@ -41,9 +41,21 @@
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
+ --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
CFLAGS="$(CFLAGS)"
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ifneq (, $(build32-target))
+ mkdir obj-$(build32-target)
+ cp Wraphelp.c obj-$(build32-target) #Ick... to allow des building
+ cd obj-$(build32-target) && \
+ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info $(confflags) \
+ --build=$(DEB_BUILD_GNU_TYPE) --host=$(build32-target) --libdir=$(usr_lib32) \
+ CFLAGS="$(CFLAGS)" CC="gcc -m32" BUILD_CC="gcc" CXX="g++ -m32"
+ cd obj-$(build32-target) && $(MAKE)
+endif
+
touch build-stamp
clean:
@@ -66,6 +78,9 @@
dh_installdirs
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ifneq (, $(build32-target))
+ cd obj-$(build32-target) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+endif
# Build architecture-dependent files here.
binary-arch: build install
@@ -80,7 +95,7 @@
dh_compress
dh_fixperms
dh_makeshlibs
- dh_shlibdeps
+ dh_shlibdeps -l$(lib32):$(usr_lib32)
dh_installdeb
dh_gencontrol
dh_md5sums
Reply to: