[26635] in Source-Commits
/svn/athena r25669 - trunk/debathena/debathena/locker-menu/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Jul 30 10:37:07 2012
Date: Mon, 30 Jul 2012 10:37:05 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201207301437.q6UEb5Y1030718@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-07-30 10:37:04 -0400 (Mon, 30 Jul 2012)
New Revision: 25669
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-matlab.desktop
Log:
In locker-menu:
* Add an icon for MATLAB (Trac: #581)
Modified: trunk/debathena/debathena/locker-menu/debian/changelog
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/changelog 2012-07-28 15:09:59 UTC (rev 25668)
+++ trunk/debathena/debathena/locker-menu/debian/changelog 2012-07-30 14:37:04 UTC (rev 25669)
@@ -1,3 +1,9 @@
+debathena-locker-menu (1.8) unstable; urgency=low
+
+ * Add an icon for MATLAB (Trac: #581)
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 30 Jul 2012 10:28:21 -0400
+
debathena-locker-menu (1.7) unstable; urgency=low
* Temporarily fix MATLAB by making it run in a terminal (Trac #541)
Modified: trunk/debathena/debathena/locker-menu/debian/copyright
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/copyright 2012-07-28 15:09:59 UTC (rev 25668)
+++ trunk/debathena/debathena/locker-menu/debian/copyright 2012-07-30 14:37:04 UTC (rev 25669)
@@ -1,8 +1,15 @@
-The Athena source code was obtained from the Athena SVN repository at
-<svn://debathena.mit.edu/athena/trunk>, and is licensed as follows:
+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
+license were obtained from
+<http://www.mathworks.com/matlabcentral/fileexchange/24085> on July
+30, 2012, and the licensing information is current as of that date.
- Copyright © 2008 by the Massachusetts Institute of Technology.
+All other components of this package and its Debian packaging are
+licensed as follows:
+ Copyright © 2012 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
@@ -14,5 +21,3 @@
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.
Modified: trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.install
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.install 2012-07-28 15:09:59 UTC (rev 25668)
+++ trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.install 2012-07-30 14:37:04 UTC (rev 25669)
@@ -2,3 +2,4 @@
debian/Locker.directory usr/share/desktop-directories
debian/*.desktop usr/share/applications
debian/plif.png usr/share/debathena-locker-menu
+debian/matlabicon.png usr/share/debathena-locker-menu
Modified: trunk/debathena/debathena/locker-menu/debian/locker-matlab.desktop
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/locker-matlab.desktop 2012-07-28 15:09:59 UTC (rev 25668)
+++ trunk/debathena/debathena/locker-menu/debian/locker-matlab.desktop 2012-07-30 14:37:04 UTC (rev 25669)
@@ -4,5 +4,5 @@
Exec=gathrun matlab matlab -desktop
Terminal=true
Type=Application
-Icon=gnome-run
+Icon=/usr/share/debathena-locker-menu/matlabicon.png
Categories=Locker;
