[SCM] kfilemetadata packaging branch, master, updated. debian/5.37.0-2-91-g4158674

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jan 2 18:40:49 UTC 2018


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kfilemetadata.git;a=commitdiff;h=465b647

The following commit has been merged in the master branch:
commit 465b647507038b30cbdcd2584c69c55f3073d43d
Merge: 8150c629b709524a26ab64d4eef44c18423f157b 3605fe1490c9eeaa5ae018c76d634760ad97cc18
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 3 12:24:19 2016 +0200

    Merging master into Neon/unstable
    
    # Conflicts:
    #	debian/control

 debian/changelog                   | 14 ++++++++++++++
 debian/control                     | 29 +++++++----------------------
 debian/libkf5filemetadata3.symbols |  4 +++-
 debian/rules                       |  2 +-
 debian/tests/acc                   |  7 +++++++
 debian/upstream/metadata           |  7 +++++++
 6 files changed, 39 insertions(+), 24 deletions(-)

diff --cc debian/changelog
index a122a79,094a198..232c57a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,17 +1,42 @@@
 +kfilemetadata-kf5 (5.21.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 11 Apr 2016 09:22:16 +0000
 +
 +kfilemetadata-kf5 (5.20.0-0neon) wily; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Fri, 01 Apr 2016 11:06:07 +0000
 +
+ kfilemetadata-kf5 (5.19.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.19.0).
+   * Update symbols files.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 13 Feb 2016 15:16:23 +0100
+ 
+ kfilemetadata-kf5 (5.18.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.17.0).
+   * New upstream release (5.18.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 13:34:17 +0100
+ 
 +kfilemetadata-kf5 (5.18.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * Debian merge: Remaining changes:
 +    Change l10n-packages.mk path to 3 to fix build. 
 +  * Revert that path change. Still fails. 
 +  * New upstream release Xenial
 +
 +  [ Philip Muškovac ]
 +  * New upstream release
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Wed, 06 Jan 2016 15:01:12 +0100
 +
  kfilemetadata-kf5 (5.16.0-1) unstable; urgency=medium
  
    * New upstream release (5.16.0).
diff --cc debian/control
index 5db0163,e4910f0..92d84da
--- a/debian/control
+++ b/debian/control
@@@ -24,9 -23,9 +23,9 @@@ Build-Depends: cmake (>= 2.8.12)
                 pkg-kde-tools (>= 0.15.18),
                 qtbase5-dev (>= 5.4.0~)
  Standards-Version: 3.9.6
 -Homepage: https://projects.kde.org/projects/kde/workspace/kfilemetadata
 +Homepage: https://projects.kde.org/projects/frameworks/kfilemetadata
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/frameworks/kfilemetadata.git
- Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kfilemetadata.git
+ Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/frameworks/kfilemetadata.git
+ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/frameworks/kfilemetadata.git
  
  Package: libkf5filemetadata3
  Section: libs
@@@ -83,19 -81,6 +81,6 @@@ Conflicts: libkf5filemetadata1-de
  Description: library for extracting file metadata
   This library is for extracting file metadata.
   .
 - kfilemetadata is part of the KDE Plasma desktop.
 + kfilemetadata is part of the KDE frameworks.
   .
   This package contains the development files.
- 
- Package: kf5filemetadata3-dbg
- Section: debug
- Priority: extra
- Architecture: any
- Recommends: qtbase5-dbg
- Depends: libkf5filemetadata3 (= ${binary:Version}), ${misc:Depends}
- Description: library for extracting file metadata
-  This library is for extracting file metadata.
-  .
-  kfilemetadata is part of the KDE frameworks.
-  .
-  This package contains the debugging symbols.

-- 
kfilemetadata packaging



More information about the pkg-kde-commits mailing list