From 5c73ca2803402fb1766263a86b61925287474a02 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Mon, 6 Jan 2025 11:11:29 +0100 Subject: [PATCH] Updating for Debian packaging & name of the OBS upload script. --- packaging/coriolis-eda.dsc | 1 - packaging/coriolis-eda.spec | 2 +- packaging/debian.control | 1 - packaging/debian.series | 1 + packaging/{mkArchives.sh => uploadOBS.sh} | 5 +++-- 5 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 packaging/debian.series rename packaging/{mkArchives.sh => uploadOBS.sh} (96%) diff --git a/packaging/coriolis-eda.dsc b/packaging/coriolis-eda.dsc index efda0c8e1..d708b7a6a 100644 --- a/packaging/coriolis-eda.dsc +++ b/packaging/coriolis-eda.dsc @@ -30,7 +30,6 @@ Build-Depends: debhelper-compat (= 13), ninja-build, python3, python3-pip, - python3-pdm, python3-setuptools, python3-wheel, python3-virtualenv, diff --git a/packaging/coriolis-eda.spec b/packaging/coriolis-eda.spec index c42de2ada..670398dcc 100644 --- a/packaging/coriolis-eda.spec +++ b/packaging/coriolis-eda.spec @@ -149,7 +149,7 @@ Warning: This package is only a stub for now. %install CFLAGS=`echo ${CFLAGS} | sed 's,-Werror[^ ]*,,'` - CXXFLAGS=`echo ${CFLAGS} | sed 's,-Werror[^ ]*,,'` + CXXFLAGS=`echo ${CXXFLAGS} | sed 's,-Werror[^ ]*,,'` CORIOLIS_TOP=%{_prefix}; export CORIOLIS_TOP DESTDIR=%{buildroot}; export DESTDIR diff --git a/packaging/debian.control b/packaging/debian.control index c7c3a0619..32a58fe2a 100644 --- a/packaging/debian.control +++ b/packaging/debian.control @@ -26,7 +26,6 @@ Build-Depends: debhelper-compat (= 13), ninja-build, python3, python3-pip, - python3-pdm, python3-setuptools, python3-wheel, python3-virtualenv, diff --git a/packaging/debian.series b/packaging/debian.series new file mode 100644 index 000000000..8c79e6275 --- /dev/null +++ b/packaging/debian.series @@ -0,0 +1 @@ +coloquinte-clamp.patch -p1 diff --git a/packaging/mkArchives.sh b/packaging/uploadOBS.sh similarity index 96% rename from packaging/mkArchives.sh rename to packaging/uploadOBS.sh index 170f64804..1ba53e272 100755 --- a/packaging/mkArchives.sh +++ b/packaging/uploadOBS.sh @@ -5,7 +5,7 @@ printHelp () { echo "" - echo " Usage: mkArchives.sh [--sources] [--docs] [--venv] [--commit] [--run]" + echo " Usage: uploadOBSs.sh [--sources] [--docs] [--venv] [--commit] [--run]" echo "" echo " Options:" echo " [--sources] : Build an archive from the HEAD of the current branch." @@ -49,7 +49,7 @@ exit 1 fi - echo "Running mkArchives.sh" + echo "Running uploadOBSs.sh" echo "* Using HEAD githash as release: ${githash}." if [ "${doSources}" = "true" ]; then echo "* Making source file archive from Git HEAD ..." @@ -82,6 +82,7 @@ packaging/coriolis-eda.dsc \ packaging/debian.copyright \ packaging/debian.changelog \ + packaging/debian.series \ packaging/debian.control \ packaging/debian.rules \ packaging/debian.coriolis-eda.install \