[Pkg-privacy-commits] [Git][pkg-privacy-team/parcimonie][master] 7 commits: Fix the Repository upstream metadata field

intrigeri intrigeri at debian.org
Sat Apr 11 08:44:33 BST 2020



intrigeri pushed to branch master at Privacy Maintainers / parcimonie


Commits:
c110f30c by intrigeri at 2020-04-11T07:20:22+00:00
Fix the Repository upstream metadata field

Fixup against ca65c588f2c54e8dc6f5e0ba0af2fedca5622215.

- - - - -
ef9e844c by intrigeri at 2020-04-11T07:22:37+00:00
Switch to salsa-ci default pipeline

- - - - -
bb247818 by intrigeri at 2020-04-11T07:24:38+00:00
Rename debian/NEWS.Debian to debian/NEWS, so it's actually installed

- - - - -
82b17473 by intrigeri at 2020-04-11T07:26:27+00:00
Consistently use HTTPS URL when pointing to the upstream website

- - - - -
c230f9ed by intrigeri at 2020-04-11T07:30:17+00:00
Declare compatibility with Policy 4.5.0

- - - - -
3f2f4921 by intrigeri at 2020-04-11T07:34:57+00:00
debian/NEWS: use regular paragraphs rather than a bulleted list

Fixes Lintian debian-news-entry-uses-asterisk.

- - - - -
8630df48 by intrigeri at 2020-04-11T07:43:37+00:00
Update debian/changelog

Gbp-Dch: Ignore

- - - - -


7 changed files:

- debian/.gitlab-ci.yml
- + debian/NEWS
- − debian/NEWS.Debian
- debian/changelog
- debian/control
- debian/copyright
- debian/upstream/metadata


Changes:

