[SCM] Phonon GStreamer backend packaging branch, master, updated. debian/4.8.0-1-7-gfc03ddc

Diane Trout diane-guest at moszumanska.debian.org
Wed Sep 24 18:19:44 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/phonon-backend-gstreamer.git;a=commitdiff;h=f1d6017

The following commit has been merged in the master branch:
commit f1d601745a5f25f1e26659c462b67aba2284e8de
Merge: d64cacedfc230e99ab5bdc22bf494f9768ab5f97 b3518f7539577062128bafede7c0ccdceeb935c9
Author: Diane Trout <diane at ghic.org>
Date:   Tue Sep 23 20:59:19 2014 -0700

    Merge branch 'master' of git://anonscm.debian.org/pkg-kde/kde-std/phonon-backend-gstreamer
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 19 +++++++++++++------
 debian/control   |  2 +-
 debian/copyright | 39 +++++++++++++++++++++++++++++++++++++++
 debian/watch     |  2 +-
 4 files changed, 54 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index 97c13ea,1bfdb99..e0a567b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,17 +1,25 @@@
- phonon-backend-gstreamer (4:4.8.0-1) UNRELEASED; urgency=low
- 
-   [ Pino Toscano ]
-   * Fix the watch file.
 -phonon-backend-gstreamer (4:4.8.0-1) unstable; urgency=low
++phonon-backend-gstreamer (4:4.8.0-2) UNRELEASED; urgency=low
 +
 +  [ Diane Trout ]
-   * New upstream release.
-   * Build against gstreamer1.0
 +  * Provide Qt5 build.
 +    This required creating a -common package for the icons shared between
 +    the Qt4 and Qt5 versions.
 +  * Add myself to uploaders.
++  * Update cmake build-depends version to 2.8.6
  
 -  [ Pino Toscano ]
 -  * Fix the watch file.
 + -- Diane Trout <diane at ghic.org>  Mon, 18 Aug 2014 22:38:36 -0700
 +
++phonon-backend-gstreamer (4:4.8.0-1) unstable; urgency=low
+ 
+   [ Maximiliano Curia ]
+   * New upstream release (4.8.0).
+   * Update build dependencies.
+   * Update dependencies to gst1.0.
+   * Update watch file.
+   * Update copyright file.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Sep 2014 17:39:17 +0200
+ 
  phonon-backend-gstreamer (4:4.7.1-1) unstable; urgency=low
  
    * New upstream release.
diff --cc debian/control
index a70b2e8,41a1a41..6c86179
--- a/debian/control
+++ b/debian/control
@@@ -3,10 -3,9 +3,10 @@@ Section: soun
  Priority: optional
  Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Modestas Vainius <modax at debian.org>,
 - Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 + Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
 + Diane Trout <diane at ghic.org>
  Build-Depends: automoc,
-                cmake (>= 2.6.2),
+                cmake (>= 2.8.6),
                 debhelper (>= 9~),
                 libasound2-dev [linux-any],
                 libgl1-mesa-dev,

-- 
Phonon GStreamer backend packaging



More information about the pkg-kde-commits mailing list