[Pkg-utopia-commits] r3362 - in /packages/unstable/avahi/debian: changelog control copyright rules
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed Jan 13 20:04:21 UTC 2010
Author: biebl
Date: Wed Jan 13 20:04:09 2010
New Revision: 3362
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3362
Log:
Small formatting changes (white space cleanup etc)
Modified:
packages/unstable/avahi/debian/changelog
packages/unstable/avahi/debian/control
packages/unstable/avahi/debian/copyright
packages/unstable/avahi/debian/rules
Modified: packages/unstable/avahi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/changelog?rev=3362&op=diff
==============================================================================
--- packages/unstable/avahi/debian/changelog (original)
+++ packages/unstable/avahi/debian/changelog Wed Jan 13 20:04:09 2010
@@ -3,8 +3,7 @@
[ Michael Biebl ]
* patches/15-manpage-typo-fixes.patch
- Fix a few typos in the man pages (s/seperated/separated/).
- (Closes: #525268)
- Thanks to A. Costa for the patch.
+ Thanks to A. Costa for the patch. (Closes: #525268)
[ Sjoerd Simons ]
* debian/avahi-daemon-check-dns.sh
@@ -25,7 +24,7 @@
avahi (0.6.24-3) unstable; urgency=low
- * Switch patch management system to quilt.
+ * Switch patch management system to quilt.
* debian/control
- Change Section of avahi-dbg to debug.
- Bump Standards-Version to 3.8.1. No further changes.
@@ -50,7 +49,7 @@
avahi (0.6.24-2) unstable; urgency=low
- * Merge changes from experimental branch.
+ * Merge changes from experimental branch.
* debian/compat
- Bump to debhelper v7 compat mode.
* debian/control
Modified: packages/unstable/avahi/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/control?rev=3362&op=diff
==============================================================================
--- packages/unstable/avahi/debian/control (original)
+++ packages/unstable/avahi/debian/control Wed Jan 13 20:04:09 2010
@@ -5,7 +5,7 @@
Uploaders: Sjoerd Simons <sjoerd at debian.org>,
Sebastian Dröge <slomo at debian.org>,
Loic Minier <lool at dooz.org>,
- Michael Biebl <biebl at debian.org>
+ Michael Biebl <biebl at debian.org>
Build-Depends: debhelper (>= 7),
cdbs (>= 0.4.43),
pkg-config,
Modified: packages/unstable/avahi/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/copyright?rev=3362&op=diff
==============================================================================
--- packages/unstable/avahi/debian/copyright (original)
+++ packages/unstable/avahi/debian/copyright Wed Jan 13 20:04:09 2010
@@ -30,13 +30,13 @@
See /usr/share/common-licenses/LGPL-2.1 on your debian system.
-The xml to man conversion files
+The xml to man conversion files
(man/{xmltoman.css, xmltoman.dtd, xmltoman.xsl}) are under the GNU General
-Public License 2. See /usr/share/common-licenses/GPL-2 on your debian system.
-
+Public License 2. See /usr/share/common-licenses/GPL-2 on your debian system.
+
SimpleGladeApp.in from avahi-python (avahi-python/avahi/SimpleGladeApp.py) is
copyright Sandino Flores Moreno under the GNU Lesser General Public version
-2.1. See /usr/share/common-licenses/LGPL-2.1 on your debian system.
+2.1. See /usr/share/common-licenses/LGPL-2.1 on your debian system.
common/acx_pthread.m4 is copyright Steven G. Johnson <stevenj at alum.mit.edu>
under the GPL with the exception that it can be used with configure files
@@ -49,7 +49,7 @@
Which is the GNU General Public License version 2. See
/usr/share/common-licenses/GPL-2 on your debian system.
-All the avahi-compat-howl public headers (avahi-compat-howl/include/*) and
+All the avahi-compat-howl public headers (avahi-compat-howl/include/*) and
avahi-compat-howl sample code (avahi-compat-howl/samples/*.c) are:
Copyright 2003, 2004 Porchdog Software. All rights reserved.
@@ -57,11 +57,11 @@
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.
+ 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.
-
+
THIS SOFTWARE IS PROVIDED BY PORCHDOG SOFTWARE ``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
@@ -72,7 +72,7 @@
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.
-
+
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of Porchdog Software.
@@ -80,26 +80,26 @@
The avahi-compat-libdns_sd public header (avahi-compat-libdns_sd/dns_sd.h) is:
Copyright (c) 2003-2004, Apple Computer, Inc. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
+
+ 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 Apple Computer, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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
+
+ 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 Apple Computer, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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: packages/unstable/avahi/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/rules?rev=3362&op=diff
==============================================================================
--- packages/unstable/avahi/debian/rules (original)
+++ packages/unstable/avahi/debian/rules Wed Jan 13 20:04:09 2010
@@ -19,7 +19,7 @@
# Only enable the stack protector on certain archs
ifeq (,$(filter $(DEB_HOST_ARCH), powerpc s390 sparc amd64 i386 lpia))
- DEB_CONFIGURE_EXTRA_FLAGS += --disable-stack-protector
+ DEB_CONFIGURE_EXTRA_FLAGS += --disable-stack-protector
endif
ifneq (linux,$(DEB_HOST_ARCH_OS))
More information about the Pkg-utopia-commits
mailing list