[23762] in Source-Commits
/svn/athena r23374 - in trunk/debathena/manual-config: . common
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sat Jan 24 17:42:33 2009
Date: Sat, 24 Jan 2009 17:42:04 -0500 (EST)
From: tabbott@MIT.EDU
Message-Id: <200901242242.RAA26693@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2009-01-24 17:42:04 -0500 (Sat, 24 Jan 2009)
New Revision: 23374
Modified:
trunk/debathena/manual-config/common/README-manual-config.in
trunk/debathena/manual-config/common/copyright
trunk/debathena/manual-config/make-manual-config.sh
Log:
* manual-config: "Debian-Athena" to "Debathena".
* manual_config: Clarify the common debian/copyright files.
Modified: trunk/debathena/manual-config/common/README-manual-config.in
===================================================================
--- trunk/debathena/manual-config/common/README-manual-config.in 2009-01-24 22:33:22 UTC (rev 23373)
+++ trunk/debathena/manual-config/common/README-manual-config.in 2009-01-24 22:42:04 UTC (rev 23374)
@@ -1,6 +1,6 @@
-@packagename@ for Debian-Athena
+@packagename@ for Debathena
-This is a Debian-Athena manual configuration package. It satisfy any
+This is a Debathena manual configuration package. It satisfy any
dependencies on the corresponding automatic configuration package
without actually doing any configuration. You will need to do any
such configuration yourself.
Modified: trunk/debathena/manual-config/common/copyright
===================================================================
--- trunk/debathena/manual-config/common/copyright 2009-01-24 22:33:22 UTC (rev 23373)
+++ trunk/debathena/manual-config/common/copyright 2009-01-24 22:42:04 UTC (rev 23374)
@@ -1,3 +1,33 @@
-This package was created using equivs as part of the Debian-Athena
-Project <http://debathena.mit.edu/> of the MIT Student Information
-Processing Board, and is released to the public domain.
+This "-manual-config" package was automatically generated from the
+corresponding "-config" package by a script using equivs.
+
+The scripts to generate this package were were written as part of the
+Debathena Project <http://debathena.mit.edu> of the MIT Student
+Information Processing Board.
+
+The scripts to generate this package are available in the Athena SVN
+repository at <svn://debathena.mit.edu/athena/trunk>, and are licensed
+as follows:
+
+ Copyright © 2007-2008 Tim Abbott and Anders Kaseorg
+
+ 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 AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
Modified: trunk/debathena/manual-config/make-manual-config.sh
===================================================================
--- trunk/debathena/manual-config/make-manual-config.sh 2009-01-24 22:33:22 UTC (rev 23373)
+++ trunk/debathena/manual-config/make-manual-config.sh 2009-01-24 22:42:04 UTC (rev 23374)
@@ -6,7 +6,7 @@
$package=$1;
s/^Version: (.*)~.*$/Version: \1/m;
$version=$1;
- s/$/\nConflicts: debathena-$package-config\nProvides: debathena-$package-config\nMaintainer: Debian-Athena Project <debathena\@mit.edu>\nStandards-Version: 3.6.2\nCopyright: ..\/common\/copyright\nReadme: ..\/common\/README-manual-config.in\nDescription: Debian-Athena manual configuration for $package\n This is a Debian-Athena manual configuration package. It provides an\n alternate way to satisfy any dependencies on debathena-$package-config,\n for those who prefer to do this configuration manually.\n .\n If you want $package to be configured automatically, make sure you have\n enabled the debathena-config component of the repository, and install\n the debathena-$package-config package instead.\n/;
+ s/$/\nConflicts: debathena-$package-config\nProvides: debathena-$package-config\nMaintainer: Debathena Project <debathena\@mit.edu>\nStandards-Version: 3.6.2\nCopyright: ..\/common\/copyright\nReadme: ..\/common\/README-manual-config.in\nDescription: Debathena manual configuration for $package\n This is a Debathena manual configuration package. It provides an\n alternate way to satisfy any dependencies on debathena-$package-config,\n for those who prefer to do this configuration manually.\n .\n If you want $package to be configured automatically, make sure you have\n enabled the debathena-config component of the repository, and install\n the debathena-$package-config package instead.\n/;
print "manual-$package-config debathena-manual-$package-config_$version.equivs\n$_";' | \
# cat; cat /dev/null | \
(
