Package: gdesklets
Version: 0.36-3
Severity: normal
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu intrepid ubuntu-patch
Hi,
gdesklets includes in the package a number of shared mime info files:
/usr/share/mime/packages/gdesklets.xml
/usr/share/mime/application/x-gdesklets-display.xml
/usr/share/mime/globs2
/usr/share/mime/types
/usr/share/mime/generic-icons
/usr/share/mime/icons
/usr/share/mime/treemagic
Only /usr/share/mime/packages/gdesklets.xml should be included, all others are
created by running update-mime-database during build.
Note that in the package there are a number of rm calls in debian/rules to
remove some shared mime info files. Instead of updating these I think it
would be better to remove alltogether the calls to update-mime-database; this
way the package should be future-proof.
I have patched it this way in Ubuntu, I thought you may want to do the same
(patch attached).
I hope this helps,
Cesare
PS. The best would obviously be to be able to disable the whole
shared-mime-info business through a configure option, perhaps its worth
addressing this upstream?
diff -u gdesklets-0.36/debian/rules gdesklets-0.36/debian/rules
--- gdesklets-0.36/debian/rules
+++ gdesklets-0.36/debian/rules
@@ -21,11 +21,3 @@
- -rm -f debian/gdesklets/usr/share/mime/globs
- -rm -f debian/gdesklets/usr/share/mime/magic
- -rm -f debian/gdesklets/usr/share/mime/aliases
- -rm -f debian/gdesklets/usr/share/mime/subclasses
- -rm -f debian/gdesklets/usr/share/mime/XMLnamespaces
- -rm -f debian/gdesklets/usr/share/applications/mimeinfo.cache
ln -sf ../lib/gdesklets/gdesklets debian/gdesklets/usr/bin/gdesklets
cp debian/migration-tool debian/gdesklets/usr/share/gdesklets/
chmod 755 debian/gdesklets/usr/share/gdesklets/migration-tool
- # NEVER EVER ship the cache (#373600)
- -rm -f debian/gdesklets/usr/share/mime/mime.cache
only in patch2:
unchanged:
--- gdesklets-0.36.orig/debian/patches/30_remove_update_mime_database.diff
+++ gdesklets-0.36/debian/patches/30_remove_update_mime_database.diff
@@ -0,0 +1,21 @@
+diff -Nur -x '*.orig' -x '*~' gdesklets-0.36/data/Makefile.in gdesklets-0.36.new/data/Makefile.in
+--- gdesklets-0.36/data/Makefile.in 2008-02-16 18:45:50.000000000 +0100
++++ gdesklets-0.36.new/data/Makefile.in 2008-09-01 10:46:19.000000000 +0200
+@@ -549,17 +549,11 @@
+ cd $(DESTDIR)/$(fakepixmapdir); \
+ $(LN_S) -f ../../../share/pixmaps/gdesklets.png gdesklets.png;
+
+- if test -n "$(UPDATE_MIME_DATABASE)"; then \
+- $(UPDATE_MIME_DATABASE) "$(DESTDIR)${sharedmimedir}"; \
+- fi;
+ if test -n "$(UPDATE_DESKTOP_DATABASE)"; then \
+ $(UPDATE_DESKTOP_DATABASE) "$(DESTDIR)${desktopdir}"; \
+ fi;
+
+ uninstall-local: uninstall-desktopDATA uninstall-sharedmimepackageDATA
+- if test -n "$(UPDATE_MIME_DATABASE)"; then \
+- $(UPDATE_MIME_DATABASE) "$(DESTDIR)${sharedmimedir}"; \
+- fi;
+ if test -n "$(UPDATE_DESKTOP_DATABASE)"; then \
+ $(UPDATE_DESKTOP_DATABASE) "$(DESTDIR)${desktopdir}"; \
+ fi;
