[26694] in Source-Commits
Re: /svn/athena r25674 - in trunk/debathena/debathena/locker-menu/debian:
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Fri Aug 3 18:32:36 2012
Date: Fri, 3 Aug 2012 18:32:32 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201207311854.q6VIsFrM022617@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1208031829530.22690@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII
The previous mails notwithstanding, this looks basically okay. I'm not
sure if there is a simpler way to do what we want, but this should
basically work, modulo that I don't think the symlink/copies we add to
/usr/share/debathena-locker-menu/*.png (well, except for generic-icon.png)
will get cleaned up on deinstall, which is against policy IIRC.
-Ben
On Tue, 31 Jul 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-07-31 14:54:15 -0400 (Tue, 31 Jul 2012)
> New Revision: 25674
>
> Added:
> trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.config
> trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.postinst
> trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.templates
> trunk/debathena/debathena/locker-menu/debian/generic-icon.png
> trunk/debathena/debathena/locker-menu/debian/po/
> trunk/debathena/debathena/locker-menu/debian/po/POTFILES.in
> trunk/debathena/debathena/locker-menu/debian/po/templates.pot
> Modified:
> trunk/debathena/debathena/locker-menu/debian/changelog
> trunk/debathena/debathena/locker-menu/debian/copyright
> trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.install
> trunk/debathena/debathena/locker-menu/debian/locker-acroread.desktop
> trunk/debathena/debathena/locker-menu/debian/locker-maple.desktop
> trunk/debathena/debathena/locker-menu/debian/locker-mathematica.desktop
> trunk/debathena/debathena/locker-menu/debian/locker-sas.desktop
> trunk/debathena/debathena/locker-menu/debian/locker-stata.desktop
> trunk/debathena/debathena/locker-menu/debian/locker-tecplot.desktop
> trunk/debathena/debathena/locker-menu/debian/locker-xess.desktop
> trunk/debathena/debathena/locker-menu/debian/rules
> Log:
> In locker-menu:
> * Add shiny icons (Trac: #581)
>
>
> Modified: trunk/debathena/debathena/locker-menu/debian/changelog
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/changelog 2012-07-31 14:32:19 UTC (rev 25673)
> +++ trunk/debathena/debathena/locker-menu/debian/changelog 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -1,6 +1,6 @@
> debathena-locker-menu (1.8) unstable; urgency=low
>
> - * Add an icon for MATLAB (Trac: #581)
> + * Add shiny icons (Trac: #581)
> * Launch maple.java instead of Maple (Trac: #1186)
>
> -- Jonathan Reed <jdreed@mit.edu> Tue, 31 Jul 2012 10:32:01 -0400
>
> Modified: trunk/debathena/debathena/locker-menu/debian/copyright
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/copyright 2012-07-31 14:32:19 UTC (rev 25673)
> +++ trunk/debathena/debathena/locker-menu/debian/copyright 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -1,3 +1,7 @@
> +Any files in /usr/share/debathena-locker-menu/icons-nonfree are
> +copyrights and or trademarks of their respective owners and may not be
> +redistributed or used outside the MIT Community.
> +
> The file matlabicon.png is subject to the license and copyright terms
> described in the file matlab-icon-license.txt, which you should find
> installed in /usr/share/doc/debathena-locker-menu. The icon and its
>
> Added: trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.config
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.config (rev 0)
> +++ trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.config 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -0,0 +1,12 @@
> +#!/bin/sh
> +
> +set -e
> +
> +# Source debconf
> +. /usr/share/debconf/confmodule
> +
> +# Do you like debian?
> +db_input high debathena-locker-menu/license || true
> +db_go
> +
> +
>
> Modified: trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.install
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.install 2012-07-31 14:32:19 UTC (rev 25673)
> +++ trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.install 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -3,3 +3,6 @@
> debian/*.desktop usr/share/applications
> debian/plif.png usr/share/debathena-locker-menu
> debian/matlabicon.png usr/share/debathena-locker-menu
> +debian/generic-icon.png usr/share/debathena-locker-menu
> +icons-nonfree/*.png usr/share/debathena-locker-menu/icons-nonfree
> +
>
> Added: trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.postinst
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.postinst (rev 0)
> +++ trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.postinst 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -0,0 +1,60 @@
> +#!/bin/sh
> +# postinst script for debathena-locker-menu
> +#
> +# see: dh_installdeb(1)
> +
> +set -e
> +
> +# summary of how this script can be called:
> +# * <postinst> `configure' <most-recently-configured-version>
> +# * <old-postinst> `abort-upgrade' <new version>
> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
> +# <new-version>
> +# * <postinst> `abort-remove'
> +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
> +# <failed-install-package> <version> `removing'
> +# <conflicting-package> <version>
> +# for details, see http://www.debian.org/doc/debian-policy/ or
> +# the debian-policy package
> +
> +SHAREDIR="/usr/share/debathena-locker-menu"
> +ICON_NONFREE_DIR="/usr/share/debathena-locker-menu/icons-nonfree"
> +ICONS="acroread.png mathematica.png maple.png sas.png stata.png tecplot.png xess.png"
> +
> +# Source debconf library.
> +. /usr/share/debconf/confmodule
> +
> +case "$1" in
> + configure)
> + db_get debathena-locker-menu/license
> + if [ "$RET" = "true" ]; then
> + echo "Using real icons for debathena-locker-menu..." >&2
> + for i in $ICONS; do
> + if ! cp -f "$ICON_NONFREE_DIR/$i" "$SHAREDIR/$i"; then
> + echo "Can't find real icon for $i, falling back to generic" >&2
> + ln -nsf "$SHAREDIR/generic-icon.png" "$SHAREDIR/$i"
> + fi
> + done
> + else
> + echo "Using generic icons for debathena-locker-menu..." >&2
> + for i in $ICONS; do
> + ln -nsf "$SHAREDIR/generic-icon.png" "$SHAREDIR/$i"
> + done
> + fi
> + ;;
> +
> + abort-upgrade|abort-remove|abort-deconfigure)
> + ;;
> +
> + *)
> + echo "postinst called with unknown argument \`$1'" >&2
> + exit 1
> + ;;
> +esac
> +
> +# dh_installdeb will replace this with shell code automatically
> +# generated by other debhelper scripts.
> +
> +#DEBHELPER#
> +
> +exit 0
>
> Added: trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.templates
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.templates (rev 0)
> +++ trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.templates 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -0,0 +1,11 @@
> +Template: debathena-locker-menu/license
> +Type: boolean
> +Default: false
> +_Description: Do you wish to install icons for the locker menu?
> + This package contains icons for third-party software programs that can
> + be launched via your desktop environment's menu system. These icons
> + are copyrighted and their distribution is restricted to members of the
> + MIT Community. If you are not a member of the MIT Community, you may
> + not install these icons. If you choose not to install these icons, a
> + generic icon will be supplied instead.
> +
>
> Added: trunk/debathena/debathena/locker-menu/debian/generic-icon.png
> ===================================================================
> (Binary files differ)
>
>
> Property changes on: trunk/debathena/debathena/locker-menu/debian/generic-icon.png
> ___________________________________________________________________
> Added: svn:mime-type
> + application/octet-stream
>
> Modified: trunk/debathena/debathena/locker-menu/debian/locker-acroread.desktop
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/locker-acroread.desktop 2012-07-31 14:32:19 UTC (rev 25673)
> +++ trunk/debathena/debathena/locker-menu/debian/locker-acroread.desktop 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -13,5 +13,5 @@
> Exec=gathrun acro acroread
> Terminal=false
> Type=Application
> -Icon=gnome-run
> +Icon=/usr/share/debathena-locker-menu/acroread.png
> Categories=Locker;
>
> Modified: trunk/debathena/debathena/locker-menu/debian/locker-maple.desktop
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/locker-maple.desktop 2012-07-31 14:32:19 UTC (rev 25673)
> +++ trunk/debathena/debathena/locker-menu/debian/locker-maple.desktop 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -4,5 +4,5 @@
> Exec=gathrun maple maple.java
> Terminal=false
> Type=Application
> -Icon=gnome-run
> +Icon=/usr/share/debathena-locker-menu/maple.png
> Categories=Locker;
>
> Modified: trunk/debathena/debathena/locker-menu/debian/locker-mathematica.desktop
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/locker-mathematica.desktop 2012-07-31 14:32:19 UTC (rev 25673)
> +++ trunk/debathena/debathena/locker-menu/debian/locker-mathematica.desktop 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -4,5 +4,5 @@
> Exec=gathrun math mathematica
> Terminal=false
> Type=Application
> -Icon=gnome-run
> +Icon=/usr/share/debathena-locker-menu/mathematica.png
> Categories=Locker;
>
> Modified: trunk/debathena/debathena/locker-menu/debian/locker-sas.desktop
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/locker-sas.desktop 2012-07-31 14:32:19 UTC (rev 25673)
> +++ trunk/debathena/debathena/locker-menu/debian/locker-sas.desktop 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -4,5 +4,5 @@
> Exec=gathrun sas
> Terminal=false
> Type=Application
> -Icon=gnome-run
> +Icon=/usr/share/debathena-locker-menu/sas.png
> Categories=Locker;
>
> Modified: trunk/debathena/debathena/locker-menu/debian/locker-stata.desktop
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/locker-stata.desktop 2012-07-31 14:32:19 UTC (rev 25673)
> +++ trunk/debathena/debathena/locker-menu/debian/locker-stata.desktop 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -4,5 +4,5 @@
> Exec=gathrun stata xstata-se
> Terminal=false
> Type=Application
> -Icon=gnome-run
> +Icon=/usr/share/debathena-locker-menu/stata.png
> Categories=Locker;
>
> Modified: trunk/debathena/debathena/locker-menu/debian/locker-tecplot.desktop
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/locker-tecplot.desktop 2012-07-31 14:32:19 UTC (rev 25673)
> +++ trunk/debathena/debathena/locker-menu/debian/locker-tecplot.desktop 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -4,5 +4,5 @@
> Exec=gathrun tecplot
> Terminal=false
> Type=Application
> -Icon=gnome-run
> +Icon=/usr/share/debathena-locker-menu/tecplot.png
> Categories=Locker;
>
> Modified: trunk/debathena/debathena/locker-menu/debian/locker-xess.desktop
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/locker-xess.desktop 2012-07-31 14:32:19 UTC (rev 25673)
> +++ trunk/debathena/debathena/locker-menu/debian/locker-xess.desktop 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -4,5 +4,5 @@
> Exec=gathrun xess
> Terminal=false
> Type=Application
> -Icon=gnome-run
> +Icon=/usr/share/debathena-locker-menu/xess.png
> Categories=Locker;
>
> Added: trunk/debathena/debathena/locker-menu/debian/po/POTFILES.in
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/po/POTFILES.in (rev 0)
> +++ trunk/debathena/debathena/locker-menu/debian/po/POTFILES.in 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -0,0 +1 @@
> +[type: gettext/rfc822deb] debathena-locker-menu.templates
>
> Added: trunk/debathena/debathena/locker-menu/debian/po/templates.pot
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/po/templates.pot (rev 0)
> +++ trunk/debathena/debathena/locker-menu/debian/po/templates.pot 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -0,0 +1,36 @@
> +# SOME DESCRIPTIVE TITLE.
> +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
> +# This file is distributed under the same license as the PACKAGE package.
> +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
> +#
> +#, fuzzy
> +msgid ""
> +msgstr ""
> +"Project-Id-Version: debathena-locker-menu\n"
> +"Report-Msgid-Bugs-To: debathena-locker-menu@packages.debian.org\n"
> +"POT-Creation-Date: 2012-07-31 13:29-0400\n"
> +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
> +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
> +"Language-Team: LANGUAGE <LL@li.org>\n"
> +"Language: \n"
> +"MIME-Version: 1.0\n"
> +"Content-Type: text/plain; charset=CHARSET\n"
> +"Content-Transfer-Encoding: 8bit\n"
> +
> +#. Type: boolean
> +#. Description
> +#: ../debathena-locker-menu.templates:1001
> +msgid "Do you wish to install icons for the locker menu?"
> +msgstr ""
> +
> +#. Type: boolean
> +#. Description
> +#: ../debathena-locker-menu.templates:1001
> +msgid ""
> +"This package contains icons for third-party software programs that can be "
> +"launched via your desktop environment's menu system. These icons are "
> +"copyrighted and their distribution is restricted to members of the MIT "
> +"Community. If you are not a member of the MIT Community, you may not "
> +"install these icons. If you choose not to install these icons, a generic "
> +"icon will be supplied instead."
> +msgstr ""
>
> Modified: trunk/debathena/debathena/locker-menu/debian/rules
> ===================================================================
> --- trunk/debathena/debathena/locker-menu/debian/rules 2012-07-31 14:32:19 UTC (rev 25673)
> +++ trunk/debathena/debathena/locker-menu/debian/rules 2012-07-31 18:54:15 UTC (rev 25674)
> @@ -1,3 +1,12 @@
> #!/usr/bin/make -f
>
> include /usr/share/cdbs/1/rules/debhelper.mk
> +
> +common-build-indep::
> + mkdir -p $(CURDIR)/icons-nonfree
> + cp /afs/athena.mit.edu/system/athena10/locker-menu-icons/*.png $(CURDIR)/icons-nonfree
> +
> +clean::
> + rm -rf $(CURDIR)/icons-nonfree
> +
> +
>
>
