aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Crozat <fcrozat@mandriva.com>2002-09-04 09:12:34 +0000
committerFrederic Crozat <fcrozat@mandriva.com>2002-09-04 09:12:34 +0000
commit373b4c51216de4361f7c9f8826c900bd34064e42 (patch)
tree9523a50163839e3f6f2bdc1461f0777e0eee9277
parentfde097df512296afdadd95f02d1caf3bf263f2f3 (diff)
downloadrpmdrake-373b4c51216de4361f7c9f8826c900bd34064e42.tar
rpmdrake-373b4c51216de4361f7c9f8826c900bd34064e42.tar.gz
rpmdrake-373b4c51216de4361f7c9f8826c900bd34064e42.tar.bz2
rpmdrake-373b4c51216de4361f7c9f8826c900bd34064e42.tar.xz
rpmdrake-373b4c51216de4361f7c9f8826c900bd34064e42.zip
Remove .directory file (moved to drakconf)
Add .desktop for MandrakeUpdate
-rw-r--r--data/Makefile11
-rw-r--r--data/SoftwareManagement.directory.in4
-rw-r--r--data/mandrakeupdate.desktop.in8
3 files changed, 11 insertions, 12 deletions
diff --git a/data/Makefile b/data/Makefile
index d2987f02..a42825cd 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -4,24 +4,19 @@ BINDIR = $(PREFIX)/bin
rpmdrake_dir = $(DATADIR)/rpmdrake
-DIRECTORY_IN := $(wildcard *.directory.in)
-DIRECTORY = $(DIRECTORY_IN:.directory.in=.directory)
-
DESKTOP_IN := $(wildcard *.desktop.in)
DESKTOP = $(DESKTOP_IN:.desktop.in=.desktop)
-all: $(DIRECTORY) $(DESKTOP)
+all: $(DESKTOP)
clean:
- rm -f $(DIRECTORY) $(DESKTOP)
+ rm -f $(DESKTOP)
install: all
install -d $(rpmdrake_dir)/desktop
- install -m644 $(DESKTOP) $(DIRECTORY) $(rpmdrake_dir)/desktop
+ install -m644 $(DESKTOP) $(rpmdrake_dir)/desktop
%.desktop: %.desktop.in
../po/intltool-merge --utf8 ../po $< $@ -d -u -c ../po/.intltool-merge-cache
-%.directory: %.directory.in
- ../po/intltool-merge --utf8 ../po $< $@ -d -u -c ../po/.intltool-merge-cache
diff --git a/data/SoftwareManagement.directory.in b/data/SoftwareManagement.directory.in
deleted file mode 100644
index aaa6237a..00000000
--- a/data/SoftwareManagement.directory.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Desktop Entry]
-_Name=Software Management
-Icon=/usr/share/mcc/themes/default/software.png
-Type=Directory \ No newline at end of file
diff --git a/data/mandrakeupdate.desktop.in b/data/mandrakeupdate.desktop.in
new file mode 100644
index 00000000..0170545f
--- /dev/null
+++ b/data/mandrakeupdate.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Mandrake Update
+Icon=/usr/share/mcc/themes/default/MandrakeUpdate.png
+Exec=/usr/bin/MandrakeUpdate
+Terminal=0
+Type=Application
+Categories=System;SystemSetup;X-Mandrake-SoftwareManagement \ No newline at end of file