diff -u spl-1.0~pre6/debian/rules spl-1.0~pre6/debian/rules --- spl-1.0~pre6/debian/rules +++ spl-1.0~pre6/debian/rules @@ -51,6 +51,8 @@ MAKEFLAGS += -j$(NUMJOBS) endif +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + include /usr/share/quilt/quilt.make @@ -80,50 +82,50 @@ $(MAKE) install DESTDIR=$(TMPCORE) prefix=/usr -test "$(STRIP)" = "true" && cd $(TMPCORE)/usr && strip \ --remove-section=.comment --remove-section=.note --strip-unneeded \ - bin/* lib/spl_modules/*.so lib/cgi-bin/* + bin/* lib/$(DEB_HOST_MULTIARCH)/spl_modules/*.so lib/$(DEB_HOST_MULTIARCH)/cgi-bin/* # permission fix, see BTS #393996 & Co. - chmod -x $(TMPCORE)/usr/lib/spl_modules/*.so $(TMPCORE)/usr/lib/*.a + chmod -x $(TMPCORE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/*.so $(TMPCORE)/usr/lib/$(DEB_HOST_MULTIARCH)/*.a $(INSTALL_DIR) $(TMPCORE)/usr/share/doc/$(PKGCORE)/examples - $(INSTALL_DIR) $(TMPPG)/usr/lib/spl_modules - mv $(TMPCORE)/usr/lib/spl_modules/mod_sql_postgres.so $(TMPPG)/usr/lib/spl_modules + $(INSTALL_DIR) $(TMPPG)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules + mv $(TMPCORE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/mod_sql_postgres.so $(TMPPG)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules - $(INSTALL_DIR) $(TMPMYSQL)/usr/lib/spl_modules - mv $(TMPCORE)/usr/lib/spl_modules/mod_sql_mysql.so $(TMPMYSQL)/usr/lib/spl_modules + $(INSTALL_DIR) $(TMPMYSQL)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules + mv $(TMPCORE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/mod_sql_mysql.so $(TMPMYSQL)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules - $(INSTALL_DIR) $(TMPSQLITE)/usr/lib/spl_modules - mv $(TMPCORE)/usr/lib/spl_modules/mod_sql_sqlite.so $(TMPSQLITE)/usr/lib/spl_modules + $(INSTALL_DIR) $(TMPSQLITE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules + mv $(TMPCORE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/mod_sql_sqlite.so $(TMPSQLITE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules - #$(INSTALL_DIR) $(TMPKDE)/usr/lib/spl_modules - #mv $(TMPCORE)/usr/lib/spl_modules/mod_kde.so $(TMPCORE)/usr/lib/spl_modules/mod_qt.so \ - # $(TMPKDE)/usr/lib/spl_modules + #$(INSTALL_DIR) $(TMPKDE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules + #mv $(TMPCORE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/mod_kde.so $(TMPCORE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/mod_qt.so \ + # $(TMPKDE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules - $(INSTALL_DIR) $(TMPSDL)/usr/lib/spl_modules - mv $(TMPCORE)/usr/lib/spl_modules/mod_sdl.so $(TMPSDL)/usr/lib/spl_modules + $(INSTALL_DIR) $(TMPSDL)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules + mv $(TMPCORE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/mod_sdl.so $(TMPSDL)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules - #$(INSTALL_DIR) $(TMPOPENGL)/usr/lib/spl_modules - #mv $(TMPCORE)/usr/lib/spl_modules/mod_gl.so $(TMPOPENGL)/usr/lib/spl_modules + #$(INSTALL_DIR) $(TMPOPENGL)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules + #mv $(TMPCORE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/mod_gl.so $(TMPOPENGL)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules - $(INSTALL_DIR) $(TMPXML)/usr/lib/spl_modules - mv $(TMPCORE)/usr/lib/spl_modules/mod_xml.so $(TMPXML)/usr/lib/spl_modules + $(INSTALL_DIR) $(TMPXML)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules + mv $(TMPCORE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/mod_xml.so $(TMPXML)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules - $(INSTALL_DIR) $(TMPCURL)/usr/lib/spl_modules - mv $(TMPCORE)/usr/lib/spl_modules/mod_curl.so $(TMPCURL)/usr/lib/spl_modules + $(INSTALL_DIR) $(TMPCURL)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules + mv $(TMPCORE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/mod_curl.so $(TMPCURL)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules - $(INSTALL_DIR) $(TMPWEB)/usr/lib/spl_modules $(TMPWEB)/usr/bin - cd $(TMPCORE)/usr/lib/spl_modules && mv mod_w2t.splb mod_webdebug.so \ + $(INSTALL_DIR) $(TMPWEB)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules $(TMPWEB)/usr/bin + cd $(TMPCORE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules && mv mod_w2t.splb mod_webdebug.so \ mod_wsf.splb mod_wsf_action.splb mod_wsf_debug.splb \ mod_wsf_dialog.splb mod_wsf_display.splb mod_wsf_edit.splb \ mod_wsf_edit_sql.splb mod_wsf_graph.splb mod_wsf_menu.splb \ - mod_wsf_switch.splb $(TMPWEB)/usr/lib/spl_modules + mod_wsf_switch.splb $(TMPWEB)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules mv $(TMPCORE)/usr/bin/webspld $(TMPWEB)/usr/bin - mv $(TMPCORE)/usr/lib/cgi-bin/ $(TMPWEB)/usr/lib + mv $(TMPCORE)/usr/lib/$(DEB_HOST_MULTIARCH)/cgi-bin/ $(TMPWEB)/usr/lib/$(DEB_HOST_MULTIARCH) - $(INSTALL_DIR) $(TMPDEV)/usr/lib $(TMPDEV)/usr/bin $(TMPDEV)/usr/share + $(INSTALL_DIR) $(TMPDEV)/usr/lib/$(DEB_HOST_MULTIARCH) $(TMPDEV)/usr/bin $(TMPDEV)/usr/share mv $(TMPCORE)/usr/share/aclocal $(TMPDEV)/usr/share mv $(TMPCORE)/usr/include $(TMPDEV)/usr mv $(TMPCORE)/usr/bin/spl-config $(TMPDEV)/usr/bin - mv $(TMPCORE)/usr/lib/libspl.a $(TMPDEV)/usr/lib + mv $(TMPCORE)/usr/lib/$(DEB_HOST_MULTIARCH)/libspl.a $(TMPDEV)/usr/lib/$(DEB_HOST_MULTIARCH) $(INSTALL_FILE) README README.API README.LANG \ $(TMPCORE)/usr/share/doc/$(PKGCORE) @@ -180,26 +182,26 @@ $(INSTALL_FILE) debian/copyright debian/README.Debian \ $(TMPCORE)/usr/share/doc/$(PKGCORE) dpkg-shlibdeps -Tdebian/$(PKGCORE).substvars -dDepends \ - $(TMPCORE)/usr/bin/* $(TMPCORE)/usr/lib/spl_modules/*.so + $(TMPCORE)/usr/bin/* $(TMPCORE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/*.so dpkg-shlibdeps -Tdebian/$(PKGPG).substvars -dDepends \ - $(TMPPG)/usr/lib/spl_modules/*.so + $(TMPPG)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/*.so dpkg-shlibdeps -Tdebian/$(PKGMYSQL).substvars -dDepends \ - $(TMPMYSQL)/usr/lib/spl_modules/*.so + $(TMPMYSQL)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/*.so dpkg-shlibdeps -Tdebian/$(PKGSQLITE).substvars -dDepends \ - $(TMPSQLITE)/usr/lib/spl_modules/*.so + $(TMPSQLITE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/*.so #dpkg-shlibdeps -Tdebian/$(PKGKDE).substvars -dDepends \ - # $(TMPKDE)/usr/lib/spl_modules/*.so + # $(TMPKDE)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/*.so dpkg-shlibdeps -Tdebian/$(PKGSDL).substvars -dDepends \ - $(TMPSDL)/usr/lib/spl_modules/*.so + $(TMPSDL)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/*.so #dpkg-shlibdeps -Tdebian/$(PKGOPENGL).substvars -dDepends \ - # $(TMPOPENGL)/usr/lib/spl_modules/*.so + # $(TMPOPENGL)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/*.so dpkg-shlibdeps -Tdebian/$(PKGXML).substvars -dDepends \ - $(TMPXML)/usr/lib/spl_modules/*.so + $(TMPXML)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/*.so dpkg-shlibdeps -Tdebian/$(PKGCURL).substvars -dDepends \ - $(TMPCURL)/usr/lib/spl_modules/*.so + $(TMPCURL)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/*.so dpkg-shlibdeps -Tdebian/$(PKGWEB).substvars -dDepends \ - $(TMPWEB)/usr/bin/* $(TMPWEB)/usr/lib/cgi-bin/* \ - $(TMPWEB)/usr/lib/spl_modules/*.so + $(TMPWEB)/usr/bin/* $(TMPWEB)/usr/lib/$(DEB_HOST_MULTIARCH)/cgi-bin/* \ + $(TMPWEB)/usr/lib/$(DEB_HOST_MULTIARCH)/spl_modules/*.so for i in $(ALLPKG) ; do \ dpkg-gencontrol -isp -Tdebian/$$i.substvars \ -p$$i -P$(CURDIR)/debian/$$i; \ diff -u spl-1.0~pre6/debian/control spl-1.0~pre6/debian/control --- spl-1.0~pre6/debian/control +++ spl-1.0~pre6/debian/control @@ -1,7 +1,8 @@ Source: spl Section: devel Priority: optional -Maintainer: Gerfried Fuchs +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Gerfried Fuchs Build-Depends: bison, libpcre3-dev, libexpat1-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev, libxml2-dev, libxslt1-dev, uuid-dev, libsdl-image1.2-dev, libcurl4-gnutls-dev, libreadline-dev, quilt, diff -u spl-1.0~pre6/debian/changelog spl-1.0~pre6/debian/changelog --- spl-1.0~pre6/debian/changelog +++ spl-1.0~pre6/debian/changelog @@ -1,3 +1,14 @@ +spl (1.0~pre6-4ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + + Add 03_ubuntu_multiarch: + debian/rules: Use multiarch locations. Fixes FTBFS. (LP: #852606) + - Prefer Debian's 02_fix-ld---as-needed-ftbfs, which means we need + to reverse-apply it in the actual source so that the patch will + apply upon `quilt push -a'. + + -- Vibhav Pant Sun, 02 Dec 2012 16:56:43 +0530 + spl (1.0~pre6-4) unstable; urgency=low * Add new patch fix-hurd-ftbfs provided by Svante Signell to fix FTBFS on @@ -6,6 +17,17 @@ -- Gerfried Fuchs Fri, 07 Sep 2012 10:31:58 +0200 +spl (1.0~pre6-3.1ubuntu1) quantal; urgency=low + + * Merge from Debian unstable. Remaining changes: + + Add 03_ubuntu_multiarch: + debian/rules: Use multiarch locations. Fixes FTBFS. (LP: #852606) + - Prefer Debian's 02_fix-ld---as-needed-ftbfs, which means we need + to reverse-apply it in the actual source so that the patch will + apply upon `quilt push -a'. + + -- Felix Geyer Thu, 26 Jul 2012 12:27:29 +0200 + spl (1.0~pre6-3.1) unstable; urgency=low * Non-maintainer upload. @@ -13,6 +35,23 @@ -- Jonathan Wiltshire Sat, 12 May 2012 11:01:33 +0100 +spl (1.0~pre6-3ubuntu2) precise; urgency=low + + * Rebuild for libmysqlclient transition + + -- Clint Byrum Thu, 24 Nov 2011 00:26:41 -0800 + +spl (1.0~pre6-3ubuntu1) oneiric; urgency=low + + * Merge from Debian unstable. Remaining changes: + + Add 03_ubuntu_multiarch: + debian/rules: Use multiarch locations. Fixes FTBFS. (LP: #852606) + - Prefer Debian's 02_fix-ld---as-needed-ftbfs, which means we need + to reverse-apply it in the actual source so that the patch will + apply upon `quilt push -a'. + + -- Daniel T Chen Thu, 22 Sep 2011 23:11:08 -0400 + spl (1.0~pre6-3) unstable; urgency=low * Fix FTBFS with ld --as-needed, thanks to Matthias Klose for the patch @@ -23,6 +62,12 @@ -- Gerfried Fuchs Wed, 14 Sep 2011 12:55:24 +0200 +spl (1.0~pre6-2ubuntu1) oneiric; urgency=low + + * Fix FTBFS with ld --as-needed. LP: #832785. + + -- Matthias Klose Tue, 13 Sep 2011 12:56:55 +0200 + spl (1.0~pre6-2) unstable; urgency=low * Brown paper bag release. Really change Build-Depends from libreadline5-dev @@ -199,0 +245 @@ + diff -u spl-1.0~pre6/debian/patches/series spl-1.0~pre6/debian/patches/series --- spl-1.0~pre6/debian/patches/series +++ spl-1.0~pre6/debian/patches/series @@ -3 +3,3 @@ +03_ubuntu_multiarch 03_fix-hurd-ftbfs only in patch2: unchanged: --- spl-1.0~pre6.orig/debian/patches/03_ubuntu_multiarch +++ spl-1.0~pre6/debian/patches/03_ubuntu_multiarch @@ -0,0 +1,25 @@ +Author: Daniel T Chen vim:ft=diff: +Description: Fix FTBFS with multiarch lib locations in Ubuntu Oneiric +Forwarded: no +Origin: Ubuntu +Bug-Ubuntu: http://launchpad.net/bugs/852606 +Last-Updated: 2011-09-22 + +Index: spl-1.0~pre6-3ubuntu1/GNUmakefile +=================================================================== +--- spl-1.0~pre6-3ubuntu1.orig/GNUmakefile 2011-09-22 23:20:35.000000000 -0400 ++++ spl-1.0~pre6-3ubuntu1/GNUmakefile 2011-09-22 23:20:27.000000000 -0400 +@@ -125,12 +125,7 @@ + cgibin_libdir = $(libdir) + else + bindir = $(prefix)/bin +- libdir = $(prefix)/lib +- ifeq ($(shell uname),Linux) +- ifeq ($(shell uname --hardware-platform),x86_64) +- libdir = $(prefix)/lib64 +- endif +- endif ++ libdir = $(prefix)/lib/$(DEB_HOST_MULTIARCH) + datadir = $(prefix)/share + includedir = $(prefix)/include + splmod_libdir = $(libdir)/spl_modules