[870] in athena10
Re: Changes to every package
daemon@ATHENA.MIT.EDU (Tim Abbott)
Wed Jan 21 20:00:11 2009
Date: Wed, 21 Jan 2009 19:56:38 -0500 (EST)
From: Tim Abbott <tabbott@MIT.EDU>
To: debathena@mit.edu, athena10@mit.edu
In-Reply-To: <alpine.DEB.2.00.0901151642450.7094@vinegar-pot.mit.edu>
Message-ID: <alpine.DEB.2.00.0901211955440.1452@vinegar-pot.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Just as an update on this, on Monday, I staged all of these but:
(1) the copyright updates
(2) deleting debian/control from version control
(3) double-checking that my scripts didn't screw anything up
I'll probably finish on Saturday.
-Tim Abbott
On Thu, 15 Jan 2009, Tim Abbott wrote:
> Okay, so the current plan is to make the following changes:
>
> * Apply the diff below to debian/copyright * replacing "Debian-Athena" with
> "Debathena"
> * using the UTF-8 copyright symbol
> * Modifying dasource to generate debian/control
> * deleting debian/control from version control
> * Remove DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
> * Fix all instances of DEB_AUTO_UPDATE_AUTOCONF = 1 to say 2.50
>
> I've concluded that the copyright statement in our debian/copyright file is
> right, since it is the same as the statement at the top of all the Athena
> source files.
>
> -Tim Abbott
>
> On Wed, 14 Jan 2009, Tim Abbott wrote:
>
>> I'm making a second call for comments on the items below (in particular,
>> the copyright file stuff). I'd really like to be able to actually go
>> through all the packages this weekend.
>>
>> It'd be really annoying to make these changes to all our packages, and then
>> discover that we actually wanted to make a slightly different change (or
>> not make one of these changes at all), so please comment.
>>
>> -Tim Abbott
>>
>> On Sat, 10 Jan 2009, Tim Abbott wrote:
>>
>>> Today, I was going to make the various fixes to (almost) all our packages
>>> that were planned over the last week or two. But I realized that there
>>> are a few other changes that should happen to (almost) every package that
>>> I don't think we have consensus on, and it's probably best that we do all
>>> these changes in one pass.
>>>
>>> * Remove DEB_AUTO_UPDATE_DEBIAN_CONTROL
>>> * Remove whichever of debian/control and debian/control.in we're removing
>>> from svn (if any).
>>> * Fix all instances of DEB_AUTO_UPDATE_AUTOCONF = 1 to say 2.50
>>> * Fix various issues with the debian/copyright files. The main point of
>>> this is to make it so that our packages look more like packages in Debian
>>> upstream in terms of what information is in the copyright files.
>>> * Make a version of the changes discussed in December (making the
>>> packagings MIT-licensed rather than "public domain").
>>> * We should give a URI for where the sources come from that is publically
>>> available (i.e. not something in AFS). I'm not sure
>>> svn://debathena.mit.edu is totally ideal, but I think it is a URI that we
>>> should be able to maintain indefinitely.
>>> * Our source is actually the daconfiscated version of the source in SVN,
>>> which makes the claim in the copyright file as to where the source came
>>> from not entirely accurate.
>>> * Is the version of the MIT license statement in the debian/copyright
>>> files the version that should be used for Athena packages? I ask because
>>> our version differs from that used in the zephyr package in Debian
>>> upstream.
>>>
>>> As a concrete starting point, below is a draft diff for the quota package,
>>> which assumes we keep both control and control.in, ignore the daconfiscate
>>> complication, and keep the current MIT license text.
>>>
>>> I'd like to be able to execute whatever conclusion we come to next
>>> weekend. So, pleases discuss these issues if you don't like the draft
>>> below.
>>>
>>> I'd plan to execute the changes as one commit per package (rather than one
>>> commit for each item above), since I think that'll make reviewing the
>>> commit emails less awful.
>>>
>>> -Tim Abbott
>>>
>>> Index: debian/changelog
>>> ===================================================================
>>> --- debian/changelog (revision 23282)
>>> +++ debian/changelog (working copy)
>>> @@ -1,3 +1,11 @@
>>> +debathena-quota (10.0.0-0debathena1) unstable; urgency=low
>>> +
>>> + * Remove DEB_AUTO_UPDATE_DEBIAN_CONTROL.
>>> + * Change DEB_AUTO_UPDATE_AUTOCONF to 2.50, not 1.
>>> + * Clean up debian/copyright.
>>> +
>>> + -- Tim Abbott <tabbott@mit.edu> Sat, 10 Jan 2009 15:25:58 -0500
>>> +
>>> debathena-quota (9.4.0-0debathena4) unstable; urgency=low
>>>
>>> * Link against libcom_err from openafs so that the package builds on
>>> Index: debian/copyright
>>> ===================================================================
>>> --- debian/copyright (revision 23282)
>>> +++ debian/copyright (working copy)
>>> @@ -1,20 +1,23 @@
>>> -The Athena source code was obtained from the Athena CVS repository at
>>> -/afs/dev.mit.edu/source, and is licensed as follows:
>>> +This package was debianized as part of the Debian-Athena Project
>>> +<http://debathena.mit.edu/> of the MIT Student Information Processing
>>> +Board.
>>>
>>> +The Athena source code was obtained from the Athena SVN repository at
>>> +<svn://debathena.mit.edu/athena/trunk>, and is licensed as follows:
>>> +
>>> Copyright 1996 by the Massachusetts Institute of Technology.
>>>
>>> Permission to use, copy, modify, and distribute this
>>> software and its documentation for any purpose and without
>>> fee is hereby granted, provided that the above copyright
>>> notice appear in all copies and that both that copyright
>>> notice and this permission notice appear in supporting
>>> documentation, and that the name of M.I.T. not be used in
>>> advertising or publicity pertaining to distribution of the
>>> software without specific, written prior permission.
>>> M.I.T. makes no representations about the suitability of
>>> this software for any purpose. It is provided "as is"
>>> without express or implied warranty.
>>>
>>> -This Debian 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.
>>> +The Debian packaging is Copyright (C) 2007-2008 Tim Abbott and Anders
>>> +Kaseorg, and has the same license as the original software.
>>> Index: debian/rules
>>> ===================================================================
>>> --- debian/rules (revision 23282)
>>> +++ debian/rules (working copy)
>>> @@ -1,7 +1,6 @@
>>> #!/usr/bin/make -f
>>>
>>> -DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
>>> -DEB_AUTO_UPDATE_AUTOCONF = 1
>>> +DEB_AUTO_UPDATE_AUTOCONF = 2.50
>>> include /usr/share/cdbs/1/rules/debhelper.mk
>>> include /usr/share/cdbs/1/class/autotools.mk
>>>
>>>
>>
>