r22736 - in /desktop/unstable/gnome-menus/debian: changelog gnome-menus-blacklist gnome-menus.install gnome-menus.postinst gnome-menus.triggers menus.blacklist

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Jan 9 12:19:15 UTC 2010


Author: joss
Date: Sat Jan  9 12:19:12 2010
New Revision: 22736

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22736
Log:
* gnome-menus-blacklist: new script. Implements a blacklist of menu 
  entries that won't be shown by default, until the packages shipping 
  them are fixed to use NotShowIn=GNOME.
* menus.blacklist: the configuration file for this script.
* gnome-menus.triggers, gnome-menus.postinst: re-run it every time 
  something has changed in /usr/share/applications.
* gnome-menus.install: install this.

Added:
    desktop/unstable/gnome-menus/debian/gnome-menus-blacklist
    desktop/unstable/gnome-menus/debian/gnome-menus.postinst
    desktop/unstable/gnome-menus/debian/gnome-menus.triggers
    desktop/unstable/gnome-menus/debian/menus.blacklist
Modified:
    desktop/unstable/gnome-menus/debian/changelog
    desktop/unstable/gnome-menus/debian/gnome-menus.install

Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=22736&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/changelog [utf-8] Sat Jan  9 12:19:12 2010
@@ -1,3 +1,15 @@
+gnome-menus (2.28.0.1-2) unstable; urgency=low
+
+  * gnome-menus-blacklist: new script. Implements a blacklist of menu 
+    entries that won't be shown by default, until the packages shipping 
+    them are fixed to use NotShowIn=GNOME.
+  * menus.blacklist: the configuration file for this script.
+  * gnome-menus.triggers, gnome-menus.postinst: re-run it every time 
+    something has changed in /usr/share/applications.
+  * gnome-menus.install: install this.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 09 Jan 2010 13:18:59 +0100
+
 gnome-menus (2.28.0.1-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/unstable/gnome-menus/debian/gnome-menus-blacklist
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/gnome-menus-blacklist?rev=22736&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/gnome-menus-blacklist (added)
+++ desktop/unstable/gnome-menus/debian/gnome-menus-blacklist [utf-8] Sat Jan  9 12:19:12 2010
@@ -1,0 +1,69 @@
+#! /usr/bin/python
+
+sourcedir = "/usr/share/applications"
+destdir = "/usr/share/gnome/applications"
+blacklist_file = "/etc/gnome/menus.blacklist"
+
+import sys, os
+
+# Parse blacklist file
+blacklist = []
+try:
+    for l in file (blacklist_file):
+        l = l.strip()
+        if l.startswith("#"):
+            continue
+        blacklist.append(l)
+except IOError:
+    sys.stderr.write("Warning: %s cannot be opened\n"%blacklist_file)
+
+# Built the list of files to work on
+sourcefiles = []
+for root, dirs, files in os.walk (sourcedir):
+    reldir = root[len(sourcedir)+1:]
+    for f in files:
+        relfile = os.path.join (reldir, f)
+        if relfile.endswith(".desktop") and (f in blacklist or relfile in blacklist):
+            sourcefiles.append(relfile)
+
+# Remove obsolete files
+for root, dirs, files in os.walk (destdir, topdown=False):
+    reldir = root[len(destdir)+1:]
+    for f in files:
+        relfile = os.path.join (reldir, f)
+        if f.endswith(".desktop") and relfile not in sourcefiles:
+            os.remove (os.path.join (destdir, relfile))
+    if reldir:
+        try:
+            os.rmdir (root)
+        except OSError:
+            pass
+
+# Now process the files
+for f in sourcefiles:
+    sourcefile = os.path.join (sourcedir, f)
+    destfile = os.path.join (destdir, f)
+    absdir = os.path.dirname (destfile)
+
+    # The mtime is used as a flag to check if the file has changed
+    source_time = int (os.stat (sourcefile).st_mtime)
+    try:
+        dest_time = int (os.stat (destfile).st_mtime)
+    except OSError:
+        dest_time = 0
+    if source_time == dest_time:
+        continue
+
+    # Copy file, adding a NoDisplay flag
+    if not os.path.isdir (absdir):
+        os.makedirs (absdir)
+    out = file (destfile, "w")
+    for l in file (sourcefile):
+        if l.startswith ("NoDisplay="):
+            continue
+        out.write(l)
+    out.write ("NoDisplay=true\n")
+    out.close()
+
+    # Set mtime so that the file is not touched unless it has changed
+    os.utime (destfile, (source_time, source_time))

Modified: desktop/unstable/gnome-menus/debian/gnome-menus.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/gnome-menus.install?rev=22736&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/gnome-menus.install [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/gnome-menus.install [utf-8] Sat Jan  9 12:19:12 2010
@@ -3,6 +3,8 @@
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/applications
 debian/tmp/usr/share/gnome-menus/ui
+debian/gnome-menus-blacklist /usr/sbin
+debian/menus.blacklist /etc/gnome
 debian/tmp/usr/share/desktop-directories
 layout/settings.menu /etc/xdg/menus
 debian/desktop-files/*.directory /usr/share/desktop-directories

Added: desktop/unstable/gnome-menus/debian/gnome-menus.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/gnome-menus.postinst?rev=22736&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/gnome-menus.postinst (added)
+++ desktop/unstable/gnome-menus/debian/gnome-menus.postinst [utf-8] Sat Jan  9 12:19:12 2010
@@ -1,0 +1,10 @@
+#! /bin/sh
+set -r
+
+gnome-menus-blacklist
+
+if [ "$1" = triggered ]; then
+    exit 0
+fi
+
+#DEBHELPER#

Added: desktop/unstable/gnome-menus/debian/gnome-menus.triggers
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/gnome-menus.triggers?rev=22736&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/gnome-menus.triggers (added)
+++ desktop/unstable/gnome-menus/debian/gnome-menus.triggers [utf-8] Sat Jan  9 12:19:12 2010
@@ -1,0 +1,1 @@
+interest /usr/share/applications

Added: desktop/unstable/gnome-menus/debian/menus.blacklist
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/menus.blacklist?rev=22736&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/menus.blacklist (added)
+++ desktop/unstable/gnome-menus/debian/menus.blacklist [utf-8] Sat Jan  9 12:19:12 2010
@@ -1,0 +1,185 @@
+# openjdk-6
+openjdk-6-policytool.desktop
+
+# sun-java6
+sun-java6-controlpanel.desktop
+sun-java6-java.desktop
+sun-java6-javaws.desktop
+sun-java6-jconsole.desktop
+sun-java6-policytool.desktop
+
+# hplip
+hplip.desktop
+hplip-kubuntu.desktop
+hp-fab.desktop
+hp-sendfax.desktop
+
+# kdeaccessibility
+kde4/kttsmgr.desktop
+kde4/kmag.desktop
+kde4/kmousetool.desktop
+kde4/kmouth.desktop
+
+# kdeadmin
+kde4/kuser.desktop
+kde4/ksystemlog.desktop
+kde4/kpackage.desktop
+
+# kdebase
+kde4/kwrite.desktop
+kde4/dolphin.desktop
+kde4/kappfinder.desktop
+kde4/konsole.desktop
+kde4/konqbrowser.desktop
+kde4/kinfocenter.desktop
+kde4/kfind.desktop
+
+# kdebluetooth
+kde/kbluelock.desktop
+kde/kbluemon.desktop
+kde/kinputwizard.desktop
+kde/kbtobexclient.desktop
+kde/kbtobexsrv.desktop
+kde/kcm_btpaired.desktop
+kde/kbluetooth.desktop
+
+# kdeedu - no equivalents in GNOME
+
+# kdegames - only those which have equivalents in gnome-games
+kde4/ksame.desktop
+kde4/kfourinline.desktop
+kde4/kmines.desktop
+kde4/killbots.desktop
+kde4/klines.desktop
+kde4/ksudoku.desktop
+kde4/kmahjongg.desktop
+kde4/kpat.desktop
+kde4/kreversi.desktop
+kde4/kdesnake.desktop
+kde4/kblocks.desktop
+
+# kdegraphics
+kde4/kcolorchooser.desktop
+kde4/kruler.desktop
+kde4/okular.desktop
+kde4/gwenview.desktop
+kde4/kolourpaint.desktop
+kde4/ksnapshot.desktop
+
+# kdemultimedia
+kde4/kmix.desktop
+kde4/juk.desktop
+kde4/dragonplayer.desktop
+kde4/kscd.desktop
+
+# kdenetwork
+kde4/krfb.desktop
+kde4/kopete.desktop
+kde4/Kppp.desktop
+kde4/kget.desktop
+kde4/krdc.desktop
+
+# kdepim
+kde4/ktimetracker.desktop
+kde4/groupwarewizard.desktop
+kde4/KNode.desktop
+kde4/Kjots.desktop
+kde4/Kontact.desktop
+kde4/kpilot.desktop
+kde4/knotes.desktop
+kde4/kalarm.desktop
+kde4/kaddressbook.desktop
+kde4/akregator.desktop
+kde4/KMail.desktop
+kde4/korganizer.desktop
+
+# kdesdk
+kde4/kompare.desktop
+kde4/cervisia.desktop
+kde4/umbrello.desktop
+kde4/kuiviewer.desktop
+kde4/lokalize.desktop
+kde4/kcachegrind.desktop
+kde4/kbugbuster.desktop
+kde4/kate.desktop
+kde4/kapptemplate.desktop
+
+# kdetoys
+kde4/amor.desktop
+kde4/kteatime.desktop
+
+# kdeutils
+kde4/kwalletmanager.desktop
+kde4/ktimer.desktop
+kde4/KCharSelect.desktop
+kde4/KFloppy.desktop
+kde4/kdf.desktop
+kde4/ark.desktop
+kde4/superkaramba.desktop
+kde4/kwikdisk.desktop
+kde4/irkick.desktop
+kde4/sweeper.desktop
+kde4/kcalc.desktop
+kde4/okteta.desktop
+kde4/kgpg.desktop
+
+# kdevelop - only remove the redundant stuff
+kde/kdevelop_kde_cpp.desktop
+kde/kdevelop_scripting.desktop
+kde/kdevelop_ruby.desktop
+kde/kdevelop_c_cpp.desktop
+
+# kdewebdev
+kde4/kfilereplace.desktop
+kde4/klinkstatus.desktop
+kde4/kxsldbg.desktop
+kde4/kimagemapeditor.desktop
+
+# Other KDE-only stuff that have GNOME equivalents in the standard install
+amarok.desktop
+codeine.desktop
+digikam.desktop
+gwenview.desktop
+k3b.desktop
+kaffeine.desktop
+kasablanca.desktop
+katapult.desktop
+kcm_knemo.desktop
+kdesvn.desktop
+kdiff3.desktop
+keep.desktop
+kftpgrabber.desktop
+Kino.desktop
+kmplayer.desktop
+knetload.desktop
+knmap.desktop
+komparator.desktop
+konversation.desktop
+kpowersave.desktop
+krusader.desktop
+krusader_root-mode.desktop
+ksystemlog.desktop
+ktorrent.desktop
+qt3config.desktop
+qt4config.desktop
+showfoto.desktop
+smb4k.desktop
+
+# Viewers only belong in the MIME associations, not in the menu
+djvulibre-djview3.desktop
+djvulibre-djview4.desktop
+xpdf.desktop
+
+# Bazaar preferences don't belong in the menu
+bazaar-properties.desktop
+# Neither do notification area icons, they should be autostarted on demand
+bzr-notify.desktop
+
+# xscreensaver
+xscreensaver.desktop
+xscreensaver-properties.desktop
+
+# IDLE - we don't need one entry for each Python version
+idle-python2.4.desktop
+idle-python2.5.desktop
+idle-python2.6.desktop




More information about the pkg-gnome-commits mailing list