Bump version

Merge pull request #7 from CCC-MF/issue_5
Add all required and optional assets into deb package
2023-09-19 17:38:57 +02:00 · 2023-09-19 17:34:57 +02:00 · 2023-09-19 17:34:19 +02:00 · 2023-09-19 17:32:49 +02:00 · 2023-09-19 17:31:28 +02:00 · 2023-09-19 16:54:48 +02:00
4 changed files with 5 additions and 2 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "osc-variant"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 authors = ["Paul-Christian Volkmer <volkmer_p@ukw.de>"]
 description = "Anwendung zum Anpassen einer OSC-Datei an einen Standort"
@@ -32,5 +32,6 @@ panic = "abort"
 copyright = "Copyright (c) 2023 Comprehensive Cancer Center Mainfranken"
 extended-description = "Anwendung zum Anpassen einer OSC-Datei an einen Standort."
 assets = [
+    ["target/release/osc-variant", "usr/bin/", "755"],
    ["completion/osc-variant.bash", "etc/bash_completion.d/", "644"]
 ]
--- a/build.rs
+++ b/build.rs
@@ -35,7 +35,7 @@ fn main() -> Result<(), Error> {

    let package_name = std::env::var("CARGO_CRATE_NAME").unwrap_or("osc-variant".to_string());

-    fs::remove_dir_all("completion")?;
+    fs::remove_dir_all("completion").unwrap_or_default();
    fs::create_dir("completion")?;

    generate_to(Bash, &mut cmd, package_name.as_str(), "completion")?;
--- a/src/model/data_form.rs
+++ b/src/model/data_form.rs
@@ -529,6 +529,7 @@ pub struct Entry {
    #[serde(rename = "SeitenumbruchPatModul")]
    seitenumbruch_pat_modul: bool,
    #[serde(rename = "Kontaktliste")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    kontaktliste: Option<String>,
    #[serde(rename = "MarkierungIgnorieren")]
    markierung_ignorieren: bool,
--- a/src/model/unterformular.rs
+++ b/src/model/unterformular.rs
@@ -533,6 +533,7 @@ pub struct Entry {
    #[serde(rename = "SeitenumbruchPatModul")]
    seitenumbruch_pat_modul: bool,
    #[serde(rename = "Kontaktliste")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    kontaktliste: Option<String>,
    #[serde(rename = "MarkierungIgnorieren")]
    markierung_ignorieren: bool,
Author	SHA1	Message	Date
Paul-Christian Volkmer	e2d4d71063	Bump version	2023-09-19 17:38:57 +02:00
Paul-Christian Volkmer	629cc8aba9	Merge pull request #7 from CCC-MF/issue_5 Add all required and optional assets into deb package	2023-09-19 17:34:57 +02:00
Paul-Christian Volkmer	298a142586	Merge pull request #6 from CCC-MF/issue_4 Skip serializing None option	2023-09-19 17:34:19 +02:00
Paul-Christian Volkmer	9b9a0b4622	Add all required and optional assets into deb package	2023-09-19 17:32:49 +02:00
Paul-Christian Volkmer	9ffc0783ff	Skip serializing None option	2023-09-19 17:31:28 +02:00
Paul-Christian Volkmer	771d99fa27	Add extended description for deb packages	2023-09-19 16:54:48 +02:00
Paul-Christian Volkmer	eadf9326d0	Update dependencies and mark as v0.4.0	2023-09-19 16:54:48 +02:00
Paul-Christian Volkmer	bf63d93efa	Add optional field 'Kontaktliste' to forms	2023-09-19 16:54:48 +02:00
Paul-Christian Volkmer	ce52f92a7f	Fix build error if dir "completion" does not exist	2023-09-11 18:32:31 +02:00