← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gtk-qt-engine/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/03_disable_engine_with_nspluginviewer.diff

  • Committer: Bazaar Package Importer
  • Author(s): Fathi Boudra, Didier Raboud, Fathi Boudra
  • Date: 2009-06-25 09:35:02 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20090625093502-ovidnbr0okqkm6ua
Tags: 1:1.1+svn5-1
http://bugs.debian.org/480696
http://bugs.debian.org/527340
* New svn repository (http://code.google.com/p/gtk-qt-engine)
  - Update upstream package to revision 5
    "Updated Norwegian Nynorsk translation by Karl Ove Hufthammer"

[ Didier Raboud ]

* Change source and binary name to gtk-qt-engine.
  - Bump epoch to 1 due to previous gtk-qt-engine being 1:0.8.
    (Closes: 480696)
  - Use the actual repository revision.
* Update debian/control:
  - Add myself to Uploaders field.
  - Add Vcs-{Svn,Browser} fields.
* Refactorize debian/rules:
  - Remove the custom debian/cdbs directory.
  - Add get-orig-source target.
* Add 04_no_kde4_in_configfile.diff patch (Closes: 527340).

[ Fathi Boudra ]

* Bump Standard-Version to 3.8.2 (no changes needed).
* Update debian/control: drop cdbs build dependency.
* Update debian/copyright: update upstream url.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03_disable_engine_with_nspluginviewer.diff
 
1
--- a/src/engine.cpp
 
2
+++ b/src/engine.cpp
 
3
@@ -110,7 +110,8 @@ Engine::Engine()
 
4
            commandLine.contains("metacity") ||
 
5
            commandLine.contains("xfwm4") ||
 
6
            commandLine.contains("gnome-settings-daemon") ||
 
7
-           commandLine.contains("gnome-panel"))
 
8
+           commandLine.contains("gnome-panel") ||
 
9
+           commandLine.contains("nspluginviewer"))
 
10
        {
 
11
                m_enabled = false;
 
12
                qDebug() << "Disabling the GTK-Qt Theme Engine for" << commandLine;