[23743] in Source-Commits
/svn/athena r23356 - trunk/debathena/config/zephyr-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sat Jan 24 16:29:44 2009
Date: Sat, 24 Jan 2009 16:29:20 -0500 (EST)
From: tabbott@MIT.EDU
Message-Id: <200901242129.QAA25034@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 16:29:19 -0500 (Sat, 24 Jan 2009)
New Revision: 23356
Removed:
trunk/debathena/config/zephyr-config/debian/control
Modified:
trunk/debathena/config/zephyr-config/debian/changelog
trunk/debathena/config/zephyr-config/debian/control.in
trunk/debathena/config/zephyr-config/debian/copyright
trunk/debathena/config/zephyr-config/debian/rules
Log:
In zephyr-config:
* Remove DEB_AUTO_UPDATE_DEBIAN_CONTROL.
* Change "Debian-Athena Project" to "Debathena Project".
* Remove debian/control from version control.
* Clean up debian/copyright.
Modified: trunk/debathena/config/zephyr-config/debian/changelog
===================================================================
--- trunk/debathena/config/zephyr-config/debian/changelog 2009-01-24 21:28:59 UTC (rev 23355)
+++ trunk/debathena/config/zephyr-config/debian/changelog 2009-01-24 21:29:19 UTC (rev 23356)
@@ -1,3 +1,12 @@
+debathena-zephyr-config (1.6) unstable; urgency=low
+
+ * Remove DEB_AUTO_UPDATE_DEBIAN_CONTROL.
+ * Change "Debian-Athena Project" to "Debathena Project".
+ * Remove debian/control from version control.
+ * Clean up debian/copyright.
+
+ -- Tim Abbott <tabbott@mit.edu> Sat, 24 Jan 2009 16:29:16 -0500
+
debathena-zephyr-config (1.5) unstable; urgency=low
* Pass -f to zhm so that unprivileged users can't cause all users to
Deleted: trunk/debathena/config/zephyr-config/debian/control
Modified: trunk/debathena/config/zephyr-config/debian/control.in
===================================================================
--- trunk/debathena/config/zephyr-config/debian/control.in 2009-01-24 21:28:59 UTC (rev 23355)
+++ trunk/debathena/config/zephyr-config/debian/control.in 2009-01-24 21:29:19 UTC (rev 23356)
@@ -1,7 +1,7 @@
Source: debathena-zephyr-config
Section: debathena-config/net
Priority: extra
-Maintainer: Debian-Athena Project <debathena@mit.edu>
+Maintainer: Debathena Project <debathena@mit.edu>
Build-Depends: @cdbs@
Standards-Version: 3.7.2
@@ -10,6 +10,6 @@
Depends: libzephyr3-krb, zephyr-clients, debathena-kerberos-config, ${misc:Depends}
Provides: ${diverted-files}
Conflicts: ${diverted-files}
-Description: Zephyr configuration for Debian-Athena
- This package configures Zephyr for the Debian-Athena system by
+Description: Zephyr configuration for Debathena
+ This package configures Zephyr for the Debathena system by
setting up the default Zephyr servers.
Modified: trunk/debathena/config/zephyr-config/debian/copyright
===================================================================
--- trunk/debathena/config/zephyr-config/debian/copyright 2009-01-24 21:28:59 UTC (rev 23355)
+++ trunk/debathena/config/zephyr-config/debian/copyright 2009-01-24 21:29:19 UTC (rev 23356)
@@ -1,3 +1,31 @@
-This package was created as part of the Debian-Athena Project
-<http://web.mit.edu/debathena/www/> of the MIT Student Information
-Processing Board, and is released to the public domain.
+This package was created as part of the Debathena Project
+<http://debathena.mit.edu/> of the MIT Student Information Processing
+Board.
+
+The source code was obtained from the Athena SVN repository at
+<svn://debathena.mit.edu/athena/trunk>, and is 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.
+
+The Debian packaging is Copyright © 2007-2008 Tim Abbott and Anders
+Kaseorg, and has the same license as the original software.
Modified: trunk/debathena/config/zephyr-config/debian/rules
===================================================================
--- trunk/debathena/config/zephyr-config/debian/rules 2009-01-24 21:28:59 UTC (rev 23355)
+++ trunk/debathena/config/zephyr-config/debian/rules 2009-01-24 21:29:19 UTC (rev 23356)
@@ -1,6 +1,5 @@
#!/usr/bin/make -f
-DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
DEB_DIVERT_EXTENSION = .debathena
DEB_DIVERT_FILES_debathena-zephyr-config += \
/etc/default/zephyr-clients.debathena