You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by mx...@apache.org on 2012/04/09 23:57:23 UTC
svn commit: r1311485 - in /tcl/rivet/debian: copyright rules
Author: mxmanghi
Date: Mon Apr 9 21:57:22 2012
New Revision: 1311485
URL: http://svn.apache.org/viewvc?rev=1311485&view=rev
Log:
more copyright blocks and new format to fulfill more recent Debian standards. Attempting to make 'rules' more independent from specific Tcl packages (namely making it independent from specific tcl version and let it depend on 'tcl' and 'tcl-dev')
Modified:
tcl/rivet/debian/copyright
tcl/rivet/debian/rules
Modified: tcl/rivet/debian/copyright
URL: http://svn.apache.org/viewvc/tcl/rivet/debian/copyright?rev=1311485&r1=1311484&r2=1311485&view=diff
==============================================================================
--- tcl/rivet/debian/copyright (original)
+++ tcl/rivet/debian/copyright Mon Apr 9 21:57:22 2012
@@ -1,10 +1,8 @@
-Format-Specification: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Name: libapache2-mod-rivet
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Apache Rivet
-Maintainer: Massimo Manghi <mx...@apache.org>
Source: http://www.apache.org/dyn/closer.cgi/tcl/rivet
Upstream-Contact: rivet-dev@tcl.apache.org
-Copyright: 2002-2010 The Rivet Team <ri...@tcl.apache.org>
+Copyright: 2002-2011 The Rivet Team <ri...@tcl.apache.org>
License: Apache-2.0
Files: m4/ax_prefix_config_h.m4
@@ -13,39 +11,110 @@ Copyright: Copyright (c) 2008 Guido U.
Copyright (c) 2008 Gerald Point <Ge...@labri.fr>
License: GPL-2+
+Files: win/*
+Copyright: Copyright (c) 1995-1996 Sun Microsystems, Inc.
+ Copyright (c) 1998-2000 Ajuba Solutions.
+ Copyright (c) 2001 ActiveState Corporation.
+ Copyright (c) 2001-2002 David Gravereaux.
+ Copyright (c) 2003 Pat Thoyts
+ Copyright (c) 2003 by Patrick Thoyts
+ Copyright (C) 2004 The Apache Software Foundation
+License: license-terms
+
+Files: tclconfig/tcl.m4
+Copyright: Copyright (c) 1999-2000 Ajuba Solutions.
+ Copyright (c) 2002-2005 ActiveState Corporation.
+License: license-terms
+
+Files: tclconfig/compile
+Copyright: Copyright (c) 1999, 2000 Free Software Foundation, Inc.
+ written by Tom Tromey <tr...@cygnus.com>.
+License: GPL-2+
+
+Files: tclconfig/config.guess tclconfig/config.sub
+Copyright: Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: tclconfig/depcomp
+Copyright: Copyright 1999, 2000 Free Software Foundation, Inc.
+ Originally written by Alexandre Oliva <ol...@dcc.unicamp.br>.
+License: GPL-2+
+
+Files: tclconfig/install-sh
+Copyright: Copyright (C) 1994 X Consortium
+License:
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+ TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of the X Consortium shall not
+ be used in advertising or otherwise to promote the sale, use or other deal-
+ ings in this Software without prior written authorization from the X Consor-
+ tium.
+ .
+ FSF changes to this file are in the public domain.
+
+Files: tclconfig/libtool.m4 tclconfig/ltmain.sh
+Copyright: Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
+ 2008 Free Software Foundation, Inc.
+ Originally by Gordon Matzigkeit <go...@gnu.ai.mit.edu>, 1996
+License: GPL-2+
+
+Files: tclconfig/missing
+Copyright: Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+ Originally by Fran,cois Pinard <pi...@iro.umontreal.ca>, 1996.
+License: GPL-2+
+
+Files: */debian
+Copyright: 2010,2011 Copyright (C) The Apache Rivet Team
License: Apache-2.0
+License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+ .
http://www.apache.org/licenses/LICENSE-2.0
-
+ .
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Copyright (C) 2002-2010 The Apache Software Foundation
-
-On Debian systems, the complete text of the Apache version 2.0 license
-can be found in "/usr/share/common-licenses/Apache-2.0".
+ .
+ On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
License: GPL-2+
-
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
-
+ .
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
Public License for more details.
-
+ .
You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.
-
+ .
As a special exception, the respective Autoconf Macro's copyright owner
gives unlimited permission to copy, distribute and modify the configure
scripts that are the output of Autoconf when processing the Macro. You
@@ -53,33 +122,23 @@ License: GPL-2+
or distributing such scripts, even though portions of the text of the
Macro appear in them. The GNU General Public License (GPL) does govern
all other use of the material that constitutes the Autoconf Macro.
-
+ .
This special exception to the GPL applies to versions of the Autoconf
Macro released by the Autoconf Macro Archive. When you make and
distribute a modified version of the Autoconf Macro, you may extend this
special exception to the GPL to apply to your modified version as well.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
-Files: win/*
-Copyright: Copyright (c) 1995-1996 Sun Microsystems, Inc.
- Copyright (c) 1998-2000 Ajuba Solutions.
- Copyright (c) 2001 ActiveState Corporation.
- Copyright (c) 2001-2002 David Gravereaux.
- Copyright (c) 2003 Pat Thoyts
- Copyright (c) 2003 by Patrick Thoyts
- Copyright (C) 2004 The Apache Software Foundation
-
-Files: tclconfig/tcl.m4
-Copyright: Copyright (c) 1999-2000 Ajuba Solutions.
- Copyright (c) 2002-2005 ActiveState Corporation.
-
-License:
-
+License: license-terms
This software is copyrighted by the Regents of the University of
California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
Corporation and other parties. The following terms apply to all files
associated with the software unless explicitly disclaimed in
individual files.
-
+ .
The authors hereby grant permission to use, copy, modify, distribute,
and license this software and its documentation for any purpose, provided
that existing copyright notices are retained in all copies and that this
@@ -89,20 +148,20 @@ License:
and need not follow the licensing terms described here, provided that
the new terms are clearly indicated on the first page of each file where
they apply.
-
+ .
IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-
+ .
THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
MODIFICATIONS.
-
+ .
GOVERNMENT USE: If you are acquiring this software on behalf of the
U.S. government, the Government shall have only "Restricted Rights"
in the software and related documentation as defined in the Federal
@@ -114,68 +173,3 @@ License:
authors grant the U.S. Government and others acting in its behalf
permission to use and distribute the software in accordance with the
terms specified in this license.
-
-Files: tclconfig/compile
-Copyright: Copyright (c) 1999, 2000 Free Software Foundation, Inc.
- written by Tom Tromey <tr...@cygnus.com>.
-License: GPL-2+
-
-Files: tclconfig/config.guess, tclconfig/config.sub
-Copyright: Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: tclconfig/depcomp
-Copyright: Copyright 1999, 2000 Free Software Foundation, Inc.
- Originally written by Alexandre Oliva <ol...@dcc.unicamp.br>.
-License: GPL-2+
-
-Files: tclconfig/install-sh
-Copyright: Copyright (C) 1994 X Consortium
-License:
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to
- deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
- TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name of the X Consortium shall not
- be used in advertising or otherwise to promote the sale, use or other deal-
- ings in this Software without prior written authorization from the X Consor-
- tium.
-
-
- FSF changes to this file are in the public domain.
-
-Files: tclconfig/libtool.m4, tclconfig/ltmain.sh
-Copyright: Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
- 2008 Free Software Foundation, Inc.
- Originally by Gordon Matzigkeit <go...@gnu.ai.mit.edu>, 1996
-License: GPL-2+
-
-Files: tclconfig/missing
-Copyright: Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
- Originally by Fran,cois Pinard <pi...@iro.umontreal.ca>, 1996.
-License: GPL-2+
-
-License:
-
- The GPL license is available at "/usr/share/common-licenses/GPL-2+".
-
-The Debian packager was:
-
- Copyright (C) 2010 Massimo Manghi <mx...@apache.org>
-
-
Modified: tcl/rivet/debian/rules
URL: http://svn.apache.org/viewvc/tcl/rivet/debian/rules?rev=1311485&r1=1311484&r2=1311485&view=diff
==============================================================================
--- tcl/rivet/debian/rules (original)
+++ tcl/rivet/debian/rules Mon Apr 9 21:57:22 2012
@@ -6,7 +6,6 @@
TCL_VERSION=8.5
package=libapache2-mod-rivet
-
#LDFLAGS += -Wl,--as-needed
#CFLAGS = -Wall -g
@@ -50,12 +49,11 @@ configure-stamp:
chmod +x ./configure
CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
./configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
--with-tcl=/usr/lib/tcl$(TCL_VERSION)/ \
- --with-apache=/usr \
- --with-apxs=/usr/bin/apxs2 \
- --with-tclsh=/usr/bin/tclsh$(TCL_VERSION) \
- --with-apache-version=2 \
+ --with-apache=/usr \
+ --with-apxs=/usr/bin/apxs \
+ --with-apache-version=2 \
--with-rivet-target-dir=/usr/lib/tcltk/rivet2.0 \
--enable-version-display
touch configure-stamp
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org