stop-shipping-mimelnk-desktop-files

Gbp-Pq: Name stop-shipping-mimelnk-desktop-files.diff

diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index b335dd4d814b5bc96c5b2fd980f86c9819fa30c2..e3aa5a5243b625ddc7ca437d1043056788dc32e5 100755 (executable)
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -141,7 +141,6 @@ cd -
 # desktop files will be added by the corresponding add_wrapper command
 if test -f $DESTDIR/gid_Module_Root_Brand ; then
     for dir in $PREFIXDIR/share/application-registry \
-               $PREFIXDIR/share/mimelnk/application \
                $PREFIXDIR/share/mime/packages \
                $PREFIXDIR/share/mime-info \
                $PREFIXDIR/share/icons ; do

diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index c81edd50f1afb4acf49b271e9c6b5f731bcd84bd..788191b05bafb109ee34fbed964140eb523d625b 100644 (file)
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -129,7 +129,6 @@ $(eval $(call gb_CustomTarget_register_targets,sysui/share,\
                $(product)/openoffice.keys \
                $(product)/openoffice.sh \
                $(product)/create_tree.sh \
-               $(product)/mimelnklist \
                $(product)/launcherlist) \
 ))
 
@@ -149,16 +148,6 @@ $(share_WORKDIR)/%/openoffice.keys:  \
                --ext "keys" --key "description" $(share_WORKDIR)/documents.ulf
        cat $(MIMEKEYS) > $@
 
-$(share_WORKDIR)/%/mimelnklist: $(MIMEDESKTOPS) $(share_SRCDIR)/share/brand.pl \
-       $(share_TRANSLATE) $(share_WORKDIR)/documents.ulf
-       mkdir -p $(dir $@)
-       $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
-       $(PERL) $(share_SRCDIR)/share/brand.pl -p $* -u $(UNIXFILENAME.$*) \
-               --iconprefix $(UNIXFILENAME.$*)- $^ $(share_WORKDIR)/$*
-       $(PERL) $(share_TRANSLATE) -p $* -d $(share_WORKDIR)/$* \
-               --ext "desktop" --key "Comment" $(share_WORKDIR)/documents.ulf
-       echo "$(MIMEDESKTOPS)" > $@
-
 $(share_WORKDIR)/%/openoffice.mime: $(share_SRCDIR)/mimetypes/openoffice.mime
        mkdir -p $(dir $@)
        $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
@@ -169,7 +158,7 @@ $(share_WORKDIR)/%/openoffice.sh: $(share_SRCDIR)/share/openoffice.sh
        $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
        cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$*)/g" > $@
 
-$(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh $(share_WORKDIR)/%/mimelnklist \
+$(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh \
        $(share_WORKDIR)/%/openoffice.org.xml $(share_WORKDIR)/%/openoffice.applications $(share_WORKDIR)/%/openoffice.mime \
        $(share_WORKDIR)/%/openoffice.keys $(share_WORKDIR)/%/launcherlist $(if $(INTROSPECTION_SCANNER),$(call gb_Library_get_target,libreofficekitgtk))
        mkdir -p $(dir $@)

diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 4a0f7e7925602b6c2d7df0b90b301e8866dc777f..c3e154f28e4e00f9ea186de01ff897f3038e1ea3 100755 (executable)
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -66,7 +66,6 @@ cd $RPM_BUILD_ROOT
 rm -rf usr/share/application-registry
 rm -rf usr/share/applications.flag
 rm -rf usr/share/mime-info
-rm -rf usr/share/mimelnk
 rm -rf usr/share/applnk-redhat
 #find usr/share/icons -name '*.png' -exec chmod g+w {} \;
 

diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl
index ae2911be9ed0f3eda8f6e1e46b7c94163b2845b3..2be723b30514972e78a42d40b7cac88cf337ecf0 100644 (file)
--- a/sysui/desktop/share/brand.pl
+++ b/sysui/desktop/share/brand.pl
@@ -22,7 +22,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 
 #
 # This tool is used to re-write and substitute variables
-# into Unix .desktop, mimelnk, .keys files etc.
+# into Unix .desktop, .keys files etc.
 #
 
 $destdir = pop @ARGV;

diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 19a5ce38f924503fdcbcd3b4f7499ef85b9b2a8c..3f24b5fd7bf49f2e54c72ac3fee4e4b3b0039b9d 100755 (executable)
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -29,11 +29,6 @@ if [ "${KDEMAINDIR}" ]; then
   done
   unset targetdir destfile
 
-  mkdir -p "${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application"
-  for i in `cat mimelnklist`; do
-    cp "${i}" "${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/${PREFIX}-`basename ${i}`"
-  done
-  chmod 0644 "${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/"*
 fi
 
 if [ "${GNOMEDIR}" ]; then