[27122] in Source-Commits
/svn/athena r25960 - in trunk/debathena/debathena/nautilus-afs: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri May 3 10:56:27 2013
Date: Fri, 3 May 2013 10:56:21 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201305031456.r43EuLKl022985@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-05-03 10:56:20 -0400 (Fri, 03 May 2013)
New Revision: 25960
Modified:
trunk/debathena/debathena/nautilus-afs/afs-property-page.py
trunk/debathena/debathena/nautilus-afs/debian/changelog
trunk/debathena/debathena/nautilus-afs/debian/control
trunk/debathena/debathena/nautilus-afs/debian/copyright
trunk/debathena/debathena/nautilus-afs/debian/rules
Log:
In nautilus-afs:
* Fix bug which didn't reset "add" dialog after cancel (Trac: #1339)
* Switch to dh7 from CDBS
* Bump Standards-Version to 3.9.3 and compat to 7
* Replace completely wrong copyright file with copyright format 1.0
Modified: trunk/debathena/debathena/nautilus-afs/afs-property-page.py
===================================================================
--- trunk/debathena/debathena/nautilus-afs/afs-property-page.py 2013-05-02 15:52:30 UTC (rev 25959)
+++ trunk/debathena/debathena/nautilus-afs/afs-property-page.py 2013-05-03 14:56:20 UTC (rev 25960)
@@ -274,6 +274,10 @@
def _prepareAclDialog(self, editMode=False, entity=None, rights=None, negative=False):
self.addDlg.set_transient_for(self._getParentWindow())
self.addDlg.set_title("Change permissions for '%s'" % (entity) if editMode else "Add an entry")
+ # Set entity combo to "specify manually"
+ # This would be easier if GtkBuilder actually set the id-column
+ # property. Fortunately, it's the first entry in the list.
+ self.builder.get_object("entityCombo").set_active_iter(self.builder.get_object("entityCombo").get_model().get_iter_first())
# Set the "OK" button to unsensitive until something is in the text field
self.builder.get_object("aclDlgOK").set_sensitive(False)
# Clear the text field
Modified: trunk/debathena/debathena/nautilus-afs/debian/changelog
===================================================================
--- trunk/debathena/debathena/nautilus-afs/debian/changelog 2013-05-02 15:52:30 UTC (rev 25959)
+++ trunk/debathena/debathena/nautilus-afs/debian/changelog 2013-05-03 14:56:20 UTC (rev 25960)
@@ -1,3 +1,12 @@
+debathena-nautilus-afs (2.1) unstable; urgency=low
+
+ * Fix bug which didn't reset "add" dialog after cancel (Trac: #1339)
+ * Switch to dh7 from CDBS
+ * Bump Standards-Version to 3.9.3 and compat to 7
+ * Replace completely wrong copyright file with copyright format 1.0
+
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 03 May 2013 10:01:38 -0400
+
debathena-nautilus-afs (2.0) unstable; urgency=low
* Complete rewrite for Nautilus 3 and Gtk3
Modified: trunk/debathena/debathena/nautilus-afs/debian/control
===================================================================
--- trunk/debathena/debathena/nautilus-afs/debian/control 2013-05-02 15:52:30 UTC (rev 25959)
+++ trunk/debathena/debathena/nautilus-afs/debian/control 2013-05-03 14:56:20 UTC (rev 25960)
@@ -1,9 +1,9 @@
Source: debathena-nautilus-afs
Section: debathena-config/gnome
Priority: extra
-Build-Depends: cdbs, debhelper
+Build-Depends: debhelper
Maintainer: Debathena Project <debathena@mit.edu>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
Package: debathena-nautilus-afs
X-Debathena-Build-For: precise quantal
Modified: trunk/debathena/debathena/nautilus-afs/debian/copyright
===================================================================
--- trunk/debathena/debathena/nautilus-afs/debian/copyright 2013-05-02 15:52:30 UTC (rev 25959)
+++ trunk/debathena/debathena/nautilus-afs/debian/copyright 2013-05-03 14:56:20 UTC (rev 25960)
@@ -1,18 +1,31 @@
-The Athena source code was obtained from the Athena SVN repository at
-<svn://debathena.mit.edu/athena/trunk>, and is licensed as follows:
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
- Copyright © 2008 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.
-
-The Debian packaging is Copyright © 2008 Massachusetts Institute of
-Technology, and has the same license as the original software.
+Files: *
+Copyright: (c) 2011-2013 Massachusetts Institute of Technology
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of the Massachusetts Institute of Technology
+ nor the names of its contributors may be used to endorse or
+ promote products derived from this software without specific
+ prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MASSACHUSETTS
+ INSTITUTE OF TECHNOLOGY BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
Modified: trunk/debathena/debathena/nautilus-afs/debian/rules
===================================================================
--- trunk/debathena/debathena/nautilus-afs/debian/rules 2013-05-02 15:52:30 UTC (rev 25959)
+++ trunk/debathena/debathena/nautilus-afs/debian/rules 2013-05-03 14:56:20 UTC (rev 25960)
@@ -1,3 +1,4 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+ dh $@
