[SCM] akonadi1 packaging branch, kubuntu_wily_archive, updated. b521b8fff811e0cab5fe884a4003b8552eea0a25

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/akonadi1.git;a=commitdiff;h=b521b8f

The following commit has been merged in the kubuntu_wily_archive branch:
commit b521b8fff811e0cab5fe884a4003b8552eea0a25
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Sep 2 14:30:06 2015 +0200

    revert libakonadi1-dev rename back to libakoandi-dev
    
    the new akonadi source is using a different -dev package name altogether
    so there is no conflict to be avoided here. not chaning the dev name
    turns this into a non-transition
---
 debian/changelog                                           | 2 +-
 debian/control                                             | 4 +---
 debian/{libakonadi1-dev.dirs => libakonadi-dev.dirs}       | 0
 debian/{libakonadi1-dev.install => libakonadi-dev.install} | 0
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca89c4c..62d10e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ akonadi1 (1.13.0-8ubuntu1) UNRELEASED; urgency=medium
     + This is now a transitional source to allow kde4pimlibs applications to
       install
     + Merge with debian unstable
-    + Rename all packages to reflect their association with akonadi1
+    + Rename akonadi-dbg to akonadi1-dbg to reflect the change in the source
     + Rip out all runtime packages (-server -backend-*) as we do not support
       actually running the akonadi1 server
     + Break&replace old packages
diff --git a/debian/control b/debian/control
index f5e03a5..b34c8ba 100644
--- a/debian/control
+++ b/debian/control
@@ -37,15 +37,13 @@ Description: libraries for the Akonadi PIM storage service
  .
  This package contains libraries used by the Akonadi PIM storage service.
 
-Package: libakonadi1-dev
+Package: libakonadi-dev
 Section: libdevel
 Architecture: any
 Depends: libakonadiprotocolinternals1 (= ${binary:Version}),
          libboost-dev,
          libqt4-dev (>= 4:4.8.0),
          ${misc:Depends}
-Breaks: libakonadi-dev (<< 1.13.0-8ubuntu1~)
-Replaces: libakonadi-dev (<< 1.13.0-8ubuntu1~)
 Suggests: pkg-config
 Description: development files for the Akonadi PIM storage service
  Akonadi is an extensible cross-desktop Personal Information Management (PIM)
diff --git a/debian/libakonadi1-dev.dirs b/debian/libakonadi-dev.dirs
similarity index 100%
rename from debian/libakonadi1-dev.dirs
rename to debian/libakonadi-dev.dirs
diff --git a/debian/libakonadi1-dev.install b/debian/libakonadi-dev.install
similarity index 100%
rename from debian/libakonadi1-dev.install
rename to debian/libakonadi-dev.install

-- 
akonadi1 packaging