[Pkg-privacy-commits] [Git][pkg-privacy-team/pidgin-otr][master] 6 commits: d/changelog: remove trailing whitespace

intrigeri intrigeri at debian.org
Fri Aug 21 12:39:31 BST 2020 


intrigeri pushed to branch master at Privacy Maintainers / pidgin-otr


Commits:
57ad8b09 by intrigeri at 2020-08-21T10:59:18+00:00
d/changelog: remove trailing whitespace

Spotted by Lintian.

- - - - -
c4cb8f79 by intrigeri at 2020-08-21T11:00:18+00:00
Upstream signing key: drop unnecessary signatures

Spotted by Lintian (public-upstream-key-not-minimal).

- - - - -
2b01a81e by intrigeri at 2020-08-21T11:26:29+00:00
Fix broken AppStream metadata installation

The command added in e2703901045012a628038a5c90d74c1395a910bb was broken:

 - incorrect path of the source file to copy
 - trying to install in /, outside of the build directory
 - trying to install in a directory that did not exist yet

This commit replaces it with dh_install declarative configuration.

- - - - -
109f73cd by intrigeri at 2020-08-21T11:26:33+00:00
Disable installation of buggy AppStream metadata for now

The AppStream metadata file proposed on #882375 seems buggy:

  $ appstreamcli validate debian/appdata/pidgin-otr.appdata.xml
  E: pidgin-otr:4: cid-is-not-rdns pidgin-otr
  I: pidgin-otr:12: unknown-tag updatecontact
  W: pidgin-otr:9: url-not-found https://bugs.otr.im/projects/pidgin-otr - HTTP 404: Not Found
  I: pidgin-otr:4: cid-contains-hyphen pidgin-otr

  Validation failed: errors: 1, warnings: 1, infos: 2, pedantic: 1

… so I'd rather not take the responsibility to ship it as-is.

- - - - -
f2ff0d50 by intrigeri at 2020-08-21T11:34:27+00:00
d/copyright: add entry for the AppStream metadata file

Spotted by Lintian:

W: pidgin-otr source: inconsistent-appstream-metadata-license debian/appdata/pidgin-otr.appdata.xml (gfdl-1.3 != gpl-2)
N:
N:    The specified AppStream metadata file specifies a metadata_license field
N:    but this does not match the files in debian/copyright.
N:
N:    Refer to https://wiki.debian.org/AppStream/Guidelines and
N:    https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ for
N:    details.
N:
N:    Severity: warning
N:
N:    Check: debian/copyright/dep5

- - - - -
1a433d56 by intrigeri at 2020-08-21T11:35:01+00:00
pidgin-otr (4.0.2-3)

Gbp-Dch: Ignore

- - - - -


6 changed files:

- debian/changelog
- debian/copyright
- + debian/dirs
- debian/install
- debian/rules
- debian/upstream/signing-key.asc


Changes:

=====================================
debian/changelog
=====================================
@@ -1,15 +1,23 @@
-pidgin-otr (4.0.2-3) UNRELEASED; urgency=medium
+pidgin-otr (4.0.2-3) unstable; urgency=medium
+
+  * Team upload
 
   [ Ulrike Uhlig ]
   * Update VCS fields after migration to Salsa.
   * Add Appstream Metadata file.
-  * Add rule to install Appstream metadata file.
+  * Add rule to install AppStream metadata file.
   * Update Standards version. No change needed.
 
   [ Clément Hermann ]
   * d/control: remove intrigeri from uploaders, add myself
 
- -- Ulrike Uhlig <u at 451f.org>  Sun, 14 Jun 2020 17:51:07 +0200
+  [ intrigeri ]
+  * Upstream signing key: drop unnecessary signatures
+  * Fix broken AppStream metadata file installation, then disable it for now:
+    the proposed metadata file seems buggy
+  * d/copyright: add entry for the AppStream metadata file
+
+ -- intrigeri <intrigeri at debian.org>  Fri, 21 Aug 2020 11:33:55 +0000
 
 pidgin-otr (4.0.2-2) unstable; urgency=medium
 
@@ -176,4 +184,3 @@ pidgin-otr (3.0.0+cvs20070508-1) unstable; urgency=low
   * Initial release of the newly renamed gaim-otr plugin (closes: #422834)
 
  -- Thibaut VARENE <varenet at debian.org>  Tue, 08 May 2007 17:21:54 +0200
-


=====================================
debian/copyright
=====================================
@@ -12,6 +12,10 @@ Copyright:
   © 2014 Debian OTR Team <pkg-otr-team at lists.alioth.debian.org>
 License: GPL-2
 
+Files: debian/appdata/pidgin-otr.appdata.xml
+Copyright: © 2015 Jiri Eischmann <eischmann at redhat.com>
+License: GFDL-1.3
+
 License: GPL-2
  This program is free software; you can redistribute it and/or modify
  it under the terms of version 2 of the GNU General Public License as
@@ -27,3 +31,12 @@ License: GPL-2
  .
  On Debian systems, the full text of the GNU General Public License version 2
  can be found in the file `/usr/share/common-licenses/GPL-2'.
+
+License: GFDL-1.3
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ .
+ On Debian systems, the full text of the GNU Free Documentation License
+ version 1.3 can be found in the file `/usr/share/common-licenses/GFDL-1.3'.


=====================================
debian/dirs
=====================================


=====================================
debian/install
=====================================
@@ -0,0 +1 @@
+# debian/appdata/pidgin-otr.appdata.xml usr/share/metainfo/


=====================================
debian/rules
=====================================
@@ -21,7 +21,6 @@ override_dh_auto_build:
 	cd po; intltool-update --verbose --pot
 
 override_dh_install:
-	cp appdata/pidgin-otr.appdata.xml /usr/share/metainfo/
 	rm debian/pidgin-otr/usr/lib/pidgin/*.la
 	dh_install --fail-missing -X.la
 


=====================================
debian/upstream/signing-key.asc
=====================================
@@ -9,63 +9,8 @@ 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
-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
-=ji+b
+ZWFtIDxvdHJAY3lwaGVycHVua3MuY2E+iF4EExECAB4FAkGuU5kCGwMGCwkIBwMC
+AxUCAwMWAgECHgECF4AACgkQ3tZOuyuofFwKRgCdHe4ozbAEpC7B67N7Dro51LJP
+8W0AoItbsNlIkaCp0bZIVFyrJ+ycLnoZ
+=UMUt
 -----END PGP PUBLIC KEY BLOCK-----



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/pidgin-otr/-/compare/57ec1767d0f195f2dc652eb6a06a1ba5d5041cab...1a433d56d770ae26b96244536d0400c517f2645d

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/pidgin-otr/-/compare/57ec1767d0f195f2dc652eb6a06a1ba5d5041cab...1a433d56d770ae26b96244536d0400c517f2645d
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/20200821/778166b3/attachment-0001.html>

More information about the Pkg-privacy-commits mailing list