r27707 - in /desktop/experimental/vino/debian: changelog copyright patches/03_config_h_defines.patch patches/config_h_defines.patch patches/series rules

Wed Apr 20 20:27:57 UTC 2011

Author: jordi
Date: Wed Apr 20 20:27:54 2011
New Revision: 27707

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27707
Log:
* Request NetworkManager support only if building on a Linux arch.
* Remove reference to BSD from common-licenses and instead add the
  headers of server/miniupnp/minixml.c and server/miniupnp/bsdqueue.h.
* Add a 03_ prefix to config_h_defines.patch for consistency.

Added:
    desktop/experimental/vino/debian/patches/03_config_h_defines.patch
      - copied unchanged from r27696, desktop/experimental/vino/debian/patches/config_h_defines.patch
Removed:
    desktop/experimental/vino/debian/patches/config_h_defines.patch
Modified:
    desktop/experimental/vino/debian/changelog
    desktop/experimental/vino/debian/copyright
    desktop/experimental/vino/debian/patches/series
    desktop/experimental/vino/debian/rules

Modified: desktop/experimental/vino/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/changelog?rev=27707&op=diff
==============================================================================

--- desktop/experimental/vino/debian/changelog [utf-8] (original)
+++ desktop/experimental/vino/debian/changelog [utf-8] Wed Apr 20 20:27:54 2011
@@ -1,3 +1,12 @@
+vino (3.0.0-2) experimental; urgency=low
+
+  * Request NetworkManager support only if building on a Linux arch.
+  * Remove reference to BSD from common-licenses and instead add the
+    headers of server/miniupnp/minixml.c and server/miniupnp/bsdqueue.h.
+  * Add a 03_ prefix to config_h_defines.patch for consistency.
+
+ -- Jordi Mallach <jordi at debian.org>  Wed, 20 Apr 2011 22:26:55 +0200
+
 vino (3.0.0-1) experimental; urgency=low
 
   * New upstream stable release.

Modified: desktop/experimental/vino/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/copyright?rev=27707&op=diff
==============================================================================
--- desktop/experimental/vino/debian/copyright [utf-8] (original)
+++ desktop/experimental/vino/debian/copyright [utf-8] Wed Apr 20 20:27:54 2011
@@ -133,6 +133,59 @@
 SOFTWARE.
 
 
-server/miniupnp/bsdqueue.h and server/miniupnp/minixml.c are licensed
-under the BSD license. The full text of the license can be found in
-/usr/share/common-licenses/BSD
+server/miniupnp/bsdqueue.h is licensed under the terms of the BSD license:
+
+   Copyright (c) 1991, 1993
+        The Regents of the University of California.  All rights reserved.
+  
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+   3. Neither the name of the University nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+  
+   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+
+server/miniupnp/minixml.c is licensed under the terms of the BSD license:
+
+   Copyright (c) 2005-2007, Thomas BERNARD 
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   * Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+   * The name of the author may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.

Modified: desktop/experimental/vino/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/patches/series?rev=27707&op=diff
==============================================================================
--- desktop/experimental/vino/debian/patches/series [utf-8] (original)
+++ desktop/experimental/vino/debian/patches/series [utf-8] Wed Apr 20 20:27:54 2011
@@ -1,4 +1,4 @@
-config_h_defines.patch
 01_ipv6-fix.patch
 02_server_sm-disable.patch
+03_config_h_defines.patch
 11_hurd_maxhostnamelen.patch

Modified: desktop/experimental/vino/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/rules?rev=27707&op=diff
==============================================================================
--- desktop/experimental/vino/debian/rules [utf-8] (original)
+++ desktop/experimental/vino/debian/rules [utf-8] Wed Apr 20 20:27:54 2011
@@ -14,9 +14,14 @@
 	--with-gcrypt		\
 	--with-gnutls		\
 	--with-gnome-keyring	\
-	--with-network-manager	\
 	--with-telepathy	\
 	--with-zlib
+
+# Request NetworkManager support only for Linux
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+DEB_CONFIGURE_EXTRA_FLAGS +=    \
+	--with-network-manager
+endif
 
 # drop unneeded ELF deps
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed


