Skip to content

Commit

Permalink
Update Debian packaging to 3006.1-1
Browse files Browse the repository at this point in the history
- drop patches included upstream already
- update patches
- remove salt-unity - dropped upstream
- add salt-pip - new tool
- disable tests - requires 'pytestshellutils' python package, that isn't
  packaged on Debian

Fixes QubesOS/qubes-issues#7896
  • Loading branch information
marmarek committed Jun 28, 2023
1 parent 72979be commit 62e20fc
Show file tree
Hide file tree
Showing 45 changed files with 38 additions and 12,260 deletions.
4 changes: 4 additions & 0 deletions .qubesbuilder
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ vm-fc38:
rpm:
build:
- salt.spec
vm-bookworm:
deb:
build:
- debian-pkg/debian
source:
files:
- url: https://files.pythonhosted.org/packages/source/s/salt/salt-@VERSION@.tar.gz
Expand Down
2 changes: 2 additions & 0 deletions Makefile.builder
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
RPM_SPEC_FILES.dom0-fc37 := salt.spec
RPM_SPEC_FILES.vm-fc37 := salt.spec
RPM_SPEC_FILES.vm-fc38 := salt.spec
DEBIAN_BUILD_DIRS.vm-bookworm = debian-pkg/debian

RPM_SPEC_FILES := $(RPM_SPEC_FILES.$(PACKAGE_SET)-$(DIST))
DEBIAN_BUILD_DIRS := $(DEBIAN_BUILD_DIRS.$(PACKAGE_SET)-$(DIST))

NO_ARCHIVE := 1
1 change: 1 addition & 0 deletions debian
7 changes: 7 additions & 0 deletions debian-pkg/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
salt (3006.1-1) unstable; urgency=medium

[ Marek Marczykowski-Górecki ]
* update to 3006.1

-- Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> Thu, 29 Jun 2023 01:34:34 +0200

salt (3004.1+dfsg-2) unstable; urgency=medium

* Replace HgPillarTestCase patch with upstream commit
Expand Down
7 changes: 6 additions & 1 deletion debian-pkg/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,13 @@ Build-Depends: bash-completion,
python3-kubernetes,
python3-ldap,
python3-libcloud (>= 0.14.1),
python3-linkify-it,
python3-looseversion,
python3-m2crypto | python3-pycryptodome | python3-crypto (>= 2.6),
python3-mako,
python3-mock,
python3-msgpack,
python3-myst-parser,
python3-mysqldb,
python3-openssl,
python3-passlib,
Expand All @@ -61,7 +64,9 @@ Build-Depends: bash-completion,
python3-pytest-skip-markers (>= 1.1.0-3~),
python3-pytest-subtests,
python3-pytest-tempdir (>= 2019.10.12),
python3-pytoml,
python3-sphinxcontrib.httpdomain,
python3-sphinxcontrib.spelling,
python3-toml,
python3-pyvmomi,
python3-requests (>= 1.0.0),
python3-saltfactories (>= 0.907.0-4~),
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 62e20fc

Please sign in to comment.