[25435] in Source-Commits
/svn/athena r24981 - trunk/debathena/config/network-manager-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Feb 25 13:46:15 2011
Date: Fri, 25 Feb 2011 13:46:09 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201102251846.p1PIk9W7021311@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-02-25 13:46:08 -0500 (Fri, 25 Feb 2011)
New Revision: 24981
Removed:
trunk/debathena/config/network-manager-config/debian/debathena-network-manager-config.install
Modified:
trunk/debathena/config/network-manager-config/debian/changelog
trunk/debathena/config/network-manager-config/debian/control.in
trunk/debathena/config/network-manager-config/debian/rules
Log:
In network-manager-config:
* Put nm-applet on the LoginWindow in new gdm
Modified: trunk/debathena/config/network-manager-config/debian/changelog
===================================================================
--- trunk/debathena/config/network-manager-config/debian/changelog 2011-02-24 21:29:17 UTC (rev 24980)
+++ trunk/debathena/config/network-manager-config/debian/changelog 2011-02-25 18:46:08 UTC (rev 24981)
@@ -1,3 +1,9 @@
+debathena-network-manager-config (1.2) unstable; urgency=low
+
+ * Put nm-applet on the LoginWindow in new gdm
+
+ -- Jonathan Reed <jdreed@mit.edu> Thu, 24 Feb 2011 20:17:30 -0500
+
debathena-network-manager-config (1.1) unstable; urgency=low
* chmod the NetworkManager config file to 600 so NM won't ignore it.
Modified: trunk/debathena/config/network-manager-config/debian/control.in
===================================================================
--- trunk/debathena/config/network-manager-config/debian/control.in 2011-02-24 21:29:17 UTC (rev 24980)
+++ trunk/debathena/config/network-manager-config/debian/control.in 2011-02-25 18:46:08 UTC (rev 24981)
@@ -2,13 +2,15 @@
Section: debathena-config/net
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: @cdbs@
+Build-Depends: @cdbs@, gdm
Standards-Version: 3.7.2
Package: debathena-network-manager-config
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, gdm
Description: NetworkManager configuration for Debathena workstations
- This package configures your computer to connect to the "MIT" wireless
- network on boot, which permits you to log in to network accounts from
- the initial login screen.
+ On older releases, this package configures your computer to connect
+ to the "MIT" wireless network on boot, which permits you to log in to
+ network accounts from the initial login screen. On newer releases,
+ it provides a NetworkManager applet on the login screen, which the
+ user can use to configure network themselves.
Modified: trunk/debathena/config/network-manager-config/debian/rules
===================================================================
--- trunk/debathena/config/network-manager-config/debian/rules 2011-02-24 21:29:17 UTC (rev 24980)
+++ trunk/debathena/config/network-manager-config/debian/rules 2011-02-25 18:46:08 UTC (rev 24981)
@@ -1,6 +1,19 @@
#!/usr/bin/make -f
+GDM_VERSION = $(shell dpkg-query --showformat='$${Version}' --show gdm)
+NEW_GDM = $(shell dpkg --compare-versions $(GDM_VERSION) ge '2.25.2~' && echo y)
+
+ifeq ($(NEW_GDM),y)
+ DEB_DH_LINK_debathena-network-manager-config += \
+ /etc/xdg/autostart/nm-applet.desktop /usr/share/gdm/autostart/LoginWindow/nm-applet.desktop
+endif
+
include /usr/share/cdbs/1/rules/debhelper.mk
-binary-fixup/debathena-network-manager-config::
+ifneq ($(NEW_GDM),y)
+ install/debathena-network-manager-config::
+ dh_install debian/MIT etc/NetworkManager/system-connections
+
+ binary-fixup/debathena-network-manager-config::
chmod 600 $(DEB_DESTDIR)/etc/NetworkManager/system-connections/MIT
+endif
