← Back to branch summary

~ubuntu-branches/ubuntu/wily/gnome-do/wily

« back to all changes in this revision

Viewing changes to Do/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Christopher James Halse Rogers
  • Date: 2011-02-15 21:50:02 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110215215002-1j8ylb69o15asb06
Tags: 0.8.4-0ubuntu1
http://bugs.debian.org/565591
https://launchpad.net/bugs/450852
http://bugs.debian.org/603876
https://launchpad.net/bugs/553643
* The Race Against FF upload.  Merge from unreleased Debian git.
  Remaining Ubuntu changes:
  + debian/patches/05_disable_resize_grips.patch.diff:
    Disable resize handles for the Do windows.
  + debian/control:
    Bump gtk# build dep for HasResizeGrip API.
* New Debian changes:
* The long fortold release
  + Fixes a threadsafety issue resulting in 100% CPU usage (Closes: 565591,
    LP: #450852).
  + Proxies all keyring calls to the GTK main thread, as required by the new
    gnome-keyring (Closes: 603876, LP: #553643)
* debian/patches/00_bundledlibs.dpatch:
* debian/rules:
  + Upstream has dropped bundled gmcs binary; now 100% DFSG-free, so we don't
    have to repack the tarball or patch the buildsystem.
* debian/patches/03_disable_docky.dpatch:
  + Drop.  Docky is now gone in the upstream tarball.
* debian/rules:
* debian/control:
* debian/patches/*:
  + Switch to quilt to harmonise with other pkg-cli-* packages.
* debian/control:
  + Drop recommends on gnome-do-docklets.  Docky is now a separate package,
    so the docklets are useless for Do.
  + Bump Breaks on gnome-do-plugins to 0.8.3.  Do no longer provides the Wink
    library, which has been imported into the 0.8.3 do-plugins sources.
  + Bump standards-version; no changes needed.
  + Migrate to git and update VCS fields appropriately

Show diffs side-by-side

added added

removed removed

Lines of Context:
Do/Makefile.am
16
16
        gtk-gui/generated.cs \
17
17
        src/AssemblyInfo.cs \
18
18
        src/CorePreferences.cs \
19
 
        src/CoreKeybindings.cs \
20
19
        src/Do.Core/Do.Core.Addins/AddinClassifier.cs \
21
20
        src/Do.Core/Do.Core.Addins/CommunityAddinClassifier.cs \
22
21
        src/Do.Core/Do.Core.Addins/GreedyAddinClassifier.cs \
23
22
        src/Do.Core/Do.Core.Addins/OfficialAddinClassifier.cs \
24
 
        src/Do.Core/Do.Core.Addins/DockletAddinClassifier.cs \
25
23
        src/Do.Core/Controller.cs \
26
24
        src/Do.Core/DoAddinInstaller.cs \
27
25
        src/Do.Core/FirstSearchController.cs \
41
39
        src/Do.Platform/CoreService.cs \
42
40
        src/Do.Platform/ApplicationService.cs \
43
41
        src/Do.Platform/WindowingService.cs \
 
42
        src/Do.Platform/PluginManagerService.cs \
44
43
        src/Do.UI/ColorConfigurationWidget.cs \
45
44
        src/Do.UI/DoAddinInstallerDialog.cs \
46
45
        src/Do.UI/GeneralPreferencesWidget.cs \
71
70
        src/Do.cs \
72
71
        src/Mono.Addins/AddinExtensions.cs \
73
72
        src/Mono.Addins/Mono.Addins.Setup/AddinRepositoryEntryExtensions.cs \
74
 
        src/PathExtensions.cs \
75
 
        src/Util.cs \
76
 
        src/XKeybinder.cs
 
73
        src/PathExtensions.cs
77
74
 
78
75
RESOURCES = \
79
76
        gtk-gui/gui.stetic \
102
99
# Extra rules for our binary, not worth factoring out
103
100
#
104
101
 
105
 
CLEANFILES += Do.exe.config gnome-do
106
 
EXTRA_DIST += Do.exe.config.in gnome-do.in Do.addins
 
102
CLEANFILES += gnome-do
 
103
EXTRA_DIST += gnome-do.in Do.addins
107
104
 
108
 
module_DATA += Do.exe.config Do.addins
 
105
module_DATA += Do.addins
109
106
bin_SCRIPTS = gnome-do
110
107
 
111
108
MCS_FLAGS += -unsafe