Bug#583187: aMSN shouldn't compile with v4l support on non linux archs

2010-06-13 Thread Sjoerd Simons
On Sat, Jun 12, 2010 at 04:06:43PM -0430, Muammar El Khatib wrote:
 On 12/06/2010 06:39, Sjoerd Simons wrote:
  On Wed, Jun 09, 2010 at 11:20:27AM -0430, Muammar El Khatib wrote:
  On 07/06/2010 21:31, Sjoerd Simons wrote:
 
  Attached debdiff makes amsn build on kFreeBSD again.
 
 
  Thanks for the patch, but with it, aMSN fails to load in other
  architectures e.g. amd64 (see pictures attached). The reason is because
  the files listed in Makefile.in in FOUND_OS for linux are not in their
  respective places.
  
  Looking at the debdiff i supplied i'm not sure how that could happen unless
  it was a pre-existing issue. For the linux build all files should still end
  up in the same location as before. Also the amsn package i build on my
  machine seem to start fine (although i don't use msn so i couldn't test any
  further)
  
 
 I apologize. I applied again your debdiff, and it works perfectly. I had
 done something wrong. I'll upload the package with your patch.

No worries :)

  Any updates on this, it's blocking a whole set of my packages from going
  into testing which is starting to become quite annoying :)
  
 
 Laurent offered me to upload the package for me. So I will ask him for
 sponsorship.

I just saw it make it's way in. Good work, hopefully it'll nicely go through ot
testing :)

  Sjoerd
-- 
The instruments of science do not in themselves discover truth.  And there are
searchings that are not concluded by the coincidence of a pointer and a mark.
-- Fred Saberhagen, The Berserker Wars



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#583187: aMSN shouldn't compile with v4l support on non linux archs

2010-06-12 Thread Sjoerd Simons
On Wed, Jun 09, 2010 at 11:20:27AM -0430, Muammar El Khatib wrote:
 On 07/06/2010 21:31, Sjoerd Simons wrote:
  
  Attached debdiff makes amsn build on kFreeBSD again.
  
 
 Thanks for the patch, but with it, aMSN fails to load in other
 architectures e.g. amd64 (see pictures attached). The reason is because
 the files listed in Makefile.in in FOUND_OS for linux are not in their
 respective places.

Looking at the debdiff i supplied i'm not sure how that could happen unless it
was a pre-existing issue. For the linux build all files should still end up in
the same location as before. Also the amsn package i build on my machine seem
to start fine (although i don't use msn so i couldn't test any further)

Any updates on this, it's blocking a whole set of my packages from going into
testing which is starting to become quite annoying :)

  Sjoerd
-- 
Chemist who falls in acid is absorbed in work.



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#583187: aMSN shouldn't compile with v4l support on non linux archs

2010-06-12 Thread Muammar El Khatib
On 12/06/2010 06:39, Sjoerd Simons wrote:
 On Wed, Jun 09, 2010 at 11:20:27AM -0430, Muammar El Khatib wrote:
 On 07/06/2010 21:31, Sjoerd Simons wrote:

 Attached debdiff makes amsn build on kFreeBSD again.


 Thanks for the patch, but with it, aMSN fails to load in other
 architectures e.g. amd64 (see pictures attached). The reason is because
 the files listed in Makefile.in in FOUND_OS for linux are not in their
 respective places.
 
 Looking at the debdiff i supplied i'm not sure how that could happen unless it
 was a pre-existing issue. For the linux build all files should still end up in
 the same location as before. Also the amsn package i build on my machine seem
 to start fine (although i don't use msn so i couldn't test any further)
 

I apologize. I applied again your debdiff, and it works perfectly. I had
done something wrong. I'll upload the package with your patch.

 Any updates on this, it's blocking a whole set of my packages from going into
 testing which is starting to become quite annoying :)
 

Laurent offered me to upload the package for me. So I will ask him for
sponsorship.

Regards,
-- 
Muammar El Khatib.
Linux user: 403107.
Key fingerprint = 90B8 BFC4 4A75 B881 39A3 1440 30EB 403B 1270 29F1
http://muammar.me | http://proyectociencia.org
  ,''`.
 : :' :
 `. `'
   `-



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#583187: aMSN shouldn't compile with v4l support on non linux archs

2010-06-07 Thread Sjoerd Simons
On Thu, May 27, 2010 at 01:56:01PM -0430, Muammar El Khatib wrote:
 Hi Laurent,
 
 2010/5/26 Laurent Bigonville bi...@debian.org:
  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 muammarelkha...@gmail.com
-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 sjo...@debian.org  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  sjo...@debian.org
+##
+## 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.0 +
 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' 

Bug#583187: aMSN shouldn't compile with v4l support on non linux archs

2010-05-27 Thread Muammar El Khatib
Hi Laurent,

2010/5/26 Laurent Bigonville bi...@debian.org:
 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.

Regards,
-- 
Muammar El Khatib.
Linux user: 403107.
GPG Key = 127029F1
http://muammar.me | http://proyectociencia.org
  ,''`.
 : :' :
 `. `'
   `-



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#583187: aMSN shouldn't compile with v4l support on non linux archs

2010-05-26 Thread Laurent Bigonville
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-*

Best Regards

Laurent Bigonville



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#583187: aMSN shouldn't compile with v4l support on non linux archs

2010-05-26 Thread peter green
I tried changing the build-dependency from libv4l-dev to libv4l-dev 
[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] however the build then 
failed on kfreebsd-i386 with a seemingly unrelated error.


`/root/amsn-0.98.3/debian/amsn-data/usr/share/amsn/utils/asyncresolver/libasyncresolver.so': 
No such file or directory





--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org