[27102] in Source-Commits
/svn/athena r25947 - trunk/debathena/debathena/locker-menu/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Apr 24 11:28:56 2013
Date: Wed, 24 Apr 2013 11:28:49 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201304241528.r3OFSniF031748@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-04-24 11:28:49 -0400 (Wed, 24 Apr 2013)
New Revision: 25947
Added:
trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.lintian-overrides
Modified:
trunk/debathena/debathena/locker-menu/debian/changelog
trunk/debathena/debathena/locker-menu/debian/control
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-matlab.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 StartupWMClass entries where available (Trac: #1208)
* Switch to dh7 from CDBS
Modified: trunk/debathena/debathena/locker-menu/debian/changelog
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/changelog 2013-04-23 20:15:25 UTC (rev 25946)
+++ trunk/debathena/debathena/locker-menu/debian/changelog 2013-04-24 15:28:49 UTC (rev 25947)
@@ -1,10 +1,12 @@
-debathena-locker-menu (1.10) UNRELEASED; urgency=low
+debathena-locker-menu (1.10) unstable; urgency=low
* Switch from control.in to control (Trac: #561)
* Bump Standards-Version to 3.9.3
* Bump compat level to 7
+ * Add StartupWMClass entries where available (Trac: #1208)
+ * Switch to dh7 from CDBS
- -- Jonathan Reed <jdreed@mit.edu> Wed, 03 Apr 2013 13:31:12 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 24 Apr 2013 11:28:41 -0400
debathena-locker-menu (1.9) unstable; urgency=low
Modified: trunk/debathena/debathena/locker-menu/debian/control
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/control 2013-04-23 20:15:25 UTC (rev 25946)
+++ trunk/debathena/debathena/locker-menu/debian/control 2013-04-24 15:28:49 UTC (rev 25947)
@@ -2,7 +2,7 @@
Section: debathena/base
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs, debhelper, dh-buildinfo
+Build-Depends: debhelper (>= 7.0.50~)
Standards-Version: 3.9.3
Package: debathena-locker-menu
Added: trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.lintian-overrides
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.lintian-overrides (rev 0)
+++ trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.lintian-overrides 2013-04-24 15:28:49 UTC (rev 25947)
@@ -0,0 +1,4 @@
+desktop-entry-lacks-main-category
+desktop-entry-invalid-category
+desktop-command-not-in-package
+extra-license-file usr/share/doc/debathena-locker-menu/matlab-icon-license.txt
Modified: trunk/debathena/debathena/locker-menu/debian/locker-acroread.desktop
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/locker-acroread.desktop 2013-04-23 20:15:25 UTC (rev 25946)
+++ trunk/debathena/debathena/locker-menu/debian/locker-acroread.desktop 2013-04-24 15:28:49 UTC (rev 25947)
@@ -15,3 +15,4 @@
Type=Application
Icon=/usr/share/debathena-locker-menu/acroread.png
Categories=Locker;
+StartupWMClass="Adobe Reader"
Modified: trunk/debathena/debathena/locker-menu/debian/locker-maple.desktop
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/locker-maple.desktop 2013-04-23 20:15:25 UTC (rev 25946)
+++ trunk/debathena/debathena/locker-menu/debian/locker-maple.desktop 2013-04-24 15:28:49 UTC (rev 25947)
@@ -6,3 +6,4 @@
Type=Application
Icon=/usr/share/debathena-locker-menu/maple.png
Categories=Locker;
+# Maple's StartupWMClass is " ", which needless to say doesn't work.
Modified: trunk/debathena/debathena/locker-menu/debian/locker-mathematica.desktop
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/locker-mathematica.desktop 2013-04-23 20:15:25 UTC (rev 25946)
+++ trunk/debathena/debathena/locker-menu/debian/locker-mathematica.desktop 2013-04-24 15:28:49 UTC (rev 25947)
@@ -6,3 +6,5 @@
Type=Application
Icon=/usr/share/debathena-locker-menu/mathematica.png
Categories=Locker;
+# This is probably a bad idea
+StartupWMClass="Qt-subapplication"
Modified: trunk/debathena/debathena/locker-menu/debian/locker-matlab.desktop
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/locker-matlab.desktop 2013-04-23 20:15:25 UTC (rev 25946)
+++ trunk/debathena/debathena/locker-menu/debian/locker-matlab.desktop 2013-04-24 15:28:49 UTC (rev 25947)
@@ -6,3 +6,6 @@
Type=Application
Icon=/usr/share/debathena-locker-menu/matlabicon.png
Categories=Locker;
+# The name of the window first opened by the app to indicate
+# a successful launch
+StartupWMClass="MATLAB"
Modified: trunk/debathena/debathena/locker-menu/debian/locker-sas.desktop
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/locker-sas.desktop 2013-04-23 20:15:25 UTC (rev 25946)
+++ trunk/debathena/debathena/locker-menu/debian/locker-sas.desktop 2013-04-24 15:28:49 UTC (rev 25947)
@@ -6,3 +6,4 @@
Type=Application
Icon=/usr/share/debathena-locker-menu/sas.png
Categories=Locker;
+# No StartupWMClass available
Modified: trunk/debathena/debathena/locker-menu/debian/locker-stata.desktop
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/locker-stata.desktop 2013-04-23 20:15:25 UTC (rev 25946)
+++ trunk/debathena/debathena/locker-menu/debian/locker-stata.desktop 2013-04-24 15:28:49 UTC (rev 25947)
@@ -6,3 +6,4 @@
Type=Application
Icon=/usr/share/debathena-locker-menu/stata.png
Categories=Locker;
+# Stata's StartupWMClass is version-dependent
Modified: trunk/debathena/debathena/locker-menu/debian/locker-tecplot.desktop
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/locker-tecplot.desktop 2013-04-23 20:15:25 UTC (rev 25946)
+++ trunk/debathena/debathena/locker-menu/debian/locker-tecplot.desktop 2013-04-24 15:28:49 UTC (rev 25947)
@@ -6,3 +6,4 @@
Type=Application
Icon=/usr/share/debathena-locker-menu/tecplot.png
Categories=Locker;
+StartupWMClass="Tecplot"
Modified: trunk/debathena/debathena/locker-menu/debian/locker-xess.desktop
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/locker-xess.desktop 2013-04-23 20:15:25 UTC (rev 25946)
+++ trunk/debathena/debathena/locker-menu/debian/locker-xess.desktop 2013-04-24 15:28:49 UTC (rev 25947)
@@ -6,3 +6,4 @@
Type=Application
Icon=/usr/share/debathena-locker-menu/xess.png
Categories=Locker;
+# No StartupWMClass available
Modified: trunk/debathena/debathena/locker-menu/debian/rules
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/rules 2013-04-23 20:15:25 UTC (rev 25946)
+++ trunk/debathena/debathena/locker-menu/debian/rules 2013-04-24 15:28:49 UTC (rev 25947)
@@ -1,12 +1,14 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+ dh $@
-common-build-indep::
+override_dh_auto_build:
mkdir -p $(CURDIR)/icons-nonfree
cp /afs/athena.mit.edu/system/athena10/locker-menu-icons/*.png $(CURDIR)/icons-nonfree
-clean::
+override_dh_clean:
+ dh_clean
rm -rf $(CURDIR)/icons-nonfree
