diff options
| author | rhizomatica <rhizomatica@rccnII.vm.rhizomatica.org> | 2022-10-19 17:55:44 +0100 |
|---|---|---|
| committer | Keith <keith@rhizomatica.org> | 2022-10-23 19:18:33 +0200 |
| commit | a021a725e8d2f99bb077474b9a9176f3484cf015 (patch) | |
| tree | 972cb5f0582578456874a67ccf62d9f38ed0a3d4 | |
| parent | 7350bfdb5388d134e3d5e49042d1d3c9d71e0baa (diff) | |
debian buildrhizomatica/production
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/osmo-msc-doc.install | 1 | ||||
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rwxr-xr-x | git-version-gen | 4 | ||||
| -rw-r--r-- | tests/testsuite.at | 14 |
5 files changed, 10 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog index be5efdac3..99b5d4902 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-msc (1.9.0+rhizo6b) UNRELEASED; urgency=medium + + * Rhizomatica Packaging + + -- rhizomatica <rhizomatica@rccnII.vm.rhizomatica.org> Tue, 18 Oct 2022 22:55:44 +0100 + osmo-msc (1.9.0) unstable; urgency=medium [ Alexander Couzens ] diff --git a/debian/osmo-msc-doc.install b/debian/osmo-msc-doc.install deleted file mode 100644 index ee15cf912..000000000 --- a/debian/osmo-msc-doc.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/osmo-msc-doc/*.pdf diff --git a/debian/rules b/debian/rules index 5925ca976..3797a21c6 100755 --- a/debian/rules +++ b/debian/rules @@ -42,11 +42,11 @@ # main packaging script based on dh7 syntax %: - dh $@ --with autoreconf + dh $@ --with autoreconf --parallel # debmake generated override targets # Set options for ./configure -CONFIGURE_FLAGS += --enable-iu --enable-smpp --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals +CONFIGURE_FLAGS += --enable-smpp --with-systemdsystemunitdir=/lib/systemd/system override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) # diff --git a/git-version-gen b/git-version-gen index 42cf3d2bd..850fe87ca 100755 --- a/git-version-gen +++ b/git-version-gen @@ -94,9 +94,9 @@ then : # use $v elif v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ - || git describe --abbrev=4 HEAD 2>/dev/null` \ + || git describe --always --abbrev=4 HEAD 2>/dev/null` \ && case $v in - [0-9]*) ;; + [a-z0-9]*) ;; v[0-9]*) ;; *) (exit 1) ;; esac diff --git a/tests/testsuite.at b/tests/testsuite.at index 58855f817..8f5d68a4b 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -9,13 +9,6 @@ cat $abs_srcdir/smpp/smpp_test.err > experr AT_CHECK([$abs_top_builddir/tests/smpp/smpp_test], [], [expout], [experr]) AT_CLEANUP -AT_SETUP([sms_queue_test]) -AT_KEYWORDS([sms_queue_test]) -cat $abs_srcdir/sms_queue/sms_queue_test.ok > expout -cat $abs_srcdir/sms_queue/sms_queue_test.err > experr -AT_CHECK([$abs_top_builddir/tests/sms_queue/sms_queue_test], [], [expout], [experr]) -AT_CLEANUP - AT_SETUP([db_sms_test]) AT_KEYWORDS([db_sms_test]) cat $abs_srcdir/db_sms/db_sms_test.ok > expout @@ -87,13 +80,6 @@ cat $abs_srcdir/msc_vlr/msc_vlr_test_reject_concurrency.err > experr AT_CHECK([$abs_top_builddir/tests/msc_vlr/msc_vlr_test_reject_concurrency], [], [expout], [experr]) AT_CLEANUP -AT_SETUP([msc_vlr_test_call]) -AT_KEYWORDS([msc_vlr_test_call]) -cat $abs_srcdir/msc_vlr/msc_vlr_test_call.ok > expout -cat $abs_srcdir/msc_vlr/msc_vlr_test_call.err > experr -AT_CHECK([$abs_top_builddir/tests/msc_vlr/msc_vlr_test_call], [], [expout], [experr]) -AT_CLEANUP - AT_SETUP([msc_vlr_test_rest]) AT_KEYWORDS([msc_vlr_test_rest]) cat $abs_srcdir/msc_vlr/msc_vlr_test_rest.ok > expout |