[28268] in Source-Commits
xsession commit: Update packaging; depend on dconf-config
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jun 18 18:15:48 2014
Date: Wed, 18 Jun 2014 18:15:41 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201406182215.s5IMFfZP031673@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/xsession/commit/e5c0e3b24bb4509dd0caca99af959a7ffcb933cb
commit e5c0e3b24bb4509dd0caca99af959a7ffcb933cb
Author: Jonathan Reed <jdreed@mit.edu>
Date: Mon Jun 16 15:55:01 2014 -0400
Update packaging; depend on dconf-config
- Depend on the new debathena-dconf-config
- Convert rules file to dh7
- Wrap "Depends" field in control file
- Update copyright format
debian/changelog | 8 ++++++++
debian/control | 19 +++++++++++++++----
debian/copyright | 47 ++++++++++++++++++++++++++++++-----------------
debian/rules | 3 ++-
4 files changed, 55 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c3e5b40..18e82d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debathena-xsession (1.24) unstable; urgency=low
+
+ * Convert rules file to dh7
+ * Depend on new debathena-dconf-config package
+ * Update copyright file to copyright format 1.0
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 16 Jun 2014 15:54:33 -0400
+
debathena-xsession (1.23) unstable; urgency=low
* Add support for Upstart sessions (Trac: #1238)
diff --git a/debian/control b/debian/control
index 6dc1d4d..4fe34f9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,25 @@ Source: debathena-xsession
Section: debathena/base
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs, debhelper, dh-buildinfo
+Build-Depends: debhelper
Standards-Version: 3.9.3
Package: debathena-xsession
Architecture: all
-Depends: x11-common, zenity, debathena-pam-config, debathena-zephyr-config,
- debathena-get-message, debathena-lert-compat, debathena-authwatch, debathena-quota,
- debathena-mitmailutils, tcsh, xterm, gnome-session, ${misc:Depends}
+Depends: x11-common,
+ zenity,
+ debathena-pam-config,
+ debathena-zephyr-config,
+ debathena-get-message,
+ debathena-lert-compat,
+ debathena-authwatch,
+ debathena-quota,
+ debathena-mitmailutils,
+ tcsh,
+ xterm,
+ gnome-session,
+ debathena-dconf-config,
+ ${misc:Depends}
Replaces: debathena-dotfiles-x11
Conflicts: debathena-dotfiles-x11, debathena-dotfiles (<< 10.0.2-0debathena3)
Description: X session integration for graphical Athena logins
diff --git a/debian/copyright b/debian/copyright
index 9eec945..e4ab34a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -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) 2014 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.
diff --git a/debian/rules b/debian/rules
index e6192f6..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,4 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+ dh $@
