From d8292d82325599ad0fb2e10532a52d46a86390bf Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com>
Date: Thu, 21 Oct 2021 12:48:52 -0400
Subject: [PATCH] Fix cgcs-patch build failures

- Add blacklist for lintian-overrides.
- Fix debian/changelog, it assseumed it was still native source
  format.
- Update debian version in meta_data.yaml
- Fix typo in debian/control

Story: 2009101
Task: 43076

Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: Idda262ade8c801c3bbafa020e37b596a8378f541
---
 .../debian/deb_folder/cgcs-patch-agent.lintian-overrides      | 1 +
 .../debian/deb_folder/cgcs-patch-controller.lintian-overrides | 1 +
 cgcs-patch/debian/deb_folder/cgcs-patch.lintian-overrides     | 1 +
 cgcs-patch/debian/deb_folder/changelog                        | 2 +-
 cgcs-patch/debian/deb_folder/control                          | 4 ++--
 cgcs-patch/debian/meta_data.yaml                              | 2 +-
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/cgcs-patch/debian/deb_folder/cgcs-patch-agent.lintian-overrides b/cgcs-patch/debian/deb_folder/cgcs-patch-agent.lintian-overrides
index b6977c62..a6221dfc 100644
--- a/cgcs-patch/debian/deb_folder/cgcs-patch-agent.lintian-overrides
+++ b/cgcs-patch/debian/deb_folder/cgcs-patch-agent.lintian-overrides
@@ -1 +1,2 @@
 init.d-script-missing-dependency-on-local_fs
+non-standard-file-permissions-for-etc-init.d-script
diff --git a/cgcs-patch/debian/deb_folder/cgcs-patch-controller.lintian-overrides b/cgcs-patch/debian/deb_folder/cgcs-patch-controller.lintian-overrides
index 1f1a30f3..6a4d7d7d 100644
--- a/cgcs-patch/debian/deb_folder/cgcs-patch-controller.lintian-overrides
+++ b/cgcs-patch/debian/deb_folder/cgcs-patch-controller.lintian-overrides
@@ -1,2 +1,3 @@
 init.d-script-does-not-implement-required-option
 init.d-script-missing-dependency-on-local_fs
+non-standard-file-permissions-for-etc-init.d-script
diff --git a/cgcs-patch/debian/deb_folder/cgcs-patch.lintian-overrides b/cgcs-patch/debian/deb_folder/cgcs-patch.lintian-overrides
index bd9a4082..9290a021 100644
--- a/cgcs-patch/debian/deb_folder/cgcs-patch.lintian-overrides
+++ b/cgcs-patch/debian/deb_folder/cgcs-patch.lintian-overrides
@@ -1,4 +1,5 @@
 dir-or-file-in-run
 init.d-script-does-not-implement-required-option
 init.d-script-missing-dependency-on-local_fs
+non-standard-file-permissions-for-etc-init.d-script
 
diff --git a/cgcs-patch/debian/deb_folder/changelog b/cgcs-patch/debian/deb_folder/changelog
index b8bae8e2..7435598b 100644
--- a/cgcs-patch/debian/deb_folder/changelog
+++ b/cgcs-patch/debian/deb_folder/changelog
@@ -1,4 +1,4 @@
-cgcs-patch (1.0) unstable; urgency=medium
+cgcs-patch (1.0-1) unstable; urgency=medium
 
   * Initial release.
 
diff --git a/cgcs-patch/debian/deb_folder/control b/cgcs-patch/debian/deb_folder/control
index 2df4dd79..eee18e55 100644
--- a/cgcs-patch/debian/deb_folder/control
+++ b/cgcs-patch/debian/deb_folder/control
@@ -37,14 +37,14 @@ Description: Starlingx platform patching
 Package: python3-cgcs-patch
 Architecture: all
 Depends: ${python3:Depends},
-${misc:Depends},
+ ${misc:Depends},
  python3-keystonemiddleware,
  python3-oslo.config,
  python3-pecan,
  python3-pycryptodome,
  python3-lxml,
  python3-requests-toolbelt,
- python3-six
+ python3-six,
  tsconfig
 Description: Starlingx platfom patching (python3)
  Starlingx platform patching system python libraries
diff --git a/cgcs-patch/debian/meta_data.yaml b/cgcs-patch/debian/meta_data.yaml
index d78ba762..847bba66 100644
--- a/cgcs-patch/debian/meta_data.yaml
+++ b/cgcs-patch/debian/meta_data.yaml
@@ -1,6 +1,6 @@
 ---
 debname: cgcs-patch
-debver: 1.0
+debver: 1.0-1
 dl_hook: dl_hook
 revision:
   dist: $STX_DIST