From 59e1f87856de06c2165dc34c3ea32dfaa77b7404 Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Tue, 21 Aug 2018 20:12:47 +0200 Subject: [PATCH 1/3] Bumping to 3.4.0 Signed-off-by: Thomas Karl Pietrowski (github: thopiekar) --- Cura/changelog | 2 +- CuraEngine/changelog | 2 +- Uranium/changelog | 2 +- cura-binary-data/changelog | 2 +- fdm_materials/changelog | 2 +- libArcus/changelog | 2 +- libCharon/changelog | 2 +- libSavitar/changelog | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cura/changelog b/Cura/changelog index 61ec436..bdd1fdd 100644 --- a/Cura/changelog +++ b/Cura/changelog @@ -1,4 +1,4 @@ -cura (1:3.4) unstable; urgency=low +cura (1:3.4.0) unstable; urgency=low * Initial release diff --git a/CuraEngine/changelog b/CuraEngine/changelog index b496e98..bb66d40 100644 --- a/CuraEngine/changelog +++ b/CuraEngine/changelog @@ -1,4 +1,4 @@ -cura-engine (1:3.4) unstable; urgency=medium +cura-engine (1:3.4.0) unstable; urgency=medium * Initial release diff --git a/Uranium/changelog b/Uranium/changelog index ccbaf9a..a4200c0 100644 --- a/Uranium/changelog +++ b/Uranium/changelog @@ -1,4 +1,4 @@ -uranium (1:3.4) unstable; urgency=low +uranium (1:3.4.0) unstable; urgency=low * Initial release diff --git a/cura-binary-data/changelog b/cura-binary-data/changelog index 2499864..5c93f0a 100644 --- a/cura-binary-data/changelog +++ b/cura-binary-data/changelog @@ -1,4 +1,4 @@ -cura-binary-data (3.4) unstable; urgency=low +cura-binary-data (3.4.0) unstable; urgency=low * Initial release diff --git a/fdm_materials/changelog b/fdm_materials/changelog index fec1fc6..fca0463 100644 --- a/fdm_materials/changelog +++ b/fdm_materials/changelog @@ -1,4 +1,4 @@ -fdm-materials (3.4) unstable; urgency=low +fdm-materials (3.4.0) unstable; urgency=low * Initial release diff --git a/libArcus/changelog b/libArcus/changelog index 0405355..a1c32b3 100644 --- a/libArcus/changelog +++ b/libArcus/changelog @@ -1,4 +1,4 @@ -libarcus (1:3.4) unstable; urgency=low +libarcus (1:3.4.0) unstable; urgency=low * Initial release diff --git a/libCharon/changelog b/libCharon/changelog index 6a6dac6..44b480d 100644 --- a/libCharon/changelog +++ b/libCharon/changelog @@ -1,4 +1,4 @@ -libcharon (3.4) unstable; urgency=medium +libcharon (3.4.0) unstable; urgency=medium * Initial release diff --git a/libSavitar/changelog b/libSavitar/changelog index ab78d40..2dd31af 100644 --- a/libSavitar/changelog +++ b/libSavitar/changelog @@ -1,4 +1,4 @@ -libsavitar (3.4) unstable; urgency=medium +libsavitar (3.4.0) unstable; urgency=medium * Initial release From 1785b0cbe7729626aae0cc13c67e6b53a5478649 Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Fri, 24 Aug 2018 22:17:23 +0200 Subject: [PATCH 2/3] Bumping version to 3.4.1 --- Cura/changelog | 2 +- CuraEngine/changelog | 2 +- Uranium/changelog | 2 +- cura-binary-data/changelog | 2 +- fdm_materials/changelog | 2 +- libArcus/changelog | 2 +- libCharon/changelog | 2 +- libSavitar/changelog | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cura/changelog b/Cura/changelog index bdd1fdd..24253ae 100644 --- a/Cura/changelog +++ b/Cura/changelog @@ -1,4 +1,4 @@ -cura (1:3.4.0) unstable; urgency=low +cura (1:3.4.1) unstable; urgency=low * Initial release diff --git a/CuraEngine/changelog b/CuraEngine/changelog index bb66d40..1023ddf 100644 --- a/CuraEngine/changelog +++ b/CuraEngine/changelog @@ -1,4 +1,4 @@ -cura-engine (1:3.4.0) unstable; urgency=medium +cura-engine (1:3.4.1) unstable; urgency=medium * Initial release diff --git a/Uranium/changelog b/Uranium/changelog index a4200c0..5f9314c 100644 --- a/Uranium/changelog +++ b/Uranium/changelog @@ -1,4 +1,4 @@ -uranium (1:3.4.0) unstable; urgency=low +uranium (1:3.4.1) unstable; urgency=low * Initial release diff --git a/cura-binary-data/changelog b/cura-binary-data/changelog index 5c93f0a..866c136 100644 --- a/cura-binary-data/changelog +++ b/cura-binary-data/changelog @@ -1,4 +1,4 @@ -cura-binary-data (3.4.0) unstable; urgency=low +cura-binary-data (3.4.1) unstable; urgency=low * Initial release diff --git a/fdm_materials/changelog b/fdm_materials/changelog index fca0463..f6ad3f2 100644 --- a/fdm_materials/changelog +++ b/fdm_materials/changelog @@ -1,4 +1,4 @@ -fdm-materials (3.4.0) unstable; urgency=low +fdm-materials (3.4.1) unstable; urgency=low * Initial release diff --git a/libArcus/changelog b/libArcus/changelog index a1c32b3..1071003 100644 --- a/libArcus/changelog +++ b/libArcus/changelog @@ -1,4 +1,4 @@ -libarcus (1:3.4.0) unstable; urgency=low +libarcus (1:3.4.1) unstable; urgency=low * Initial release diff --git a/libCharon/changelog b/libCharon/changelog index 44b480d..a1dcbb1 100644 --- a/libCharon/changelog +++ b/libCharon/changelog @@ -1,4 +1,4 @@ -libcharon (3.4.0) unstable; urgency=medium +libcharon (3.4.1) unstable; urgency=medium * Initial release diff --git a/libSavitar/changelog b/libSavitar/changelog index 2dd31af..80321dc 100644 --- a/libSavitar/changelog +++ b/libSavitar/changelog @@ -1,4 +1,4 @@ -libsavitar (3.4.0) unstable; urgency=medium +libsavitar (3.4.1) unstable; urgency=medium * Initial release From 55a7d476286639ad1b3453a9d97c7a28ee3c695d Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Sat, 13 Oct 2018 14:54:15 +0200 Subject: [PATCH 3/3] protobuf: Updating packagign files for 3.6.x aka API 17 Signed-off-by: Thomas Karl Pietrowski (github: thopiekar) --- _3rd-party/protobuf/changelog | 2 +- _3rd-party/protobuf/control | 16 ++++++++-------- _3rd-party/protobuf/libprotobuf-lite11.shlibs | 1 - ...lite11.install => libprotobuf-lite17.install} | 0 _3rd-party/protobuf/libprotobuf-lite17.shlibs | 1 + _3rd-party/protobuf/libprotobuf11.shlibs | 1 - ...bprotobuf11.install => libprotobuf17.install} | 0 _3rd-party/protobuf/libprotobuf17.shlibs | 1 + _3rd-party/protobuf/libprotoc11.shlibs | 1 - .../{libprotoc11.install => libprotoc17.install} | 0 _3rd-party/protobuf/libprotoc17.shlibs | 1 + 11 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 _3rd-party/protobuf/libprotobuf-lite11.shlibs rename _3rd-party/protobuf/{libprotobuf-lite11.install => libprotobuf-lite17.install} (100%) create mode 100644 _3rd-party/protobuf/libprotobuf-lite17.shlibs delete mode 100644 _3rd-party/protobuf/libprotobuf11.shlibs rename _3rd-party/protobuf/{libprotobuf11.install => libprotobuf17.install} (100%) create mode 100644 _3rd-party/protobuf/libprotobuf17.shlibs delete mode 100644 _3rd-party/protobuf/libprotoc11.shlibs rename _3rd-party/protobuf/{libprotoc11.install => libprotoc17.install} (100%) create mode 100644 _3rd-party/protobuf/libprotoc17.shlibs diff --git a/_3rd-party/protobuf/changelog b/_3rd-party/protobuf/changelog index aaf980b..b7fc860 100644 --- a/_3rd-party/protobuf/changelog +++ b/_3rd-party/protobuf/changelog @@ -1,4 +1,4 @@ -protobuf (3.1.0-0curappa0) experimental; urgency=medium +protobuf (3.6.0-0curappa0) experimental; urgency=medium * New upstream release. diff --git a/_3rd-party/protobuf/control b/_3rd-party/protobuf/control index 7a5b780..5c669a3 100644 --- a/_3rd-party/protobuf/control +++ b/_3rd-party/protobuf/control @@ -39,7 +39,7 @@ Vcs-Git: git://anonscm.debian.org/collab-maint/protobuf.git X-Python-Version: >= 2.7 X-Python3-Version: >= 3.2 -Package: libprotobuf11 +Package: libprotobuf17 Architecture: any Multi-Arch: same Section: libs @@ -58,7 +58,7 @@ Description: protocol buffers C++ library . This package contains the runtime library needed for C++ applications. -Package: libprotobuf-lite11 +Package: libprotobuf-lite17 Architecture: any Multi-Arch: same Section: libs @@ -83,9 +83,9 @@ Architecture: any Multi-Arch: same Section: libdevel Provides: - libprotobuf11-dev + libprotobuf17-dev Depends: ${misc:Depends}, zlib1g-dev, - libprotobuf11 (= ${binary:Version}), libprotobuf-lite11 (= ${binary:Version}) + libprotobuf17 (= ${binary:Version}), libprotobuf-lite17 (= ${binary:Version}) Description: protocol buffers C++ library (development files) Protocol buffers are a flexible, efficient, automated mechanism for serializing structured data - similar to XML, but smaller, faster, and @@ -101,7 +101,7 @@ Description: protocol buffers C++ library (development files) This package contains the development headers and static libraries needed for writing C++ applications. -Package: libprotoc11 +Package: libprotoc17 Architecture: any Multi-Arch: same Section: libs @@ -126,9 +126,9 @@ Architecture: any Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libprotoc11 (= ${binary:Version}), libprotobuf-dev (= ${binary:Version}) + libprotoc17 (= ${binary:Version}), libprotobuf-dev (= ${binary:Version}) Provides: - libprotoc11-dev + libprotoc17-dev Replaces: libprotobuf-dev (<< 2.1.0) Breaks: @@ -151,7 +151,7 @@ Description: protocol buffers compiler library (development files) Package: protobuf-compiler Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc11 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc17 (= ${binary:Version}) Description: compiler for protocol buffer definition files Protocol buffers are a flexible, efficient, automated mechanism for serializing structured data - similar to XML, but smaller, faster, and diff --git a/_3rd-party/protobuf/libprotobuf-lite11.shlibs b/_3rd-party/protobuf/libprotobuf-lite11.shlibs deleted file mode 100644 index 7a50a38..0000000 --- a/_3rd-party/protobuf/libprotobuf-lite11.shlibs +++ /dev/null @@ -1 +0,0 @@ -libprotobuf-lite 11 libprotobuf-lite11 diff --git a/_3rd-party/protobuf/libprotobuf-lite11.install b/_3rd-party/protobuf/libprotobuf-lite17.install similarity index 100% rename from _3rd-party/protobuf/libprotobuf-lite11.install rename to _3rd-party/protobuf/libprotobuf-lite17.install diff --git a/_3rd-party/protobuf/libprotobuf-lite17.shlibs b/_3rd-party/protobuf/libprotobuf-lite17.shlibs new file mode 100644 index 0000000..9459c71 --- /dev/null +++ b/_3rd-party/protobuf/libprotobuf-lite17.shlibs @@ -0,0 +1 @@ +libprotobuf-lite 17 libprotobuf-lite17 diff --git a/_3rd-party/protobuf/libprotobuf11.shlibs b/_3rd-party/protobuf/libprotobuf11.shlibs deleted file mode 100644 index c5cad01..0000000 --- a/_3rd-party/protobuf/libprotobuf11.shlibs +++ /dev/null @@ -1 +0,0 @@ -libprotobuf 11 libprotobuf11 diff --git a/_3rd-party/protobuf/libprotobuf11.install b/_3rd-party/protobuf/libprotobuf17.install similarity index 100% rename from _3rd-party/protobuf/libprotobuf11.install rename to _3rd-party/protobuf/libprotobuf17.install diff --git a/_3rd-party/protobuf/libprotobuf17.shlibs b/_3rd-party/protobuf/libprotobuf17.shlibs new file mode 100644 index 0000000..b905200 --- /dev/null +++ b/_3rd-party/protobuf/libprotobuf17.shlibs @@ -0,0 +1 @@ +libprotobuf 17 libprotobuf17 diff --git a/_3rd-party/protobuf/libprotoc11.shlibs b/_3rd-party/protobuf/libprotoc11.shlibs deleted file mode 100644 index b06c7fc..0000000 --- a/_3rd-party/protobuf/libprotoc11.shlibs +++ /dev/null @@ -1 +0,0 @@ -libprotoc 11 libprotoc11 diff --git a/_3rd-party/protobuf/libprotoc11.install b/_3rd-party/protobuf/libprotoc17.install similarity index 100% rename from _3rd-party/protobuf/libprotoc11.install rename to _3rd-party/protobuf/libprotoc17.install diff --git a/_3rd-party/protobuf/libprotoc17.shlibs b/_3rd-party/protobuf/libprotoc17.shlibs new file mode 100644 index 0000000..8a0e4cd --- /dev/null +++ b/_3rd-party/protobuf/libprotoc17.shlibs @@ -0,0 +1 @@ +libprotoc 17 libprotoc17