=====================================
debian/.gitlab-ci.yml
=====================================
@@ -1,48 +1,3 @@
-variables:
-  DEBFULLNAME: "Salsa Pipeline"
-  DEBEMAIL: "<salsa-pipeline at debian.org>"
-  DEBIAN_FRONTEND: noninteractive
-  WORKING_DIR: ./debian/output
-
-stages:
-  - build
-  - test
-
-image: debian:unstable
-
-build package:
-  stage: build
-  artifacts:
-    expire_in: 180 day
-    name: "$CI_BUILD_NAME"
-    paths:
-        - ${WORKING_DIR}/
-  script:
-    - apt-get update
-    - apt-get install eatmydata -y
-    - eatmydata apt-get build-dep -y .
-    - eatmydata apt-get install git-buildpackage -y
-    - gbp pull --ignore-branch
-    - gbp buildpackage --git-ignore-branch --git-export-dir=${WORKING_DIR} -us -uc
-
-run lintian:
-  stage: test
-  script:
-    - apt-get update && apt-get install lintian -y --no-install-recommends
-    - lintian -iI ${WORKING_DIR}/*.changes
-
-run piuparts:
-  stage: test
-  image: genericpipeline/piuparts-docker
-  services:
-    - docker:dind
-  script:
-    - CHROOT_PATH=/tmp/debian-unstable
-    - CONTAINER_ID=$(docker run --rm -d debian:unstable sleep infinity)
-    - docker exec ${CONTAINER_ID} bash -c "apt-get update && apt-get install eatmydata -y"
-    - mkdir -p ${CHROOT_PATH}
-    - docker export ${CONTAINER_ID} | tar -C ${CHROOT_PATH} -xf -
-    - mknod -m 666 ${CHROOT_PATH}/dev/urandom c 1 9
-    - piuparts --hard-link -e ${CHROOT_PATH} ${WORKING_DIR}/*.deb
-  tags:
-    - privileged
+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


=====================================
debian/NEWS
=====================================
@@ -0,0 +1,26 @@
+parcimonie (0.11.0-1) unstable; urgency=medium
+
+  Only GnuPG  2.1 and newer is supported.
+
+  parcimonie-applet is officially deprecated and unsupported upstream.
+  See parcimonie-applet(1p) for details and future plans.
+
+ -- intrigeri <intrigeri at debian.org>  Mon, 09 Jul 2018 20:43:42 +0000
+
+parcimonie (0.9-1) unstable; urgency=medium
+
+  D-Bus support is now disabled by default in parcimonie.
+  The included parcimonie.desktop file enables it for desktop users
+  so that the applet goes on working.
+
+  If you are using parcimonie-applet and have a locally customized copy
+  of that .desktop file, that was created e.g. to pass
+  --gnupg-already-torified or --gnupg-extra-arg to parcimonie, then you
+  should edit your own parcimonie.desktop and add the --with-dbus option
+  to the Exec= statement.
+
+  Such a locally customized copy generally lives in
+  ~/.config/autostart/parcimonie.desktop or similar, depending on the
+  desktop environment that is being used.
+
+ -- intrigeri <intrigeri at debian.org>  Sun, 16 Aug 2015 11:59:01 +0200


=====================================
debian/NEWS.Debian deleted
=====================================
@@ -1,25 +0,0 @@
-parcimonie (0.11.0-1) unstable; urgency=medium
-
-  * Only GnuPG  2.1 and newer is supported.
-  * parcimonie-applet is officially deprecated and unsupported upstream.
-    See parcimonie-applet(1p) for details and future plans.
-
- -- intrigeri <intrigeri at debian.org>  Mon, 09 Jul 2018 20:43:42 +0000
-
-parcimonie (0.9-1) unstable; urgency=medium
-
-  * D-Bus support is now disabled by default in parcimonie.
-    The included parcimonie.desktop file enables it for desktop users
-    so that the applet goes on working.
-  
-    If you are using parcimonie-applet and have a locally customized copy
-    of that .desktop file, that was created e.g. to pass
-    --gnupg-already-torified or --gnupg-extra-arg to parcimonie, then you
-    should edit your own parcimonie.desktop and add the --with-dbus option
-    to the Exec= statement.
-
-    Such a locally customized copy generally lives in
-    ~/.config/autostart/parcimonie.desktop or similar, depending on the
-    desktop environment that is being used.
-
- -- intrigeri <intrigeri at debian.org>  Sun, 16 Aug 2015 11:59:01 +0200


=====================================
debian/changelog
=====================================
@@ -5,6 +5,12 @@ parcimonie (0.11.0-2) UNRELEASED; urgency=medium
   * Drop obsolete {build,runtime}-dependency on torsocks.
   * Add debian/.gitlab-ci.yml, that builds the package and
     then runs Lintian and piuparts on it.
+  * Fix the Repository upstream metadata field added by the Debian Janitor.
+  * Switch to salsa-ci default pipeline.
+  * Rename debian/NEWS.Debian to debian/NEWS, so it's actually installed..
+  * Consistently use HTTPS URL when pointing to the upstream website.
+  * Declare compatibility with Policy 4.5.0.
+  * debian/NEWS: use regular paragraphs rather than a bulleted list.
 
   [ Debian Janitor ]
   * Use secure copyright file specification URI.
@@ -13,7 +19,7 @@ parcimonie (0.11.0-2) UNRELEASED; urgency=medium
   * Set field Upstream-Name in debian/copyright.
   * Set upstream metadata fields: Repository.
 
- -- intrigeri <intrigeri at debian.org>  Sun, 05 Aug 2018 05:46:03 +0000
+ -- intrigeri <intrigeri at debian.org>  Sat, 11 Apr 2020 07:42:34 +0000
 
 parcimonie (0.11.0-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -1,7 +1,7 @@
 Source: parcimonie
 Section: net
 Priority: optional
-Standards-Version: 4.1.5
+Standards-Version: 4.5.0
 Build-Depends: debhelper-compat (= 12), libmodule-build-perl
 Build-Depends-Indep:
  dirmngr,


=====================================
debian/copyright
=====================================
@@ -1,5 +1,5 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: http://gaffer.boum.org/intrigeri/code/parcimonie/
+Source: https://gaffer.boum.org/intrigeri/code/parcimonie/
 Upstream-Name: App-Parcimonie
 
 Files: *


=====================================
debian/upstream/metadata
=====================================
@@ -1 +1 @@
-Repository: git://gaffer.ptitcanardnoir.org/App-Parcimonie.git
+Repository: https://gaffer.boum.org/intrigeri/git/App-Parcimonie.git



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/parcimonie/-/compare/4b6925aa65460d44fd2f4de8b901e2d3e2ec8d0b...8630df481b6c6c95822f8eeac6b126634692a372

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/parcimonie/-/compare/4b6925aa65460d44fd2f4de8b901e2d3e2ec8d0b...8630df481b6c6c95822f8eeac6b126634692a372
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20200411/14e8ca70/attachment-0001.html>


More information about the Pkg-privacy-commits mailing list