summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Jonathan D Reed <jdreed@mit.edu>2013-03-19 19:56:07 +0000
committerGravatar Jonathan D Reed <jdreed@mit.edu>2013-03-19 19:56:07 +0000
commit12881d396796709fc93f0d327b9e013706f1a8e8 (patch)
treea30d32102409e4ea24cf1a280c1716f09b810ed0 /debian
parent79334b1fa74a9eac8c0512ce80b9611d6f53df2b (diff)
In extra-software:
* Recommend motif-clients (Trac: #946) * Convert from CDBS to dh7 * Remove X-Debathena-Nobuild line now that hardy isn't a thing * Explicitly depend on icedtea6-plugin, as there are no releases without it anymore. * Bump Standards-Version to 3.9.3 * Change copyright file to new copyright format
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog12
-rw-r--r--debian/compat2
-rw-r--r--debian/control (renamed from debian/control.in)8
-rw-r--r--debian/copyright59
-rwxr-xr-xdebian/rules22
5 files changed, 54 insertions, 49 deletions
diff --git a/debian/changelog b/debian/changelog
index 372cf44..432eb42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+debathena-extra-software (1.5) unstable; urgency=low
+
+ * Recommend motif-clients (Trac: #946)
+ * Convert from CDBS to dh7
+ * Remove X-Debathena-Nobuild line now that hardy isn't a thing
+ * Explicitly depend on icedtea6-plugin, as there are no releases without
+ it anymore.
+ * Bump Standards-Version to 3.9.3
+ * Change copyright file to new copyright format
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 19 Mar 2013 15:55:20 -0400
+
debathena-extra-software (1.4) unstable; urgency=low
* include debhelper.mk before adding to the targets, not after.
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control.in b/debian/control
index d3d89eb..a6bffae 100644
--- a/debian/control.in
+++ b/debian/control
@@ -2,12 +2,11 @@ Source: debathena-extra-software
Section: debathena/base
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: @cdbs@
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0~)
+Standards-Version: 3.9.3
Package: debathena-extra-software
Architecture: all
-X-Debathena-No-Build: hardy
Conflicts: debathena-cluster-software
Replaces: debathena-cluster-software
Depends: debathena-extra-software-nox,
@@ -28,13 +27,14 @@ Depends: debathena-extra-software-nox,
git-gui, gitk,
compizconfig-settings-manager,
chromium-browser,
- ${debathena-java-plugin},
+ icedtea6-plugin,
${misc:Depends}
Recommends: flashplugin-installer | flashplugin-nonfree,
mplayer,
msttcorefonts,
ttf-xfree86-nonfree,
poppler-data,
+ motif-clients,
wmbubble, wmfire
Description: Athena auxiliary software
This package pulls in miscellaneous non-Athena-specific software
diff --git a/debian/copyright b/debian/copyright
index 2b793e1..bb0a7d5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,28 @@
-This package was created using equivs as part of the Debathena Project
-<http://debathena.mit.edu> of the MIT Student Information Processing
-Board in collaboration with the Massachusetts Institute of
-Technology.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-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 <tabbott@mit.edu>,
- Evan Broder <broder@mit.edu>,
- Anders Kaseorg <andersk@mit.edu>,
- Gregory Price <price@mit.edu>, and
- Massachusetts Institute of Technology
-
- 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.
+Files: *
+Copyright: © 2007-2008 Tim Abbott <tabbott@mit.edu>
+ Evan Broder <broder@mit.edu>
+ Anders Kaseorg <andersk@mit.edu>
+ Gregory Price <price@mit.edu>
+ (c) 2013 Massachusetts Institute of Technology
+License: Expat
+ 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.
diff --git a/debian/rules b/debian/rules
index a36b0b0..2726fd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,20 @@
#!/usr/bin/make -f
-HAVE_ICEDTEA = $(shell apt-cache show icedtea6-plugin 2>/dev/null | grep -q '^Version:' && echo y)
-HAVE_LIBREOFFICE = $(shell apt-cache show libreoffice 2>/dev/null | grep -q '^Version:' && echo y)
+%:
+ dh $@
-include /usr/share/cdbs/1/rules/debhelper.mk
+HAVE_LIBREOFFICE = $(shell apt-cache show libreoffice 2>/dev/null | grep -q '^Version:' && echo y)
-ifeq ($(HAVE_ICEDTEA),y)
- binary-predeb/debathena-extra-software::
- echo "debathena-java-plugin=icedtea6-plugin" >> debian/debathena-extra-software.substvars
+override_dh_gencontrol:
+ifeq ($(HAVE_LIBREOFFICE),y)
+ dh_gencontrol -- -Vdebathena-cool-kids-office-suite=libreoffice
+else
+ dh_gencontrol -- -Vdebathena-cool-kids-office-suite=openoffice.org
endif
ifeq ($(HAVE_LIBREOFFICE),y)
- install/debathena-extra-software::
+override_dh_install:
+ dh_install
dh_install debian/ooffice usr/bin
- binary-predeb/debathena-extra-software::
- echo "debathena-cool-kids-office-suite=libreoffice" >> debian/debathena-extra-software.substvars
-else
- binary-predeb/debathena-extra-software::
- echo "debathena-cool-kids-office-suite=openoffice.org" >> debian/debathena-extra-software.substvars
endif