Hi Julien, Hi Evgeni On Tue, Jan 08, 2013 at 10:37:45PM +0100, Julien Cristau wrote: > Control: reopen -1 > > On Sat, Jan 5, 2013 at 19:37:25 +0100, Evgeni Golov wrote: > > > tags 697221 + pending > > thanks > > > > Dear maintainer, > > > > I've prepared an NMU for motion (versioned as 3.2.12-3.3) and > > uploaded it to DELAYED/2. Please feel free to tell me if I > > should delay it longer. > > > > Regards. > > > diff -Nru motion-3.2.12/debian/changelog motion-3.2.12/debian/changelog > > --- motion-3.2.12/debian/changelog 2012-06-06 12:25:16.000000000 +0200 > > +++ motion-3.2.12/debian/changelog 2013-01-05 19:25:43.000000000 +0100 > > @@ -1,3 +1,14 @@ > > +motion (3.2.12-3.3) unstable; urgency=low > > + > > + * Non-maintainer upload. > > + * Properly find MySQL in /usr/lib/$(DEB_HOST_MULTIARCH). > > + + Build-Depend on dpkg-dev >= 1.16 > > + + Get DEB_HOST_MULTIARCH from dpkg-architecture. > > + + Pass --with-mysql-dir=/usr/lib/$(DEB_HOST_MULTIARCH) to configure. > > 1) since you don't have a versioned build-dep on multiarched > libmysqlclient-dev you don't know that it's there > 2) this thing should just use AC_CHECK_LIBS already.
How about the attached patch? I tried to implement similar how to detect the multiarch libavcodec path. Attached is the debdiff against the current version in testing, the debdiff against current unstable and the patch 03_mysql_multiarch.patch. Regards, Salvatore
diff -Nru motion-3.2.12/debian/changelog motion-3.2.12/debian/changelog --- motion-3.2.12/debian/changelog 2012-06-06 12:25:16.000000000 +0200 +++ motion-3.2.12/debian/changelog 2013-01-12 20:37:55.000000000 +0100 @@ -1,3 +1,27 @@ +motion (3.2.12-3.4) unstable; urgency=low + + * Non-maintainer upload. + * Revert changes done in previous upload + * Add 03_mysql_multiarch.patch patch. + Autodetect multiarch libmysqlclient path in autoconf. (Closes: #697221) + * Change Build-Depends for libmysqlclient-dev. + Make the Build-Depends on libmysqlclient-dev versioned on (>= 5.5.17-4) + for having multiarch support in libmysqlclient-dev. + * Bump versioned Build-Depends on dpkg-dev to (>= 1.16.2) + + -- Salvatore Bonaccorso <car...@debian.org> Sat, 12 Jan 2013 20:37:27 +0100 + +motion (3.2.12-3.3) unstable; urgency=low + + * Non-maintainer upload. + * Properly find MySQL in /usr/lib/$(DEB_HOST_MULTIARCH). + + Build-Depend on dpkg-dev >= 1.16 + + Get DEB_HOST_MULTIARCH from dpkg-architecture. + + Pass --with-mysql-dir=/usr/lib/$(DEB_HOST_MULTIARCH) to configure. + Closes: #697221 + + -- Evgeni Golov <evg...@debian.org> Thu, 03 Jan 2013 12:00:38 +0100 + motion (3.2.12-3.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru motion-3.2.12/debian/control motion-3.2.12/debian/control --- motion-3.2.12/debian/control 2012-06-06 11:36:07.000000000 +0200 +++ motion-3.2.12/debian/control 2013-01-12 20:37:55.000000000 +0100 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Juan Angulo Moreno <j...@apuntale.com> HomePage: http://motion.sf.net -Build-Depends: debhelper (>= 6), dh-autoreconf, libjpeg-dev, zlib1g-dev, libavcodec-dev, libavformat-dev, libpq-dev, libmysqlclient-dev, libv4l-dev +Build-Depends: debhelper (>= 6), dpkg-dev (>= 1.16.2), dh-autoreconf, libjpeg-dev, zlib1g-dev, libavcodec-dev, libavformat-dev, libpq-dev, libmysqlclient-dev (>= 5.5.17-4), libv4l-dev Standards-Version: 3.9.2 Package: motion diff -Nru motion-3.2.12/debian/patches/03_mysql_multiarch.patch motion-3.2.12/debian/patches/03_mysql_multiarch.patch --- motion-3.2.12/debian/patches/03_mysql_multiarch.patch 1970-01-01 01:00:00.000000000 +0100 +++ motion-3.2.12/debian/patches/03_mysql_multiarch.patch 2013-01-12 20:37:55.000000000 +0100 @@ -0,0 +1,18 @@ +Description: Description: Autodetect multiarch libmysqlclient path in autoconf. +Origin: vendor +Bug-Debian: http://bugs.debian.org/697221 +Forwarded: no +Author: Salvatore Bonaccorso <car...@debian.org> +Last-Update: 2013-01-12 + +--- a/configure.in ++++ b/configure.in +@@ -551,7 +551,7 @@ + if test "${MYSQL_LIBS}" = "yes"; then + AC_MSG_CHECKING(autodect mysql libs) + # Autodetect +- for w in /usr/lib64 /usr/lib /usr/local/lib /usr/mysql /usr/local/mysql /usr/local/mysql/lib /opt /opt/mysql; do ++ for w in /usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH); do + # check for plain setups + if test -f $w/libmysqlclient.a -o -f $w/libmysqlclient.so; then + MYSQL_LIBDIR=$w diff -Nru motion-3.2.12/debian/patches/series motion-3.2.12/debian/patches/series --- motion-3.2.12/debian/patches/series 2012-02-12 22:16:11.000000000 +0100 +++ motion-3.2.12/debian/patches/series 2013-01-12 20:37:55.000000000 +0100 @@ -4,3 +4,4 @@ 020111027~5dd9ed4.patch 01_videodev.h.diff 02_libav_multiarch.patch +03_mysql_multiarch.patch
diff -Nru motion-3.2.12/debian/changelog motion-3.2.12/debian/changelog --- motion-3.2.12/debian/changelog 2013-01-05 19:25:43.000000000 +0100 +++ motion-3.2.12/debian/changelog 2013-01-12 20:37:55.000000000 +0100 @@ -1,3 +1,16 @@ +motion (3.2.12-3.4) unstable; urgency=low + + * Non-maintainer upload. + * Revert changes done in previous upload + * Add 03_mysql_multiarch.patch patch. + Autodetect multiarch libmysqlclient path in autoconf. (Closes: #697221) + * Change Build-Depends for libmysqlclient-dev. + Make the Build-Depends on libmysqlclient-dev versioned on (>= 5.5.17-4) + for having multiarch support in libmysqlclient-dev. + * Bump versioned Build-Depends on dpkg-dev to (>= 1.16.2) + + -- Salvatore Bonaccorso <car...@debian.org> Sat, 12 Jan 2013 20:37:27 +0100 + motion (3.2.12-3.3) unstable; urgency=low * Non-maintainer upload. diff -Nru motion-3.2.12/debian/control motion-3.2.12/debian/control --- motion-3.2.12/debian/control 2013-01-05 19:25:27.000000000 +0100 +++ motion-3.2.12/debian/control 2013-01-12 20:37:55.000000000 +0100 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Juan Angulo Moreno <j...@apuntale.com> HomePage: http://motion.sf.net -Build-Depends: debhelper (>= 6), dpkg-dev (>= 1.16), dh-autoreconf, libjpeg-dev, zlib1g-dev, libavcodec-dev, libavformat-dev, libpq-dev, libmysqlclient-dev, libv4l-dev +Build-Depends: debhelper (>= 6), dpkg-dev (>= 1.16.2), dh-autoreconf, libjpeg-dev, zlib1g-dev, libavcodec-dev, libavformat-dev, libpq-dev, libmysqlclient-dev (>= 5.5.17-4), libv4l-dev Standards-Version: 3.9.2 Package: motion diff -Nru motion-3.2.12/debian/patches/03_mysql_multiarch.patch motion-3.2.12/debian/patches/03_mysql_multiarch.patch --- motion-3.2.12/debian/patches/03_mysql_multiarch.patch 1970-01-01 01:00:00.000000000 +0100 +++ motion-3.2.12/debian/patches/03_mysql_multiarch.patch 2013-01-12 20:37:55.000000000 +0100 @@ -0,0 +1,18 @@ +Description: Description: Autodetect multiarch libmysqlclient path in autoconf. +Origin: vendor +Bug-Debian: http://bugs.debian.org/697221 +Forwarded: no +Author: Salvatore Bonaccorso <car...@debian.org> +Last-Update: 2013-01-12 + +--- a/configure.in ++++ b/configure.in +@@ -551,7 +551,7 @@ + if test "${MYSQL_LIBS}" = "yes"; then + AC_MSG_CHECKING(autodect mysql libs) + # Autodetect +- for w in /usr/lib64 /usr/lib /usr/local/lib /usr/mysql /usr/local/mysql /usr/local/mysql/lib /opt /opt/mysql; do ++ for w in /usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH); do + # check for plain setups + if test -f $w/libmysqlclient.a -o -f $w/libmysqlclient.so; then + MYSQL_LIBDIR=$w diff -Nru motion-3.2.12/debian/patches/series motion-3.2.12/debian/patches/series --- motion-3.2.12/debian/patches/series 2012-02-12 22:16:11.000000000 +0100 +++ motion-3.2.12/debian/patches/series 2013-01-12 20:37:55.000000000 +0100 @@ -4,3 +4,4 @@ 020111027~5dd9ed4.patch 01_videodev.h.diff 02_libav_multiarch.patch +03_mysql_multiarch.patch diff -Nru motion-3.2.12/debian/rules motion-3.2.12/debian/rules --- motion-3.2.12/debian/rules 2013-01-05 19:25:27.000000000 +0100 +++ motion-3.2.12/debian/rules 2013-01-12 20:37:55.000000000 +0100 @@ -3,7 +3,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + CFLAGS = -Wall -g LDFLAGS = -Wl,--as-needed @@ -32,7 +32,6 @@ --sysconfdir=/etc/motion \ --with-ffmpeg \ --with-mysql \ - --with-mysql-lib=/usr/lib/$(DEB_HOST_MULTIARCH) \ --with-pgsql \ --without-optimizecpu \ --without-jpeg-mmx
Description: Description: Autodetect multiarch libmysqlclient path in autoconf. Origin: vendor Bug-Debian: http://bugs.debian.org/697221 Forwarded: no Author: Salvatore Bonaccorso <car...@debian.org> Last-Update: 2013-01-12 --- a/configure.in +++ b/configure.in @@ -551,7 +551,7 @@ if test "${MYSQL_LIBS}" = "yes"; then AC_MSG_CHECKING(autodect mysql libs) # Autodetect - for w in /usr/lib64 /usr/lib /usr/local/lib /usr/mysql /usr/local/mysql /usr/local/mysql/lib /opt /opt/mysql; do + for w in /usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH); do # check for plain setups if test -f $w/libmysqlclient.a -o -f $w/libmysqlclient.so; then MYSQL_LIBDIR=$w
signature.asc
Description: Digital signature
