diff options
| author | Dexter Morgan <dmorgan@mageia.org> | 2011-02-22 22:56:06 +0000 |
|---|---|---|
| committer | Dexter Morgan <dmorgan@mageia.org> | 2011-02-22 22:56:06 +0000 |
| commit | 2f63fc53ec92dc228a504822a8951cdc3b2914cf (patch) | |
| tree | 77ba440f00806401e8d4d30c627075f85bbba523 | |
| parent | 7462a0fcf0d75319d44f1603c669261f192bbfdd (diff) | |
| download | drakx-net-2f63fc53ec92dc228a504822a8951cdc3b2914cf.tar drakx-net-2f63fc53ec92dc228a504822a8951cdc3b2914cf.tar.gz drakx-net-2f63fc53ec92dc228a504822a8951cdc3b2914cf.tar.bz2 drakx-net-2f63fc53ec92dc228a504822a8951cdc3b2914cf.tar.xz drakx-net-2f63fc53ec92dc228a504822a8951cdc3b2914cf.zip | |
Merge mdv commit 271931 :
- Move autostart desktop files to /etc/xdg/autostart
- Remove xinit.d script: non-xdg-autostart compliant desktops should use the
xdg-compliance-autostart package if they want to run drakx-net and others
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rwxr-xr-x | scripts/net_applet.xinit | 5 |
3 files changed, 5 insertions, 11 deletions
@@ -6,9 +6,7 @@ libdir=/usr/lib bindir=/usr/bin sbindir=/usr/sbin desktopdir=/usr/share/applications -autostartdir=/usr/share/autostart -autostartgnomedir=/usr/share/gnome/autostart -xinitdir=/etc/X11/xinit.d +autostartdir=/etc/xdg/autostart iconsdir=/usr/lib/libDrakX/icons pixmapsdir=/usr/share/libDrakX/pixmaps pamdir=/etc/pam.d @@ -27,19 +25,17 @@ check: @for p in bin/*; do perl -cw $$p || exit 1; done install: - install -d $(DESTDIR){$(libdir),$(bindir),$(sbindir),$(desktopdir),$(autostartdir),$(autostartgnomedir),$(xinitdir),$(iconsdir),$(pixmapsdir),$(pamdir),$(consoleappsdir)} + install -d $(DESTDIR){$(libdir),$(bindir),$(sbindir),$(desktopdir),$(autostartdir),$(iconsdir),$(pixmapsdir),$(pamdir),$(consoleappsdir)} cp -a lib/* $(DESTDIR)$(libdir)/libDrakX/ find $(DESTDIR) -name .perl_checker -exec rm {} \; (cd bin; \ install -m755 $(BIN_TOOLS) $(DESTDIR)$(bindir); \ install -m755 $(SBIN_TOOLS) $(DESTDIR)$(sbindir); \ ) - install -m755 scripts/net_applet.xinit $(DESTDIR)$(xinitdir)/70net_applet install -m644 $(wildcard data/*.desktop) $(DESTDIR)$(desktopdir) install -m644 $(wildcard data/icons/*.png) $(DESTDIR)$(iconsdir) install -m644 $(wildcard data/pixmaps/*.png) $(DESTDIR)$(pixmapsdir) perl -pe 's/\s+--force//g' $(DESTDIR)$(desktopdir)/net_applet.desktop > $(DESTDIR)$(autostartdir)/net_applet.desktop - perl -pe 's/.*X-KDE.*\n//;s/\s+--force//g' $(DESTDIR)$(desktopdir)/net_applet.desktop > $(DESTDIR)$(autostartgnomedir)/net_applet.desktop make -C po install cleandist: @@ -1,4 +1,7 @@ - Make draknetcenter.desktop XDG compliant +- Move autostart desktop files to /etc/xdg/autostart +- Remove xinit.d script: non-xdg-autostart compliant desktops should use the + xdg-compliance-autostart package if they want to run drakx-net and others 0.92: - Keep UUID, NAME and LAST_CONNECT variables for NetworkManager diff --git a/scripts/net_applet.xinit b/scripts/net_applet.xinit deleted file mode 100755 index 052c841..0000000 --- a/scripts/net_applet.xinit +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -DESKTOP=$1 -case $DESKTOP in - IceWM|Fluxbox|xfce4|LXDE) exec /usr/bin/net_applet;; -esac |