[Pkg-erlang-commits] r1819 - yaws/trunk/debian

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Thu Aug 18 08:55:08 UTC 2016 

Author: sgolovan
Date: 2016-08-18 08:55:08 +0000 (Thu, 18 Aug 2016)
New Revision: 1819

Modified:
   yaws/trunk/debian/changelog
   yaws/trunk/debian/copyright
   yaws/trunk/debian/erlang-yaws.README.Debian
   yaws/trunk/debian/rules
   yaws/trunk/debian/watch
Log:
[yaws]
  * Removed files priv/soap.xsd, priv/wsdl.xsd, priv/wsdl11soap12.xsd
    from the source and binary packages because they aren't DFSG-free (they
    don't permit modification). Documented this in README.Debian.
    Closes: #810889.


Modified: yaws/trunk/debian/changelog
===================================================================
--- yaws/trunk/debian/changelog	2016-08-18 06:52:05 UTC (rev 1818)
+++ yaws/trunk/debian/changelog	2016-08-18 08:55:08 UTC (rev 1819)
@@ -1,8 +1,11 @@
-yaws (2.0.3-3) UNRELEASED; urgency=medium
+yaws (2.0.3+dfsg-1) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * Removed files priv/soap.xsd, priv/wsdl.xsd, priv/wsdl11soap12.xsd
+    from the source and binary packages because they aren't DFSG-free (they
+    don't permit modification). Documented this in README.Debian.
+    Closes: #810889.
 
- -- Sergei Golovan <sgolovan at debian.org>  Tue, 26 Jul 2016 14:05:34 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 18 Aug 2016 11:33:58 +0300
 
 yaws (2.0.3-2) unstable; urgency=medium
 

Modified: yaws/trunk/debian/copyright
===================================================================
--- yaws/trunk/debian/copyright	2016-08-18 06:52:05 UTC (rev 1818)
+++ yaws/trunk/debian/copyright	2016-08-18 08:55:08 UTC (rev 1819)
@@ -7,6 +7,8 @@
 
 Copyright (c) 2006, Claes Wikstrom, klacke at hyber.org. All Rights Reserved
 
+Removed files: priv/soap.xsd priv/wsdl.xsd priv/wsdl11soap12.xsd
+Reason: These files aren't DFSG-free.
 
 Files: *
 Copyright: 2006 Claes Wikstrom, klacke at hyber.org. All Rights Reserved
@@ -36,7 +38,7 @@
 License: X11
 
 
-Files: c_src/hashtable_private.h, c_src/hashtable.c, c_src/hashtable.h
+Files: c_src/hashtable_private.h c_src/hashtable.c c_src/hashtable.h
 Copyright: 2002, 2004 Christopher Clark <firstname.lastname at cl.cam.ac.uk>
 License: BSD
 
@@ -57,7 +59,7 @@
 License: BSD-2
 
 
-Files: src/yaws_jsonrpc.erl, src/yaws_rpc.erl, src/yaws_xmlrpc.erl
+Files: src/yaws_jsonrpc.erl src/yaws_rpc.erl src/yaws_xmlrpc.erl
 Copyright: 2003 Joakim Grebenö <jocke at gleipnir.com>
            2006 Gaspar Chilingarov <nm at web.am>
                 Gurgen Tumanyan <barbarian at armkb.com>
@@ -69,7 +71,7 @@
 License: Apache-2
 
 
