Forgot to include the patch the first time around. Resending.
diff -Nru openmotif-2.3.3/debian/changelog openmotif-2.3.3/debian/changelog
--- openmotif-2.3.3/debian/changelog 2012-09-26 08:11:52.000000000 +0200
+++ openmotif-2.3.3/debian/changelog 2012-05-20 17:22:12.000000000 +0200
@@ -1,3 +1,16 @@
+openmotif (2.3.3-5ubuntu1+sg2) precise; urgency=low
+
+ * Convert to multiarch.
+ * Convert to format 3.0 (quilt).
+
+ -- Sergio Gelato <sergio.gel...@astro.su.se> Sun, 20 May 2012 17:21:39 +0200
+
+openmotif (2.3.3-5ubuntu1+sg1) precise; urgency=low
+
+ * Provide backwards compatibility with libmotif3. (Fixes: #635960)
+
+ -- Sergio Gelato <sergio.gel...@astro.su.se> Sat, 19 May 2012 17:38:23 +0200
+
openmotif (2.3.3-5ubuntu1) natty; urgency=low
* debian/patches/0003_fix_ftbfs_binutils-gold.patch: fix FTBFS
diff -Nru openmotif-2.3.3/debian/compat openmotif-2.3.3/debian/compat
--- openmotif-2.3.3/debian/compat 2012-09-26 08:11:52.000000000 +0200
+++ openmotif-2.3.3/debian/compat 2012-05-20 17:15:32.000000000 +0200
@@ -1 +1 @@
-6
+9
diff -Nru openmotif-2.3.3/debian/control openmotif-2.3.3/debian/control
--- openmotif-2.3.3/debian/control 2012-09-26 08:11:52.000000000 +0200
+++ openmotif-2.3.3/debian/control 2012-05-20 19:20:18.000000000 +0200
@@ -1,8 +1,8 @@
Source: openmotif
Section: non-free/devel
Priority: extra
-Build-Depends: debhelper (>= 6.0.7), libxaw7-dev, byacc, flex, libsm-dev,
libx11-dev,
- libxext-dev, libxmu-dev, libxp-dev, libxt-dev, xbitmaps, libxft-dev,
autotools-dev, quilt
+Build-Depends: debhelper (>= 9), dh-exec, libxaw7-dev, byacc, flex, libsm-dev,
libx11-dev,
+ libxext-dev, libxmu-dev, libxp-dev, libxt-dev, xbitmaps, libxft-dev,
autotools-dev
Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
XSBC-Original-Maintainer: Stefan Bauer <stefan.ba...@cubewerk.de>
Standards-Version: 3.9.1.0
@@ -12,10 +12,12 @@
Package: libmotif4
Architecture: any
Section: non-free/libs
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: x11-common (>= 1:7.0.0)
+Pre-Depends: ${misc:Pre-Depends}, x11-common (>= 1:7.0.0)
Conflicts: libmotif3
Replaces: libmotif3
+Provides: libmotif3
Description: Open Motif - shared libraries
This package includes all files you need to run Motif
applications which are linked against Open Motif, which
diff -Nru openmotif-2.3.3/debian/libmotif4.files
openmotif-2.3.3/debian/libmotif4.files
--- openmotif-2.3.3/debian/libmotif4.files 2012-09-26 08:11:52.000000000
+0200
+++ openmotif-2.3.3/debian/libmotif4.files 2012-05-20 17:13:06.000000000
+0200
@@ -1,3 +1,3 @@
-/usr/lib/lib*.so.*
+/usr/lib/*/lib*.so.*
/usr/lib/X11/bindings
/usr/include/X11/bitmaps
diff -Nru openmotif-2.3.3/debian/libmotif4.links
openmotif-2.3.3/debian/libmotif4.links
--- openmotif-2.3.3/debian/libmotif4.links 1970-01-01 01:00:00.000000000
+0100
+++ openmotif-2.3.3/debian/libmotif4.links 2012-05-20 17:24:25.000000000
+0200
@@ -0,0 +1,4 @@
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libMrm.so.4.0.3
usr/lib/${DEB_HOST_MULTIARCH}/libMrm.so.3
+usr/lib/${DEB_HOST_MULTIARCH}/libUil.so.4.0.3
usr/lib/${DEB_HOST_MULTIARCH}/libUil.so.3
+usr/lib/${DEB_HOST_MULTIARCH}/libXm.so.4.0.3
usr/lib/${DEB_HOST_MULTIARCH}/libXm.so.3
diff -Nru openmotif-2.3.3/debian/libmotif-dev.files
openmotif-2.3.3/debian/libmotif-dev.files
--- openmotif-2.3.3/debian/libmotif-dev.files 2012-09-26 08:11:52.000000000
+0200
+++ openmotif-2.3.3/debian/libmotif-dev.files 2012-05-20 17:28:07.000000000
+0200
@@ -1,7 +1,7 @@
-/usr/lib/libMrm.a
-/usr/lib/libUil.a
-/usr/lib/libXm.a
-/usr/lib/lib*.so
+/usr/lib/*/libMrm.a
+/usr/lib/*/libUil.a
+/usr/lib/*/libXm.a
+/usr/lib/*/lib*.so
/usr/include/Xm
/usr/include/Mrm
/usr/include/uil
diff -Nru
openmotif-2.3.3/debian/patches/0004-multiarch-specialcase-libdir-X11.patch
openmotif-2.3.3/debian/patches/0004-multiarch-specialcase-libdir-X11.patch
--- openmotif-2.3.3/debian/patches/0004-multiarch-specialcase-libdir-X11.patch
1970-01-01 01:00:00.000000000 +0100
+++ openmotif-2.3.3/debian/patches/0004-multiarch-specialcase-libdir-X11.patch
2012-05-20 20:30:11.000000000 +0200
@@ -0,0 +1,47 @@
+For multiarch support, we change libdir to /usr/lib/$(DEB_HOST_MULTIARCH).
+However, we do not want to do this to /usr/lib/X11 yet.
+
+Note that XMBINDDIR_FALLBACK should really be set to /usr/share/X11/bindings
+since the files are platform-independent. We postpone moving them until a
+decision has been reached on libmotif-common.
+
+The configure.ac fixes are minimal and only suitable for Debian/Ubuntu
+packaging. For upstream one might want to add a command line option.
+
+Sergio Gelato, 2012-05-20.
+--- a/configure
++++ b/configure
+@@ -18786,13 +18786,13 @@
+ LIBDIR="${libdir}/X11"
+
+
+-MWMRCDIR="${libdir}/X11"
++MWMRCDIR="${prefix}/lib/X11"
+
+
+ INCDIR="${includedir}/X11"
+
+
+-XMBINDDIR_FALLBACK="${libdir}/X11/bindings"
++XMBINDDIR_FALLBACK="${prefix}/lib/X11/bindings"
+
+
+ RM="rm -f"
+--- a/configure.ac
++++ b/configure.ac
+@@ -179,13 +179,13 @@
+ LIBDIR="${libdir}/X11"
+ AC_SUBST(LIBDIR)
+
+-MWMRCDIR="${libdir}/X11"
++MWMRCDIR="${prefix}/lib/X11"
+ AC_SUBST(MWMRCDIR)
+
+ INCDIR="${includedir}/X11"
+ AC_SUBST(INCDIR)
+
+-XMBINDDIR_FALLBACK="${libdir}/X11/bindings"
++XMBINDDIR_FALLBACK="${prefix}/lib/X11/bindings"
+ AC_SUBST(XMBINDDIR_FALLBACK)
+
+ RM="rm -f"
diff -Nru openmotif-2.3.3/debian/patches/series
openmotif-2.3.3/debian/patches/series
--- openmotif-2.3.3/debian/patches/series 2012-09-26 08:11:52.000000000
+0200
+++ openmotif-2.3.3/debian/patches/series 2012-05-20 18:18:55.000000000
+0200
@@ -1,3 +1,4 @@
0001-implicit.pointer.conversion.tabstack.main.c.patch
0002-add-debian-menu-structure-to-system.mwmrc-menu.patch
0003_fix_ftbfs_binutils-gold.patch
+0004-multiarch-specialcase-libdir-X11.patch
diff -Nru openmotif-2.3.3/debian/rules openmotif-2.3.3/debian/rules
--- openmotif-2.3.3/debian/rules 2012-09-26 08:11:52.000000000 +0200
+++ openmotif-2.3.3/debian/rules 2012-05-20 17:49:27.000000000 +0200
@@ -8,12 +8,11 @@
#export DH_VERBOSE=1
export LANG=POSIX
-include /usr/share/quilt/quilt.make
-
# From /usr/share/doc/autotools-dev/README.Debian.gz
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += $(DEB_HOST_GNU_TYPE)
@@ -31,9 +30,9 @@
build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
+build-stamp:
dh_testdir
- CFLAGS="-g -O2 -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
$(CFLAGS_NEW)" ./configure --prefix=/usr --mandir=/usr/share/man
--build=$(DEB_HOST_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+ CFLAGS="-g -O2 -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
$(CFLAGS_NEW)" ./configure --prefix=/usr --mandir=/usr/share/man
--build=$(DEB_HOST_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
make;
touch build-stamp
diff -Nru openmotif-2.3.3/debian/source/format
openmotif-2.3.3/debian/source/format
--- openmotif-2.3.3/debian/source/format 2012-09-26 08:11:52.000000000
+0200
+++ openmotif-2.3.3/debian/source/format 2012-05-20 17:21:28.000000000
+0200
@@ -1 +1 @@
-1.0
+3.0 (quilt)
