Merge lp:~ari-tczew/ubuntu/utopic/brasero/merge into lp:ubuntu/utopic/brasero

[Artur Rona]

[lp:~ari-tczew/ubuntu/utopic/brasero/merge]

115. By Artur Rona on 2014-05-29

Fix merge Debian revision 3.8.0-2.

[Iain Lane (laney)]

Thanks, we'll take the ubuntu-desktop merge as this is the branch that we use

Unmerged revisions

115. By Artur Rona on 2014-05-29

Fix merge Debian revision 3.8.0-2.

114. By Artur Rona on 2014-05-28

* Merge from Debian unstable. Remaining changes:
  - debian/control{.in}:
    + Build-Depends on libappindicator3-dev and libunity-dev.
    + Don't {Build-}Depends on Tracker.
    + brasero 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,
    debian/libbrasero-media3-1.symbols:
    + Use application indicators.
  - 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.
* New upstream release.
* Remove patches, all merged upstream.
* Switch to tracker 1.0. (Closes: #741428)
* Update symbols file, add new brasero_utils_get_option_group symbol.
* Bump Standards-Version to 3.9.5. No further changes.
* Drop obsolete --disable-scrollkeeper configure flag.
* Build against tracker 0.16.

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-17 13:09:35 +0000
+++ debian/changelog	2014-05-29 05:25:44 +0000
@@ -1,3 +1,35 @@
+brasero (3.10.0-1ubuntu1) utopic; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control{.in}:
+      + Build-Depends on libappindicator3-dev and libunity-dev.
+      + Don't {Build-}Depends on Tracker.
+      + brasero 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,
+      debian/libbrasero-media3-1.symbols:
+      + Use application indicators.
+    - 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.
+
+ -- Artur Rona <[e-mail]>  Wed, 28 May 2014 22:28:55 +0200
+
+brasero (3.10.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Remove patches, all merged upstream.
+  * Switch to tracker 1.0. (Closes: #741428)
+  * Update symbols file, add new brasero_utils_get_option_group symbol.
+  * Bump Standards-Version to 3.9.5. No further changes.
+
+ -- Michael Biebl <[e-mail]>  Sat, 10 May 2014 01:29:30 +0200
+
 brasero (3.10.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream release:
@@ -15,6 +47,13 @@
 
  -- Robert Ancell <[e-mail]>  Tue, 17 Dec 2013 13:09:35 +1300
 
+brasero (3.8.0-2) unstable; urgency=low
+
+  * Drop obsolete --disable-scrollkeeper configure flag.
+  * Build against tracker 0.16.
+
+ -- Michael Biebl <[e-mail]>  Tue, 30 Jul 2013 14:08:57 +0200
+
 brasero (3.8.0-1ubuntu4) trusty; urgency=medium
 
   * No-change rebuild for libtotem-plparser18
 
=== modified file 'debian/control'
--- debian/control	2013-12-16 16:57:34 +0000
+++ debian/control	2014-05-29 05:25:44 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Jeremy Bicha <[e-mail]>, Josselin Mouette <[e-mail]>, Michael Biebl <[e-mail]>
+Uploaders: Debian GNOME Maintainers <[e-mail]>, Jeremy Bicha <[e-mail]>, Michael Biebl <[e-mail]>
 Build-Depends: debhelper (>= 8),
                autotools-dev,
                dh-autoreconf,
@@ -32,14 +32,14 @@
                libisofs-dev (>= 0.6.4),
                libappindicator3-dev (>= 0.0.7),
                libunity-dev (>= 5.0.0),
-#               libtracker-sparql-0.14-dev (>= 0.14),
+#               libtracker-sparql-1.0-dev (>= 1.0),
                libtotem-plparser-dev (>= 2.32),
                gobject-introspection (>= 0.6.3),
                libgirepository1.0-dev (>= 0.6.3),
                intltool (>= 0.35.0),
                libglib2.0-doc,
                libgtk-3-doc
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://www.gnome.org/projects/brasero/
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/brasero/ubuntu
 
 
=== modified file 'debian/control.in'
--- debian/control.in	2013-12-16 16:57:34 +0000
+++ debian/control.in	2014-05-29 05:25:44 +0000
@@ -28,14 +28,14 @@
                libisofs-dev (>= 0.6.4),
                libappindicator3-dev (>= 0.0.7),
                libunity-dev (>= 5.0.0),
-#               libtracker-sparql-0.14-dev (>= 0.14),
+#               libtracker-sparql-1.0-dev (>= 1.0),
                libtotem-plparser-dev (>= 2.32),
                gobject-introspection (>= 0.6.3),
                libgirepository1.0-dev (>= 0.6.3),
                intltool (>= 0.35.0),
                libglib2.0-doc,
                libgtk-3-doc
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://www.gnome.org/projects/brasero/
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/brasero/ubuntu
 
 
=== added file 'debian/patches/01_tracker-1.0.patch'
--- debian/patches/01_tracker-1.0.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_tracker-1.0.patch	2014-05-29 05:25:44 +0000
@@ -0,0 +1,13 @@
+Index: brasero-3.10.0/configure.ac
+===================================================================
+--- brasero-3.10.0.orig/configure.ac	2013-11-25 17:10:50.000000000 +0100
++++ brasero-3.10.0/configure.ac	2014-05-10 01:21:24.465053883 +0200
+@@ -388,7 +388,7 @@
+ if test x"$enable_search" != "xno"; then
+         # Try to figure out the tracker API version to use
+         tracker_api="0.10"
+-        m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16]],
++        m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16], [1.0]],
+                               [PKG_CHECK_EXISTS([tracker-sparql-VERSION >= $TRACKER_REQUIRED],
+                                                 [tracker_api="VERSION"])
+                               ])
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-17 13:09:35 +0000
+++ debian/patches/series	2014-05-29 05:25:44 +0000
@@ -1,2 +1,3 @@
+01_tracker-1.0.patch
 012_appindicator.patch
 013_unity_launcher_progress.patch
 
=== modified file 'debian/rules'
--- debian/rules	2013-12-16 16:57:34 +0000
+++ debian/rules	2014-05-29 05:25:44 +0000
@@ -16,7 +16,6 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
 	--disable-cdrtools \
-	--disable-scrollkeeper \
 	--disable-caches \
 	--enable-unity \
 	--enable-introspection \