Fix stage-archive.sh to archive osm-imdocs deb package

Change-Id: I20bc1463dca447dfb452a835441b9097e8585c3f
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
(cherry picked from commit defb0b8eae307cf7feebc2cbf79cb504e6ac6eb7)

diff --git a/build-docs.sh b/build-docs.sh
index 6f21939..623e98f 100755 (executable)
--- a/build-docs.sh
+++ b/build-docs.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Copyright 2018 Sandvine
-# All Rights Reserved.
+# Copyright ETSI Contributors and Others.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -18,8 +18,8 @@ PKG_DIRECTORIES="osm_im_trees models"
 MDG_NAME=im
 PKG_NAME=osm-${MDG_NAME}docs
 DEB_INSTALL=debian/${PKG_NAME}.install
-export DEBEMAIL="mmarchetti@sandvine.com"
-export DEBFULLNAME="Michael Marchetti"
+export DEBEMAIL="OSMSupport@etsi.org"
+export DEBFULLNAME="ETSI OSM"
 
 PKG_VERSION=$(git describe --match "v*" --tags --abbrev=0)
 PKG_VERSION_FULL=$(git describe --match "v*" --tags --long)
@@ -53,5 +53,5 @@ cp -R debian $PKG_DIR/.
 cd $PKG_DIR
 dh_make -y --indep --createorig --a -c apache
 sed -i -e "s/${PKG_VERSION_PREFIX}${POST_UPDATE}-1/$PKG_VERSION_PREFIX${POST_UPDATE}-${PKG_VERSION_FIELDS[2]}/g" debian/changelog
-dpkg-buildpackage -uc -us -tc -rfakeroot 
+dpkg-buildpackage -uc -us -tc -rfakeroot
 cd -

diff --git a/debian/control b/debian/control
index 10fb75b..f06583a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,28 @@
+#######################################################################################
+# Copyright ETSI Contributors and Others.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#######################################################################################
 Source: osm-imdocs
 Section: devel
 Priority: optional
 Maintainer: Michael Marchetti <mmarchetti@sandvine.com>
-Build-Depends: debhelper (>=9)
+Build-Depends: debhelper-compat (= 13)
 Standards-Version: 3.9.6
-Homepage: http://osm.etsi.org
+Homepage: <http://osm.etsi.org>
+
 Package: osm-imdocs
-Architecture: all
+Architecture: any
 Depends: ${misc:Depends}
 Description: osm-imdocs is the Information Model package for OSM, providing base classes derived from YANG models to be used by other modules.
-

diff --git a/devops-stages/stage-archive.sh b/devops-stages/stage-archive.sh
index 2e7a6fd..3999e8d 100755 (executable)
--- a/devops-stages/stage-archive.sh
+++ b/devops-stages/stage-archive.sh
@@ -19,4 +19,7 @@ MDG=IM
 rm -rf pool
 rm -rf dists
 mkdir -p pool/$MDG
+# Move python3-osm-im deb package to pool/$MDG folder
 mv deb_dist/*.deb pool/$MDG/
+# Move osm-imdocs deb package to pool/$MDG folder
+mv *.deb pool/$MDG/