Please merge zoneminder 1.25.0-3 (universe) from Debian Unstable

Debdiff between zoneminder_1.25.0-1.1ubuntu1.dsc and zoneminder_1.25.0-3ubuntu1.dsc:

Debdiff between zoneminder_1.25.0-3.dsc (debian version) and zoneminder_1.25.0-3ubuntu1.dsc:

zoneminder FTBFS on amd64:

x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I.. -I/usr/include -I/usr/include -Wall -Wno-sign-compare -fno-inline -I/usr/include -D_FORTIFY_SOURCE=2 -D__STDC_CONSTANT_MACROS -D__STDC_CONSTANT_MACROS -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO -MT zm_local_camera.o -MD -MP -MF .deps/zm_local_camera.Tpo -c -o zm_local_camera.o zm_local_camera.cpp
zm_local_camera.cpp: In member function 'void LocalCamera::Terminate()':
zm_local_camera.cpp:742:49: error: invalid conversion from '__u32 {aka unsigned int}' to 'v4l2_buf_type' [-fpermissive]
zm_local_camera.cpp: In member function 'virtual int LocalCamera::PrimeCapture()':
zm_local_camera.cpp:1522:49: error: invalid conversion from '__u32 {aka unsigned int}' to 'v4l2_buf_type' [-fpermissive]
make[3]: *** [zm_local_camera.o] Error 1
make[3]: Leaving directory `/tmp/buildd/zoneminder-1.25.0/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/tmp/buildd/zoneminder-1.25.0'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/tmp/buildd/zoneminder-1.25.0'
dh_auto_build: make -j1 returned exit code 2
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2
E: Failed autobuilding of package

Please, re-add ubuntu universe sponsors once fixed.

Hi,
sorry for the issue.
I fixed that with a patch already uploaded on Fedora: http://tinyurl.com/blznndx

Debdiff between zoneminder_1.25.0-1.1ubuntu1.dsc and zoneminder_1.25.0-3ubuntu1.dsc:

Diff between zoneminder_1.25.0-3.dsc and zoneminder_1.25.0-3ubuntu1.dsc:

Build log: http://paste.ubuntu.com/1335670/

Thanks for the patch. I have uploaded it with small modifications:

1) I removed the added last empty line from debian/changelog
2) I added ".patch" to the filename of the patch (I know that the other patches do not have a file ending, but adding .patch will give them the correct mimetype)
3) I corrected the indentation of the changed files in the patch (your patch added tabs instead of spaces).

Can you forward the added libnet-sftp-foreign-perl dependency to Debian? Can you recommend the usage of wrap-and-sort to the Debian maintainer? This will increase the readability of debdiffs. Thanks.

This bug was fixed in the package zoneminder - 1.25.0-3ubuntu1

---------------
zoneminder (1.25.0-3ubuntu1) raring; urgency=low

  * Fix FTBFS on amd64.
  * Merge from Debian unstable. (LP: #1074962) Remaining changes:
    - Add libnet-sftp-foreign-perl to dependencies.

zoneminder (1.25.0-3) unstable; urgency=low

  * debian/rules: Export CFLAGS, CPPFLAGS, CXXFLAGS and LDFLAGS, to ensure
    hardening build flags are enabled.

zoneminder (1.25.0-2) unstable; urgency=low

  [ Vagrant Cascadian ]
  * Add a patch to disable checking for updated versions by default, as
    upgrades should happen through package management.
  * Use dpkg-buildflags in debian/rules to set default compiler flags.
  * Ensure zoneminder is stopped before starting (Closes: #657407).

  [ Peter Howard ]
  * Fix postinst to add permission for table creation during upgrade
    (Closes: #657407).
 -- Paolo Rotolo <email address hidden> Mon, 05 Nov 2012 21:50:05 +0100