From 7e538a18f7ad8f9ead0ea2864ca022ac15cd4f15 Mon Sep 17 00:00:00 2001 From: Frode Solheim Date: Sun, 10 Oct 2021 13:03:06 +0200 Subject: [PATCH] Reset version number in repo (use fsbuild/version --update before building) --- configure.ac | 8 ++++---- debian/changelog | 4 ++-- fs-uae.spec | 6 ++++-- fsbuild/upload | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index a6574e60f..63694701a 100644 --- a/configure.ac +++ b/configure.ac @@ -3,10 +3,10 @@ AC_PREREQ([2.67]) -m4_define([fsbuild_version], [3.1.5]) -m4_define([fsbuild_version_major], [3]) -m4_define([fsbuild_version_minor], [1]) -m4_define([fsbuild_version_revision], [5]) +m4_define([fsbuild_version], [0.0.0]) +m4_define([fsbuild_version_major], [0]) +m4_define([fsbuild_version_minor], [0]) +m4_define([fsbuild_version_revision], [0]) m4_define([fsbuild_commit], []) AC_INIT([FS-UAE], [fsbuild_version], diff --git a/debian/changelog b/debian/changelog index 21160ecb6..117c936db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -fs-uae (3.1.5-0) unstable; urgency=low +fs-uae (0.0.0-0) unstable; urgency=low * Dummy changelog entry. - -- Frode Solheim Wed, 17 Mar 2021 22:16:19 + -- Frode Solheim Sun, 10 Oct 2021 10:58:59 +00:00 diff --git a/fs-uae.spec b/fs-uae.spec index e82956438..b231367e9 100644 --- a/fs-uae.spec +++ b/fs-uae.spec @@ -13,9 +13,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +%define fsbuild_version 0.0.0 + %define name fs-uae -%define version 3.0.5u2 -%define unmangled_version 3.0.5u2 +%define version %{fsbuild_version} +%define unmangled_version %{fsbuild_version} %define release 1%{?dist} %undefine _hardened_build diff --git a/fsbuild/upload b/fsbuild/upload index 2af7c8037..eb076b62d 100755 --- a/fsbuild/upload +++ b/fsbuild/upload @@ -41,7 +41,7 @@ def upload_branch_name(): def upload(dbx, package, version, path): print("Upload", path) name = os.path.basename(path) - assert package in name + assert package.lower() in name.lower() assert version in name branch = upload_branch_name() if not branch: