[23753] in Source-Commits
/svn/athena r23365 - trunk/debathena/config/base/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sat Jan 24 17:03:18 2009
Date: Sat, 24 Jan 2009 17:02:46 -0500 (EST)
From: tabbott@MIT.EDU
Message-Id: <200901242202.RAA25710@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:02:44 -0500 (Sat, 24 Jan 2009)
New Revision: 23365
Removed:
trunk/debathena/config/base/debian/control
Modified:
trunk/debathena/config/base/debian/changelog
trunk/debathena/config/base/debian/control.in
trunk/debathena/config/base/debian/copyright
trunk/debathena/config/base/debian/reactivate
trunk/debathena/config/base/debian/rules
trunk/debathena/config/base/debian/version
Log:
In base:
* Remove DEB_AUTO_UPDATE_DEBIAN_CONTROL.
* Change "Debian-Athena Project" to "Debathena Project".
* Remove debian/control from version control.
* Clean up debian/copyright.
* Comment the dh_link workaround in debian/rules.
Modified: trunk/debathena/config/base/debian/changelog
===================================================================
--- trunk/debathena/config/base/debian/changelog 2009-01-24 22:00:54 UTC (rev 23364)
+++ trunk/debathena/config/base/debian/changelog 2009-01-24 22:02:44 UTC (rev 23365)
@@ -1,3 +1,13 @@
+debathena-base (10.1) 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.
+ * Comment the dh_link workaround in debian/rules.
+
+ -- Tim Abbott <tabbott@mit.edu> Sat, 24 Jan 2009 17:02:23 -0500
+
debathena-base (10.0) unstable; urgency=low
* Bump /etc/athena/version to 10.0.
Deleted: trunk/debathena/config/base/debian/control
Modified: trunk/debathena/config/base/debian/control.in
===================================================================
--- trunk/debathena/config/base/debian/control.in 2009-01-24 22:00:54 UTC (rev 23364)
+++ trunk/debathena/config/base/debian/control.in 2009-01-24 22:02:44 UTC (rev 23365)
@@ -1,7 +1,7 @@
Source: debathena-base
Section: debathena/base
Priority: extra
-Maintainer: Debian-Athena Project <debathena@mit.edu>
+Maintainer: Debathena Project <debathena@mit.edu>
Build-Depends: @cdbs@
Standards-Version: 3.7.2
@@ -9,6 +9,6 @@
Architecture: all
Depends: ${misc:Depends}
Conflicts: debathena-athena-files (<< 0.2)
-Description: Debian-Athena base files
+Description: Debathena base files
This package creates the /usr/athena and /bin/athena symlinks, and
contains /etc/athena/version and a dummy /etc/athena/reactivate.
Modified: trunk/debathena/config/base/debian/copyright
===================================================================
--- trunk/debathena/config/base/debian/copyright 2009-01-24 22:00:54 UTC (rev 23364)
+++ trunk/debathena/config/base/debian/copyright 2009-01-24 22:02:44 UTC (rev 23365)
@@ -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/base/debian/reactivate
===================================================================
--- trunk/debathena/config/base/debian/reactivate 2009-01-24 22:00:54 UTC (rev 23364)
+++ trunk/debathena/config/base/debian/reactivate 2009-01-24 22:02:44 UTC (rev 23365)
@@ -1,3 +1,3 @@
#!/bin/sh
-echo "/etc/athena/reactivate is not supported on Debian-Athena." >&2
+echo "/etc/athena/reactivate is not supported on Debathena." >&2
Modified: trunk/debathena/config/base/debian/rules
===================================================================
--- trunk/debathena/config/base/debian/rules 2009-01-24 22:00:54 UTC (rev 23364)
+++ trunk/debathena/config/base/debian/rules 2009-01-24 22:02:44 UTC (rev 23365)
@@ -1,8 +1,11 @@
#!/usr/bin/make -f
-DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
include /usr/share/cdbs/1/rules/debhelper.mk
+# Hack to prevent dh_link from "canonicalizing" the /usr/athena and
+# /bin/athena symlinks to e.g. athena -> ../usr. This seems to not be
+# needed on recent distributions, but is still a problem on at least
+# dapper.
DEB_DH_LINK_debathena-base = --your-mother || true
common-install-indep::
Modified: trunk/debathena/config/base/debian/version
===================================================================
--- trunk/debathena/config/base/debian/version 2009-01-24 22:00:54 UTC (rev 23364)
+++ trunk/debathena/config/base/debian/version 2009-01-24 22:02:44 UTC (rev 23365)
@@ -1 +1 @@
-Debian-Athena Workstation (linux) Version 10.0 Fri Oct 31 16:56:53 EDT 2008
+Debathena Workstation (linux) Version 10.0 Fri Oct 31 16:56:53 EDT 2008
