On Thu, May 27, 2010 at 01:56:01PM -0430, Muammar El Khatib wrote:
> Hi Laurent,
>
> 2010/5/26 Laurent Bigonville <[email protected]>:
> > Package: amsn
> > Version: 0.98.3-1
> > Severity: Serious
> >
> > Hi,
> >
> > aMSN shouldn't compile with v4l support on non linux archs.
> > This prevents building on kfreebsd-*
> >
>
> Thanks for reporting, I am working on that from the message sent by
> Peter Green.
Attached debdiff makes amsn build on kFreeBSD again.
Sjoerd
--
Round Numbers are always false.
-- Samuel Johnson
diff -u amsn-0.98.3/debian/control amsn-0.98.3/debian/control
--- amsn-0.98.3/debian/control
+++ amsn-0.98.3/debian/control
@@ -2,7 +2,7 @@
Section: x11
Priority: optional
Maintainer: Muammar El Khatib <[email protected]>
-Build-Depends: debhelper (>= 6), tcl8.5-dev, tk8.5-dev, dpatch, libpng12-dev, libjpeg62-dev, libnice-dev, libgstreamer-plugins-base0.10-dev, libgstfarsight0.10-dev (>= 0.0.9), libv4l-dev, libgupnp-1.0-dev, libgupnp-igd-1.0-dev
+Build-Depends: debhelper (>= 6), tcl8.5-dev, tk8.5-dev, dpatch, libpng12-dev, libjpeg62-dev, libnice-dev, libgstreamer-plugins-base0.10-dev, libgstfarsight0.10-dev (>= 0.0.9), libv4l-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libgupnp-1.0-dev, libgupnp-igd-1.0-dev
Standards-Version: 3.8.4
Homepage: http://amsn.sourceforge.net/
diff -u amsn-0.98.3/debian/changelog amsn-0.98.3/debian/changelog
--- amsn-0.98.3/debian/changelog
+++ amsn-0.98.3/debian/changelog
@@ -1,3 +1,14 @@
+amsn (0.98.3-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/06_recognize_kfreebsd.patch.dpatch
+ + Added. Make configure recognize kFreeBSD as a BSD
+ * debian/rules
+ + Only special case the bits that are actually linux only
+ + Don't build-depend on libv4l-dev on GNU/KFreeBSD (Closes: #583187)
+
+ -- Sjoerd Simons <[email protected]> Tue, 08 Jun 2010 02:24:08 +0100
+
amsn (0.98.3-1) unstable; urgency=medium
* New upstream release.
diff -u amsn-0.98.3/debian/rules amsn-0.98.3/debian/rules
--- amsn-0.98.3/debian/rules
+++ amsn-0.98.3/debian/rules
@@ -98,21 +98,21 @@
# .so files go in /usr/lib
-ifeq ($(DEB_HOST_ARCH_OS),linux)
- # The following is Linux-only, see the FOUND_OS detection in Makefile.in
mv $(CURDIR)/debian/amsn-data/usr/share/amsn/utils/webcamsn $(CURDIR)/debian/amsn/usr/lib/amsn/utils
mv $(CURDIR)/debian/amsn-data/usr/share/amsn/amsn $(CURDIR)/debian/amsn/usr/share/amsn
mv $(CURDIR)/debian/amsn-data/usr/share/amsn/amsn-remote $(CURDIR)/debian/amsn/usr/share/amsn
mv $(CURDIR)/debian/amsn-data/usr/share/amsn/amsn-remote-CLI $(CURDIR)/debian/amsn/usr/share/amsn
mv $(CURDIR)/debian/amsn-data/usr/share/amsn/utils/TkCximage/* $(CURDIR)/debian/amsn/usr/lib/amsn/utils/TkCximage
- mv $(CURDIR)/debian/amsn-data/usr/share/amsn/utils/linux $(CURDIR)/debian/amsn/usr/lib/amsn/utils
mv $(CURDIR)/debian/amsn-data/usr/share/amsn/utils/tcl_siren $(CURDIR)/debian/amsn/usr/lib/amsn/utils
mv $(CURDIR)/debian/amsn-data/usr/share/amsn/utils/asyncresolver $(CURDIR)/debian/amsn/usr/lib/amsn/utils
mv $(CURDIR)/debian/amsn-data/usr/share/amsn/utils/farsight $(CURDIR)/debian/amsn/usr/lib/amsn/utils
mv $(CURDIR)/debian/amsn-data/usr/share/amsn/utils/tclISF $(CURDIR)/debian/amsn/usr/lib/amsn/utils
mv $(CURDIR)/debian/amsn-data/usr/share/amsn/utils/gupnp $(CURDIR)/debian/amsn/usr/lib/amsn/utils
- rm -f $(CURDIR)/debian/amsn-data/usr/share/amsn/utils/tcl_siren/src/*.o
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+ # The following is Linux-only, see the FOUND_OS detection in Makefile.in
+ mv $(CURDIR)/debian/amsn-data/usr/share/amsn/utils/linux $(CURDIR)/debian/amsn/usr/lib/amsn/utils
endif
+ rm -f $(CURDIR)/debian/amsn-data/usr/share/amsn/utils/tcl_siren/src/*.o
# Documentation files go in /usr/share/doc/amsn
cp -f $(CURDIR)/docs/* \
diff -u amsn-0.98.3/debian/patches/00list amsn-0.98.3/debian/patches/00list
--- amsn-0.98.3/debian/patches/00list
+++ amsn-0.98.3/debian/patches/00list
@@ -5,0 +6 @@
+06_recognize_kfreebsd.patch.dpatch
only in patch2:
unchanged:
--- amsn-0.98.3.orig/debian/patches/06_recognize_kfreebsd.patch.dpatch
+++ amsn-0.98.3/debian/patches/06_recognize_kfreebsd.patch.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_recognize_kfreebsd.patch.dpatch by <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' amsn-0.98.3~/configure amsn-0.98.3/configure
+--- amsn-0.98.3~/configure 2010-03-06 22:29:12.000000000 +0000
++++ amsn-0.98.3/configure 2010-06-08 02:17:18.385084460 +0100
+@@ -2255,7 +2255,7 @@
+ Linux)
+ FOUND_OS="linux"
+ ;;
+- OpenBSD | FreeBSD | NetBSD)
++ *BSD)
+ # *BSD has important stuff (from ports)
+ # in /usr/local ...
+ CFLAGS="$CFLAGS -I/usr/local/include -L/usr/local/lib"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' amsn-0.98.3~/configure.ac amsn-0.98.3/configure.ac
+--- amsn-0.98.3~/configure.ac 2010-03-06 22:29:12.000000000 +0000
++++ amsn-0.98.3/configure.ac 2010-06-08 02:17:01.553086067 +0100
+@@ -48,7 +48,7 @@
+ Linux)
+ FOUND_OS="linux"
+ ;;
+- OpenBSD | FreeBSD | NetBSD)
++ *BSD)
+ # *BSD has important stuff (from ports)
+ # in /usr/local ...
+ CFLAGS="$CFLAGS -I/usr/local/include -L/usr/local/lib"
