[Pkg-privacy-commits] [Git][pkg-privacy-team/seahorse-nautilus][master] 14 commits: Update and tidy up build dependencies.
Carlos Maddela
gitlab at salsa.debian.org
Mon Feb 4 01:58:24 GMT 2019
Carlos Maddela pushed to branch master at Privacy Maintainers / seahorse-nautilus
Commits:
d5ee7883 by Carlos Maddela at 2019-02-03T16:51:52Z
Update and tidy up build dependencies.
* libgpgme11-dev → libgpgme-dev
* Drop unused gnome-pkg-tools.
* Drop libdbus-glib-1-dev and libgtk-3-dev, which are already
dependencies of other build dependencies.
- - - - -
954dad53 by Carlos Maddela at 2019-02-03T17:00:13Z
Drop unused dh_clean override.
- - - - -
5f1f496a by Carlos Maddela at 2019-02-03T17:09:34Z
Update lintian override to use renamed tag.
debian-watch-may-check-gpg-signature →
debian-watch-does-not-check-gpg-signature
- - - - -
2c3a39d1 by Carlos Maddela at 2019-02-03T18:01:31Z
Add machine-readable upstream metadata.
- - - - -
33a77c36 by Carlos Maddela at 2019-02-03T18:04:38Z
Set "Rules-Requires-Root: no".
- - - - -
9ca32164 by Carlos Maddela at 2019-02-03T18:14:52Z
Run wrap-and-sort.
- - - - -
2b004255 by Carlos Maddela at 2019-02-03T18:17:50Z
Build with debhelper compat level 12.
- - - - -
8337371e by Carlos Maddela at 2019-02-03T19:15:00Z
Add nautilus-ext-headers.patch to stop inclusion of deprecated headers.
- - - - -
f40cf49f by Carlos Maddela at 2019-02-03T22:25:28Z
Add support for terse build option.
- - - - -
59668455 by Carlos Maddela at 2019-02-03T22:29:03Z
Indicate compliance with Debian Policy 4.3.0.
- - - - -
62dd4889 by Carlos Maddela at 2019-02-03T22:31:47Z
Allow git-buildpackage to automatically sign tags.
- - - - -
1d9da684 by Carlos Maddela at 2019-02-03T23:06:25Z
Indicate that package enhances nautilus.
- - - - -
093145db by Carlos Maddela at 2019-02-04T01:50:58Z
Add trivial package test.
- - - - -
bbd647fe by Carlos Maddela at 2019-02-04T01:50:58Z
Prepare changelog.
Gbp-Dch: Ignore
- - - - -
11 changed files:
- debian/changelog
- debian/compat
- debian/control
- debian/gbp.conf
- + debian/patches/nautilus-ext-headers.patch
- debian/patches/series
- debian/rules
- debian/source/lintian-overrides
- + debian/tests/control
- + debian/tests/no-la-files
- + debian/upstream/metadata
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,37 @@
+seahorse-nautilus (3.11.92-3) UNRELEASED; urgency=medium
+
+ [ Clément Hermann ]
+ * fix Bug-Debian field in remove_unused_gnome-keyring_dep.patch
+ * debian/patches/*: Forward vendor patches and update DEP-3 fields
+ accordingly
+
+ [ Ulrike Uhlig ]
+ * Fix typo to make Lintian happy.
+ * Update VCS fields to new URL.
+
+ [ Carlos Maddela ]
+ * Update and tidy up build dependencies.
+ - libgpgme11-dev → libgpgme-dev
+ - Drop unused gnome-pkg-tools.
+ - Drop libdbus-glib-1-dev and libgtk-3-dev, which are already
+ dependencies of other build dependencies.
+ * Drop unused dh_clean override.
+ * Update lintian override to use renamed tag.
+ - debian-watch-may-check-gpg-signature →
+ debian-watch-does-not-check-gpg-signature
+ * Add machine-readable upstream metadata.
+ * Set "Rules-Requires-Root: no".
+ * Run wrap-and-sort.
+ * Build with debhelper compat level 12.
+ * Add nautilus-ext-headers.patch to stop inclusion of deprecated headers.
+ * Add support for terse build option.
+ * Indicate compliance with Debian Policy 4.3.0.
+ * Allow git-buildpackage to automatically sign tags.
+ * Indicate that package enhances nautilus.
+ * Add trivial package test.
+
+ -- Carlos Maddela <e7appew at gmail.com> Mon, 04 Feb 2019 12:24:39 +1100
+
seahorse-nautilus (3.11.92-2) unstable; urgency=medium
[ Carlos Maddela ]
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-10
+12
=====================================
debian/control
=====================================
@@ -2,26 +2,27 @@ Source: seahorse-nautilus
Section: gnome
Priority: optional
Maintainer: Debian Privacy Maintainers <pkg-privacy-maintainers at lists.alioth.debian.org>
-Uploaders: Carlos Maddela <e7appew at gmail.com>, Ulrike Uhlig <u at 451f.org>, Clément Hermann <nodens at nodens.org>
-Build-Depends: debhelper (>= 10),
- gnome-pkg-tools,
+Uploaders: Carlos Maddela <e7appew at gmail.com>,
+ Ulrike Uhlig <u at 451f.org>,
+ Clément Hermann <nodens at nodens.org>
+Build-Depends: debhelper (>= 12),
intltool,
libcryptui-dev,
- libdbus-glib-1-dev,
libgcr-3-dev,
- libgpgme11-dev,
- libgtk-3-dev,
+ libgpgme-dev,
libnautilus-extension-dev,
libnotify-dev
-Standards-Version: 4.1.1
+Standards-Version: 4.3.0
Homepage: https://wiki.gnome.org/Apps/Seahorse
Vcs-Git: https://salsa.debian.org/pkg-privacy-team/seahorse-nautilus.git
Vcs-Browser: https://salsa.debian.org/pkg-privacy-team/seahorse-nautilus
+Rules-Requires-Root: no
Package: seahorse-nautilus
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: seahorse
+Enhances: nautilus
Replaces: seahorse-plugins
Description: Nautilus extension for Seahorse integration
Seahorse nautilus is an extension for nautilus which allows encryption
=====================================
debian/gbp.conf
=====================================
@@ -3,4 +3,5 @@
[DEFAULT]
debian-branch = master
upstream-branch = upstream
+sign-tags = True
pristine-tar = True
=====================================
debian/patches/nautilus-ext-headers.patch
=====================================
@@ -0,0 +1,45 @@
+From: Carlos Maddela <e7appew at gmail.com>
+Date: Mon, 4 Feb 2019 05:46:19 +1100
+Subject: Stop including deprecated nautilus extension headers.
+
+Description: Stop including deprecated nautilus extension headers.
+Author: Carlos Maddela <e7appew at gmail.com>
+Origin: vendor
+Forwarded: https://gitlab.gnome.org/GNOME/seahorse-nautilus/merge_requests/2
+Last-Update: 2019-02-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ nautilus-ext/seahorse-nautilus-module.c | 3 +--
+ nautilus-ext/seahorse-nautilus.c | 4 +---
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/nautilus-ext/seahorse-nautilus-module.c b/nautilus-ext/seahorse-nautilus-module.c
+index c011d1c..7067f64 100644
+--- a/nautilus-ext/seahorse-nautilus-module.c
++++ b/nautilus-ext/seahorse-nautilus-module.c
+@@ -22,8 +22,7 @@
+ */
+
+ #include <config.h>
+-#include <libnautilus-extension/nautilus-extension-types.h>
+-#include <libnautilus-extension/nautilus-column-provider.h>
++#include <nautilus-extension.h>
+ #include <glib/gi18n-lib.h>
+ #include "seahorse-nautilus.h"
+
+diff --git a/nautilus-ext/seahorse-nautilus.c b/nautilus-ext/seahorse-nautilus.c
+index 41efdfd..1fa9b06 100644
+--- a/nautilus-ext/seahorse-nautilus.c
++++ b/nautilus-ext/seahorse-nautilus.c
+@@ -24,9 +24,7 @@
+ #include <config.h>
+ #include <string.h>
+ #include <glib/gi18n-lib.h>
+-#include <libnautilus-extension/nautilus-extension-types.h>
+-#include <libnautilus-extension/nautilus-file-info.h>
+-#include <libnautilus-extension/nautilus-menu-provider.h>
++#include <nautilus-extension.h>
+ #include "seahorse-nautilus.h"
+
+ static GObjectClass *parent_class;
=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@ fix-warnings.patch
fix-desktop-files.patch
update-README.patch
update-translations.patch
+nautilus-ext-headers.patch
=====================================
debian/rules
=====================================
@@ -1,5 +1,11 @@
#!/usr/bin/make -f
+ifeq (,$(filter terse,$(DEB_BUILD_OPTIONS)))
+ export DH_VERBOSE = 1
+else
+ CONF_OPTIONS := --quiet
+endif
+
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_CFLAGS_MAINT_APPEND = -Wall -Wno-deprecated-declarations
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
@@ -10,11 +16,8 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
override_dh_autoreconf:
dh_autoreconf --as-needed
-override_dh_clean:
- dh_clean -X.orig
- for f in $(MUTABLE_FILES); do \
- test ! -f $$f.orig || mv -f $$f.orig $$f; \
- done
+override_dh_auto_configure:
+ dh_auto_configure -- $(CONF_OPTIONS)
override_dh_auto_install:
dh_auto_install
=====================================
debian/source/lintian-overrides
=====================================
@@ -1 +1 @@
-seahorse-nautilus source: debian-watch-may-check-gpg-signature
+seahorse-nautilus source: debian-watch-does-not-check-gpg-signature
=====================================
debian/tests/control
=====================================
@@ -0,0 +1,2 @@
+Tests: no-la-files
+Depends: dpkg, @
=====================================
debian/tests/no-la-files
=====================================
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+# Make sure that no .la files have been packaged.
+! ( dpkg -L seahorse-nautilus | grep -q "\.la$" )
=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1,11 @@
+%YAML 1.1
+---
+# https://wiki.debian.org/UpstreamMetadata
+Bug-Database: https://gitlab.gnome.org/GNOME/seahorse-nautilus/issues
+Bug-Submit: https://gitlab.gnome.org/GNOME/seahorse-nautilus/issues/new
+Contact: Stef Walter <stefw at gnome.org>
+Name: Seahorse Nautilus
+Homepage: https://wiki.gnome.org/Apps/Seahorse
+Repository: https://gitlab.gnome.org/GNOME/seahorse-nautilus.git
+Repository-Browse: https://gitlab.gnome.org/GNOME/seahorse-nautilus/commits/master
+Security-Contact: Stef Walter <stefw at gnome.org>
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/seahorse-nautilus/compare/ad6d2462ad180751a1a0939a4e2d8517487a057b...bbd647fe76e219206efb496bba3ad1a9ae4413b1
--
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/seahorse-nautilus/compare/ad6d2462ad180751a1a0939a4e2d8517487a057b...bbd647fe76e219206efb496bba3ad1a9ae4413b1
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/20190204/b4c2dcc5/attachment-0001.html>
More information about the Pkg-privacy-commits
mailing list