diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index b3fa1e0..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: 2 -updates: - - package-ecosystem: github-actions - directory: "/" - schedule: - interval: daily - time: "04:00" - reviewers: - - "waja" - pull-request-branch-name: - separator: "-" - open-pull-requests-limit: 10 diff --git a/.github/workflows/packaging_test.yml b/.github/workflows/packaging_test.yml index c478ef5..f844a58 100644 --- a/.github/workflows/packaging_test.yml +++ b/.github/workflows/packaging_test.yml @@ -17,20 +17,19 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 env: DEBIAN_FRONTEND: "noninteractive" - name: Remove github artefacts run: | - rm -rf .github* + rm -rf .git* - name: Adjust distibution in changelog file run: | sed -i '0,/restricted/s//stable/' debian/changelog - name: Build Debian package - uses: dawidd6/action-debian-package@v1.5.0 + uses: dawidd6/action-debian-package@v1 with: artifacts_directory: debian/build/release/ - os_distribution: testing - name: Debug run: | ls -la diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f384f5e..49663cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: release-id: ${{ steps.create_release.outputs.id }} steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v2 - name: Install needed packages run: | if [ $(dpkg -l | grep -c dpkg-dev) -ne 1 ]; then sudo apt-get update && sudo apt-get install -y dpkg-dev; fi @@ -43,27 +43,26 @@ jobs: needs: create-release runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 env: DEBIAN_FRONTEND: "noninteractive" - name: Remove github artefacts run: | - rm -rf .github* + rm -rf .git* - name: Adjust distibution in changelog file run: | sed -i '0,/restricted/s//stable/' debian/changelog - name: Build Debian package - uses: dawidd6/action-debian-package@v1.5.0 + uses: dawidd6/action-debian-package@v1 with: artifacts_directory: debian/build/release/ - os_distribution: testing # - name: Build Debian package # uses: pi-top/action-debian-package@v0.2.0 # with: # artifacts_directory: debian/build/release/ # target_architectures: "amd64,i386" - name: Upload the artifacts - uses: skx/github-action-publish-binaries@release-2.0 + uses: skx/github-action-publish-binaries@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml deleted file mode 100644 index 0100fa0..0000000 --- a/debian/.gitlab-ci.yml +++ /dev/null @@ -1,14 +0,0 @@ -include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml - -variables: - RELEASE: 'unstable' - SALSA_CI_DISABLE_APTLY: 0 - SALSA_CI_DISABLE_AUTOPKGTEST: 1 - SALSA_CI_DISABLE_BLHC: 0 - SALSA_CI_DISABLE_LINTIAN: 0 - SALSA_CI_DISABLE_PIUPARTS: 1 - SALSA_CI_DISABLE_REPROTEST: 1 - SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 0 - SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 0 diff --git a/debian/changelog b/debian/changelog index 5e52c77..b03d8f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,33 +1,3 @@ -postfwd (1.35-9) UNRELEASED; urgency=medium - - * - - -- Jan Wagner Mon, 23 Jan 2023 12:43:03 +0000 - -postfwd (1.35-8) unstable; urgency=medium - - * [d32c972] d/watch: Update to new url scheme - * [47e9ee0] Bump debhelper from old 12 to 13. - * [cac0b96] Bump Standards-Version to 4.6.2 - * [98d8062] Update watch file format version to 4. - * [7ba39f1] Drop lsb-base, sysvinit-utils is essential - * [be975fb] Set Rules-Requires-Root: no. - - -- Jan Wagner Mon, 23 Jan 2023 12:40:57 +0000 - -postfwd (1.35-7) unstable; urgency=medium - - * [f2a169d] Use secure copyright file specification URI. - * [270413d] Use secure URI in Homepage field. - * [1563d38] d/source/options: Adding .github to diff ignore - * [f32e604] Adding d/.gitlab-ci.yml - * [94f95bc] Adding Dependabot config - * [b16de77] Do not remove .git* anymore - * [4926505] ci: pin action versions - * [d0ecd91] d/rules: Calling dh_installsystemd (Closes: #994901) - - -- Jan Wagner Tue, 28 Sep 2021 13:28:53 +0200 - postfwd (1.35-6) unstable; urgency=medium * [1446da0] Fix initscript (Closes: #942414) diff --git a/debian/control b/debian/control index 995c952..92e830a 100644 --- a/debian/control +++ b/debian/control @@ -2,18 +2,18 @@ Source: postfwd Section: mail Priority: optional Maintainer: Jan Wagner -Build-Depends: debhelper-compat (= 13), html2text -Homepage: https://www.postfwd.org/ +Build-Depends: debhelper-compat (= 12), html2text +Homepage: http://www.postfwd.org/ Vcs-Browser: https://gitlab.uncompleted.org/debian/postfwd Vcs-Git: https://gitlab.uncompleted.org/debian/postfwd.git -Standards-Version: 4.6.2 -Rules-Requires-Root: no +Standards-Version: 4.5.1.0 Package: postfwd Architecture: all Depends: adduser, libnet-dns-perl, libnet-server-perl, + lsb-base, ${misc:Depends}, ${perl:Depends} Conflicts: postfwd2 diff --git a/debian/copyright b/debian/copyright index ba7f2f8..c7f3783 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: postfwd Upstream-Contact: Jan Peter Kessler Source: http://www.postfwd.org diff --git a/debian/source/options b/debian/source/options index b746363..b5bc9e7 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1 +1 @@ -extend-diff-ignore = '(^|/)(\.travis\.yml|\.git|\.github|\.gitgnore|config\.sub|config\.guess)' +extend-diff-ignore = '(^|/)(\.travis\.yml|\.git|\.gitgnore|config\.sub|config\.guess)' diff --git a/debian/watch b/debian/watch index 191f206..5a512b0 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ -version=4 -https://postfwd.org postfwd-(.*)\.tar\.gz +version=3 +http://www.postfwd.org/postfwd-(.*)\.tar\.gz