distro UPDATE general update

CESNET · Mar 12, 2024 · 34659ce · 34659ce
1 parent 68dbc0f
commit 34659ce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/distro/pkg/deb/control b/distro/pkg/deb/control
@@ -6,7 +6,7 @@ Priority: optional
 Standards-Version: 4.5.0
 Build-Depends: cmake,
                debhelper (>= 10),
-               libyang2-dev,
+               libyang-dev,
                libssl-dev (>= 3.0.0),
                libssh-dev (>= 0.9.5),
                libpam0g-dev,
@@ -15,7 +15,7 @@ Build-Depends: cmake,
 Vcs-Browser: https://github.com/CESNET/libnetconf2/tree/master
 Vcs-Git: https://github.com/CESNET/libnetconf2.git
 
-Package: libnetconf2
+Package: libnetconf4
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Architecture: any
@@ -29,8 +29,8 @@ Description: library implementing NETCONF protocol - runtime
  It is implemented in C.
 
 Package: libnetconf2-dev
-Depends: libyang2-dev,
-         libnetconf2 (= ${binary:Version}),
+Depends: libyang-dev,
+         libnetconf4 (= ${binary:Version}),
          ${misc:Depends}
 Section: libdevel
 Architecture: any

diff --git a/distro/pkg/deb/libnetconf2.install → distro/pkg/deb/libnetconf4.install b/distro/pkg/deb/libnetconf2.install → distro/pkg/deb/libnetconf4.install
diff --git a/distro/scripts/make-archive.sh b/distro/scripts/make-archive.sh
@@ -1,10 +1,7 @@
 #!/bin/bash
 # create archive from current source using git
 
-VERSION=$(git describe --tags --always)
-# skip "v" from start of version number (if it exists) and replace - with .
-VERSION=${VERSION#v}
-VERSION=${VERSION//[-]/.}
+VERSION=$(git log --oneline -n1 --grep="^VERSION" | rev | cut -d' ' -f1 | rev)
 
 NAMEVER=libnetconf2-$VERSION
 ARCHIVE=$NAMEVER.tar.gz