-Files: */Makefile.in, aclocal.m4, m4/*, configure
+Files: */Makefile.in aclocal.m4 m4/* configure
 Copyright: 1994-2013 Free Software Foundation, Inc.
 License: permissive
  This file is free software; the Free Software Foundation
@@ -82,7 +84,7 @@
  PARTICULAR PURPOSE.
 
 
-Files: src/haxe.erl, src/json2.erl, src/json.erl
+Files: src/haxe.erl src/json2.erl src/json.erl
 Copyright (c) 2005-2006, A2Z Development USA, Inc. All Rights Reserved
 License: EPL-1.1
  The contents of this file are subject to the Erlang Public License,
@@ -100,7 +102,7 @@
  All Rights Reserved.
 
 
-Files: contrib/benchmarks/all.erl, contrib/benchmarks/bench.erl, contrib/benchmarks/bench.hrl
+Files: contrib/benchmarks/all.erl contrib/benchmarks/bench.erl contrib/benchmarks/bench.hrl
 Copyright (c) 1999, Ericsson Utvecklings AB. All Rights Reserved
 License: EPL-1.1
  ``The contents of this file are subject to the Erlang Public License,
@@ -119,90 +121,7 @@
  AB. All Rights Reserved.''
 
 
-Files: priv/wsdl11soap12.xsd
-Copyright: 2001-2006, International Business Machines Corporation and Microsoft Corporation, All Rights Reserved
-License: WSDL1
- License for WSDL 1.1 Binding Extension for SOAP 1.2 Schema Files
- .
- The Authors grant permission to copy and distribute the WSDL 1.1
- Binding Extension for SOAP 1.2 Schema Files in any medium without
- fee or royalty as long as this notice and license are distributed
- with them.  The originals of these files can be located at:
- .
- http://schemas.xmlsoap.org/wsdl/soap12/wsdl11soap12.xsd
- .
- THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO
- REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE
- FILES, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.  THE
- AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
- INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO
- ANY USE OR DISTRIBUTION OF THESE FILES.
- .
- The name and trademarks of the Authors may NOT be used in any manner,
- including advertising or publicity pertaining to these files or any
- program or service that uses these files, written prior permission.
- Title to copyright in these files will at all times remain with the
- Authors.
- .
- No other rights are granted by implication, estoppel or otherwise.
-
-
-Files: priv/wsdl.xsd
-Copyright: 2001-2005, International Business Machines Corporation and Microsoft Corporation, All Rights Reserved
-License: WSDL2
- License for WSDL Schema Files
- .
- The Authors grant permission to copy and distribute the WSDL Schema
- Files in any medium without fee or royalty as long as this notice and
- license are distributed with them.  The originals of these files can
- be located at:
- .
- http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd
- .
- THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS
- OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT
- LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
- NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT,
- INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR
- RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
- .
- The name and trademarks of the Authors may NOT be used in any manner,
- including advertising or publicity pertaining to these files or any program
- or service that uses these files, written prior permission.  Title to copyright
- in these files will at all times remain with the Authors.
- .
- No other rights are granted by implication, estoppel or otherwise.
-
-
-Files: priv/soap.xsd
-Copyright: 2001-2005, International Business Machines Corporation and Microsoft Corporation, All Rights Reserved
-License: WSDL3
- License for WSDL Schema Files
- .
- The Authors grant permission to copy and distribute the WSDL Schema
- Files in any medium without fee or royalty as long as this notice and
- license are distributed with them.  The originals of these files can
- be located at:
- .
- http://schemas.xmlsoap.org/wsdl/soap/2003-02-11.xsd
- .
- THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS
- OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT
- LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
- NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT,
- INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR
- RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
- .
- The name and trademarks of the Authors may NOT be used in any manner,
- including advertising or publicity pertaining to these files or any program
- or service that uses these files, written prior permission.  Title to copyright
- in these files will at all times remain with the Authors.
- .
- No other rights are granted by implication, estoppel or otherwise.
-
-
-Files: priv/envelope.xsd, priv/soap-envelope.xsd
+Files: priv/envelope.xsd priv/soap-envelope.xsd
 Copyright: 2001-2003 W3C(R) (MIT, ERCIM, Keio), All Rights Reserved.
 License: W3C
  By obtaining, using and/or copying this work, you (the licensee) agree

Modified: yaws/trunk/debian/erlang-yaws.README.Debian
===================================================================
--- yaws/trunk/debian/erlang-yaws.README.Debian	2016-08-18 06:52:05 UTC (rev 1818)
+++ yaws/trunk/debian/erlang-yaws.README.Debian	2016-08-18 08:55:08 UTC (rev 1819)
@@ -6,4 +6,21 @@
     -I/usr/lib/yaws/include
 to Erlang compiler options.
 
- -- Sergei Golovan <sgolovan at debian.org>  Wed, 05 May 2010 21:44:51 +0400
+------------------------------------------------------------------------
+
+Note that files /usr/lib/yaws/priv/soap.xsd, /usr/lib/yaws/priv/wsdl.xsd,
+and /usr/lib/yaws/priv/wsdl11soap12.xsd have to be removed from the
+Yaws Debian package because they aren't DFSG-free. They don't permit
+modification. So, if you want to use SOAP in Yaws, you'll have to
+
+1. Download the three missing files:
+    wget -O soap.xsd http://schemas.xmlsoap.org/wsdl/soap/2003-02-11.xsd
+    wget http://schemas.xmlsoap.org/wsdl/soap12/wsdl11soap12.xsd
+    wget -O wsdl.xsd http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd
+
+2. Put them into the /usr/lib/yaws/priv directory.
+
+3. Follow the instructions from http://yaws.hyber.org/soap_intro.yaws
+   to actually setup and enable SOAP in your Yaws installation.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 18 Aug 2016 11:28:21 +0300

Modified: yaws/trunk/debian/rules
===================================================================
--- yaws/trunk/debian/rules	2016-08-18 06:52:05 UTC (rev 1818)
+++ yaws/trunk/debian/rules	2016-08-18 08:55:08 UTC (rev 1819)
@@ -161,6 +161,14 @@
 
 get-orig-source:
 	wget -O yaws_$(v).orig.tar.gz http://yaws.hyber.org/download/yaws-$(v).tar.gz
+	CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/yaws.XXXXXX` && \
+	cd $$TMPDIR && \
+	wget -O - http://yaws.hyber.org/download/yaws-$(v).tar.gz | tar -zx && \
+	rm -vf yaws-$(v)/priv/soap.xsd && \
+	rm -vf yaws-$(v)/priv/wsdl.xsd && \
+	rm -vf yaws-$(v)/priv/wsdl11soap12.xsd && \
+	tar -Jcf $$CURDIR/yaws_$(v)+dfsg.orig.tar.xz yaws-$(v) && \
+	rm -rf $$TMPDIR
 
 .PHONY: override_dh_auto_clean override_dh_auto_configure override_dh_auto_build-arch \
 	override_dh_auto_build-indep override_dh_auto_test override_dh_auto_install-arch \

Modified: yaws/trunk/debian/watch
===================================================================
--- yaws/trunk/debian/watch	2016-08-18 06:52:05 UTC (rev 1818)
+++ yaws/trunk/debian/watch	2016-08-18 08:55:08 UTC (rev 1819)
@@ -19,4 +19,5 @@
 # Uncomment to use Roland's hack for sourceforge based projects - YMMV!
 #http://people.debian.org/~lolando/sfdlr.php?project=yaws yaws-([\d.]*).tar.gz
 
+opts=dversionmangle=s/\+dfsg\d*$// \
 http://yaws.hyber.org/download/yaws-(.*)\.tar\.gz

More information about the Pkg-erlang-commits mailing list