~ubuntu-branches/ubuntu/vivid/brasero/vivid-proposed

« back to all changes in this revision

Viewing changes to libbrasero-burn/brasero-data-project.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-06-05 21:22:12 UTC
  • mfrom: (1.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20130605212212-u3cu9jh1gduibpsz
Tags: 3.8.0-1ubuntu1
* Sync with Debian. Remaining changes:
  - debian/control.in:
    + Build-Depend on libappindicator3-dev and libunity-dev
    + Don't build-depend on tracker
    + Recommends: brasero-cdrkit
    + libbrasero-media3-1 Depend on dvd+rw-tools and
      Suggest rather than Recommend gstreamer plugins & cdrdao
    + Also suggest gstreamer fluendo mp3 plugin
    + Have brasero-cdrkit Suggest, not Recommend, dvdauthor as it isn't
      in main.
  - debian/patches/012_appindicator.patch:
    + Use application indicators
    + And add symbols to libbrasero-media3-1.symbols
  - debian/patches/013_unity_launcher_progress: Display burn progress
    in Brasero's Unity launcher icon.
  - debian/rules:
    + Don't build search (requires tracker) but build unity support
* Bump breaks/replaces as we didn't take the brasero-cdkit split until now

Show diffs side-by-side

added added

removed removed

Lines of Context:
1674
1674
                /* The node is a fake directory; graft it as well as all the 
1675
1675
                 * nodes already in the tree with the same URI */
1676
1676
                graft = brasero_data_project_uri_graft_nodes (self, uri);
 
1677
                brasero_file_node_graft (node, graft);
1677
1678
        }
1678
1679
        else {
1679
1680
                gchar *parent_uri;