diff -pruN 2.3.3-7/debian/changelog 2.3.3-7ubuntu1/debian/changelog --- 2.3.3-7/debian/changelog 2013-01-23 14:37:08.000000000 +0000 +++ 2.3.3-7ubuntu1/debian/changelog 2013-01-23 14:37:08.000000000 +0000 @@ -1,3 +1,14 @@ +openmotif (2.3.3-7ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/0003_fix_ftbfs_binutils-gold.patch: fix FTBFS + binutils-gold with --ld-no-add-needed by adding X11 library to + Makefile. + - Provide display manager entry for Motif Window Manager. + - Provide backwards compatibility with libmotif3. + + -- Logan Rosen Mon, 21 Jan 2013 16:47:37 -0500 + openmotif (2.3.3-7) unstable; urgency=low * QA upload. @@ -6,6 +17,17 @@ openmotif (2.3.3-7) unstable; urgency=lo -- Paul Gevers Sat, 05 Jan 2013 21:36:38 +0100 +openmotif (2.3.3-6ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/0003_fix_ftbfs_binutils-gold.patch: fix FTBFS + binutils-gold with --ld-no-add-needed by adding X11 library to + Makefile. + - Provide display manager entry for Motif Window Manager. + - Provide backwards compatibility with libmotif3. + + -- Logan Rosen Sun, 30 Dec 2012 01:33:06 -0500 + openmotif (2.3.3-6) unstable; urgency=low * QA upload. @@ -26,6 +48,22 @@ openmotif (2.3.3-6) unstable; urgency=lo -- Paul Gevers Tue, 25 Dec 2012 09:04:47 +0100 +openmotif (2.3.3-5ubuntu2) quantal; urgency=low + + * Convert to multiarch (LP: #1026640). Thanks Sergio Gelato. + * Provide backwards compatibility with libmotif3 (LP: #818220). + * Provide display manager entry for Motif Window Manager (LP: #310895) + + -- Graham Inggs Thu, 04 Oct 2012 14:23:00 +0200 + +openmotif (2.3.3-5ubuntu1) natty; urgency=low + + * debian/patches/0003_fix_ftbfs_binutils-gold.patch: fix FTBFS + binutils-gold with --ld-no-add-needed by adding X11 library to + Makefile. (LP: #705294) + + -- Mahyuddin Susanto Thu, 20 Jan 2011 14:55:44 +0700 + openmotif (2.3.3-5) unstable; urgency=low * Fix hopefully the build problems on mips* @@ -284,6 +322,3 @@ openmotif (2.1.30-1) unstable; urgency=l -- Gerd Knorr Sun, 17 Dec 2000 11:07:25 +0100 -Local variables: -mode: debian-changelog -End: diff -pruN 2.3.3-7/debian/control 2.3.3-7ubuntu1/debian/control --- 2.3.3-7/debian/control 2013-01-23 14:37:08.000000000 +0000 +++ 2.3.3-7ubuntu1/debian/control 2013-01-23 14:37:08.000000000 +0000 @@ -4,7 +4,8 @@ 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, dpkg-dev (>= 1.16.1) -Maintainer: Debian QA Group +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian QA Group Standards-Version: 3.9.1.0 Homepage: http://www.motifzone.net/ XS-Autobuild: yes @@ -17,6 +18,7 @@ Depends: ${shlibs:Depends}, ${misc:Depen Pre-Depends: multiarch-support, 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 -pruN 2.3.3-7/debian/motif-clients.files 2.3.3-7ubuntu1/debian/motif-clients.files --- 2.3.3-7/debian/motif-clients.files 2013-01-23 14:37:08.000000000 +0000 +++ 2.3.3-7ubuntu1/debian/motif-clients.files 2013-01-23 14:37:08.000000000 +0000 @@ -5,3 +5,5 @@ /usr/share/man/man1/xmbind* /usr/share/man/man4 /usr/lib/X11/system.mwmrc +/usr/share/xsessions/mwm.desktop + diff -pruN 2.3.3-7/debian/mwm.desktop 2.3.3-7ubuntu1/debian/mwm.desktop --- 2.3.3-7/debian/mwm.desktop 1970-01-01 00:00:00.000000000 +0000 +++ 2.3.3-7ubuntu1/debian/mwm.desktop 2013-01-23 14:37:08.000000000 +0000 @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Motif Window Manager +Comment=Motif Window Manager session +Exec=mwm +TryExec=mwm +Icon= +Type=Application diff -pruN 2.3.3-7/debian/patches/0003_fix_ftbfs_binutils-gold.patch 2.3.3-7ubuntu1/debian/patches/0003_fix_ftbfs_binutils-gold.patch --- 2.3.3-7/debian/patches/0003_fix_ftbfs_binutils-gold.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.3.3-7ubuntu1/debian/patches/0003_fix_ftbfs_binutils-gold.patch 2013-01-23 14:37:08.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Fix FTBFS binutils-gold with ld --no-add-needed +Author: Mahyuddin Susanto +Bug-Ubuntu: https://launchpad.net/bugs/705294 + +diff -Nurp openmotif-2.3.3/demos/programs/Exm/simple_app/Makefile.am openmotif-2.3.3.ubuntu/demos/programs/Exm/simple_app/Makefile.am +--- openmotif-2.3.3/demos/programs/Exm/simple_app/Makefile.am 2008-10-31 21:38:06.000000000 +0700 ++++ openmotif-2.3.3.ubuntu/demos/programs/Exm/simple_app/Makefile.am 2011-01-19 15:05:18.935928589 +0700 +@@ -15,4 +15,4 @@ INCLUDES = -I$(srcdir)/../../../../lib \ + -I$(top_builddir)/lib \ + ${X_CFLAGS} + LDADD = ../../../../lib/Xm/libXm.la \ +- ../../../lib/Exm/libExm.a ++ ../../../lib/Exm/libExm.a -lX11 +diff -Nurp openmotif-2.3.3/demos/programs/Exm/simple_app/Makefile.in openmotif-2.3.3.ubuntu/demos/programs/Exm/simple_app/Makefile.in +--- openmotif-2.3.3/demos/programs/Exm/simple_app/Makefile.in 2010-03-12 21:44:35.000000000 +0700 ++++ openmotif-2.3.3.ubuntu/demos/programs/Exm/simple_app/Makefile.in 2011-01-19 15:05:48.187928850 +0700 +@@ -266,7 +266,7 @@ INCLUDES = -I$(srcdir)/../../../../lib \ + ${X_CFLAGS} + + LDADD = ../../../../lib/Xm/libXm.la \ +- ../../../lib/Exm/libExm.a ++ ../../../lib/Exm/libExm.a -lX11 + + all: all-am + diff -pruN 2.3.3-7/debian/patches/series 2.3.3-7ubuntu1/debian/patches/series --- 2.3.3-7/debian/patches/series 2013-01-23 14:37:08.000000000 +0000 +++ 2.3.3-7ubuntu1/debian/patches/series 2013-01-23 14:37:08.000000000 +0000 @@ -1,5 +1,6 @@ 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 0005-sprintf-error-message-hardening-format-security.patch 0006-cast-size_t-to-int.patch diff -pruN 2.3.3-7/debian/rules 2.3.3-7ubuntu1/debian/rules --- 2.3.3-7/debian/rules 2013-01-23 14:37:08.000000000 +0000 +++ 2.3.3-7ubuntu1/debian/rules 2013-01-23 14:37:08.000000000 +0000 @@ -69,6 +69,15 @@ install: ln -s /etc/X11/mwm/system.mwmrc debian/tmp/usr/lib/X11/system.mwmrc mkdir -p debian/tmp/usr/lib/X11/bindings/ + # create libmotif3 symlinks + ln -s libMrm.so.4.0.3 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libMrm.so.3 + ln -s libUil.so.4.0.3 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libUil.so.3 + ln -s libXm.so.4.0.3 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libXm.so.3 + + # display manager entry for Motif Window Manager + mkdir -p debian/tmp/usr/share/xsessions + cp -a debian/mwm.desktop debian/tmp/usr/share/xsessions + # splitup packages dh_movefiles