From dea511a93dd6d280e6dbf341a8df6a5abf649914 Mon Sep 17 00:00:00 2001
From: Thomas Karl Pietrowski <thopiekar@googlemail.com>
Date: Tue, 20 Mar 2018 18:15:19 +0100
Subject: [PATCH] libCharon: New package layout

Signed-off-by: Thomas Karl Pietrowski <thopiekar@gmail.com> (github: thopiekar)
---
 libCharon/charon.install         |  2 ++
 libCharon/control                | 42 +++-----------------------------
 libCharon/python3-charon.install |  2 +-
 3 files changed, 6 insertions(+), 40 deletions(-)
 create mode 100644 libCharon/charon.install

diff --git a/libCharon/charon.install b/libCharon/charon.install
new file mode 100644
index 0000000..731af48
--- /dev/null
+++ b/libCharon/charon.install
@@ -0,0 +1,2 @@
+usr/share/dbus-1/system.d/*
+usr/lib/systemd/system/*
diff --git a/libCharon/control b/libCharon/control
index 4be30b3..f878fdf 100644
--- a/libCharon/control
+++ b/libCharon/control
@@ -12,8 +12,8 @@ Homepage: https://github.com/Ultimaker/libCharon
 Vcs-Git: https://github.com/Ultimaker/libCharon.git
 Vcs-Browser: https://github.com/Ultimaker/libCharon
 
-Package: libcharon0
-Architecture: any
+Package: charon
+Architecture: all
 Multi-Arch: same
 Section: libs
 Depends:
@@ -22,29 +22,8 @@ Depends:
 Description: libCharon libraries
  libCharon is a c++ implementation of 3mf loading with SIP python bindings
 
-Package: libcharon-dbg
-Architecture: any
-Multi-Arch: same
-Section: debug
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Description: libCharon debug symbols
- libCharon is a c++ implementation of 3mf loading with SIP python bindings
-
-Package: libcharon-dev
-Architecture: any
-Multi-Arch: same
-Section: libdevel
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
- libsavitar0 (= ${binary:Version}), 
-Description: libCharon development files
- libCharon is a c++ implementation of 3mf loading with SIP python bindings
-
 Package: python3-charon
-Architecture: any
+Architecture: all
 Section: python
 Depends:
  ${shlibs:Depends},
@@ -57,18 +36,3 @@ XB-Python3-Version:
  ${python3:Versions}
 Description: Python3 bindings for libCharon
  libCharon is a c++ implementation of 3mf loading with SIP python bindings
-
-Package: python3-charon-dbg
-Architecture: any
-Section: python
-Depends:
- ${shlibs:Depends},
- ${python3:Depends},
- ${misc:Depends},
- libsavitar-dbg (= ${binary:Version})
-Provides:
- ${python3:Provides}
-XB-Python3-Version:
- ${python3:Versions}
-Description: Python3 bindings for libCharon - debug symbols
- libCharon is a c++ implementation of 3mf loading with SIP python bindings
diff --git a/libCharon/python3-charon.install b/libCharon/python3-charon.install
index 86b6c5b..1352c89 100644
--- a/libCharon/python3-charon.install
+++ b/libCharon/python3-charon.install
@@ -1 +1 @@
-usr/lib/python3*/dist-packages/Savitar.so
+usr/lib/python3*/dist-packages/Charon