From 12881d396796709fc93f0d327b9e013706f1a8e8 Mon Sep 17 00:00:00 2001 From: Jonathan D Reed Date: Tue, 19 Mar 2013 19:56:07 +0000 Subject: 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 --- debian/changelog | 12 +++++++++++ debian/compat | 2 +- debian/control | 44 +++++++++++++++++++++++++++++++++++++++++ debian/control.in | 44 ----------------------------------------- debian/copyright | 59 +++++++++++++++++++++++++------------------------------ debian/rules | 22 ++++++++++----------- 6 files changed, 94 insertions(+), 89 deletions(-) create mode 100644 debian/control delete mode 100644 debian/control.in (limited to 'debian') 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 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 b/debian/control new file mode 100644 index 0000000..a6bffae --- /dev/null +++ b/debian/control @@ -0,0 +1,44 @@ +Source: debathena-extra-software +Section: debathena/base +Priority: extra +Maintainer: Debathena Project +Build-Depends: debhelper (>= 7.0~) +Standards-Version: 3.9.3 + +Package: debathena-extra-software +Architecture: all +Conflicts: debathena-cluster-software +Replaces: debathena-cluster-software +Depends: debathena-extra-software-nox, + gnome-devel, + pidgin | gaim, pidgin-encryption | gaim-encryption, + gv, + ${debathena-cool-kids-office-suite}, + thunderbird | mozilla-thunderbird | icedove, + vim-gnome, + gnuplot, + gimp, + eclipse, + idle, + twm, + ratpoison, + wmaker, wmbutton, wmcalclock, wmhdplop, wmmemload, wmnd, wmweather, + xmonad, suckless-tools | dwm-tools, + git-gui, gitk, + compizconfig-settings-manager, + chromium-browser, + 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 + for a fully-stocked Athena workstation. + . + Graphical applications are included; debathena-extra-software-nox + is the non-graphical subset. diff --git a/debian/control.in b/debian/control.in deleted file mode 100644 index d3d89eb..0000000 --- a/debian/control.in +++ /dev/null @@ -1,44 +0,0 @@ -Source: debathena-extra-software -Section: debathena/base -Priority: extra -Maintainer: Debathena Project -Build-Depends: @cdbs@ -Standards-Version: 3.9.1 - -Package: debathena-extra-software -Architecture: all -X-Debathena-No-Build: hardy -Conflicts: debathena-cluster-software -Replaces: debathena-cluster-software -Depends: debathena-extra-software-nox, - gnome-devel, - pidgin | gaim, pidgin-encryption | gaim-encryption, - gv, - ${debathena-cool-kids-office-suite}, - thunderbird | mozilla-thunderbird | icedove, - vim-gnome, - gnuplot, - gimp, - eclipse, - idle, - twm, - ratpoison, - wmaker, wmbutton, wmcalclock, wmhdplop, wmmemload, wmnd, wmweather, - xmonad, suckless-tools | dwm-tools, - git-gui, gitk, - compizconfig-settings-manager, - chromium-browser, - ${debathena-java-plugin}, - ${misc:Depends} -Recommends: flashplugin-installer | flashplugin-nonfree, - mplayer, - msttcorefonts, - ttf-xfree86-nonfree, - poppler-data, - wmbubble, wmfire -Description: Athena auxiliary software - This package pulls in miscellaneous non-Athena-specific software - for a fully-stocked Athena workstation. - . - Graphical applications are included; debathena-extra-software-nox - is the non-graphical subset. 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 - 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 -, and is licensed as follows: - - Copyright © 2007-2008 Tim Abbott , - Evan Broder , - Anders Kaseorg , - Gregory Price , 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 + Evan Broder + Anders Kaseorg + Gregory Price + (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 -- cgit v1.2.3