Revert a sync from Debian.

This reverts commit 76936ac9f2.
1 year ago · 0e2a1dbf32
parent 76936ac9f2
commit 0e2a1dbf32
10 changed files with 156 additions and 110 deletions
--- a/debian/.gitignore
+++ b/debian/.gitignore
@ -0,0 +1,7 @@
+/*.debhelper
+/*.log
+/*.substvars
+/debhelper-build-stamp
+/files
+
+/lxqt-openssh-askpass/
--- a/debian/changelog
+++ b/debian/changelog
@ -1,33 +1,46 @@
-lxqt-openssh-askpass (1.2.0-1) unstable; urgency=medium
+lxqt-openssh-askpass (1.2.0-1ubuntu1) lunar; urgency=medium

-  * New upstream release.
-  * Add Rules-Requires-Root: no.
-  * Remove unnecessary --fail-missing in d/rules.
-  * Remove unnecessary -Wl,--as-needed in d/rules.
-  * Update d/watch for GitHub.
-  * Add Repository-Browse in d/upstream/metadata.
-  * Use LF in d/upstream/signing-key.asc.
-  * Change indent for d/control.
+  * Revert a sync from Debian.

- -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Thu, 15 Dec 2022 00:19:20 +0800
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Sun, 12 Feb 2023 21:53:32 -0600

-lxqt-openssh-askpass (1.1.0-2) unstable; urgency=medium
+lxqt-openssh-askpass (1.2.0-0ubuntu1) lunar; urgency=medium

-  * Merge to unstable.
+  * New upstream release.
+  * Fix the watch file, for real this time.
+  * Bump build dependencies in debian/control.
+  * Bump Standards-version to 4.6.1, no changes needed.
+  * Lubuntuify the package slightly, to make debhelper happy.
+  * Briefly update the copyright file.

- -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Sat, 19 Nov 2022 15:45:13 +0800
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 18 Nov 2022 17:28:15 -0600

-lxqt-openssh-askpass (1.1.0-1) experimental; urgency=medium
+lxqt-openssh-askpass (1.1.0-0ubuntu1) kinetic; urgency=medium

  * New upstream release.
  * Bump build dependencies.
-  * Bump Standards-version to 4.6.1, no changes needed.
-  * Bump debhelper compat to 13, no changes needed.
-  * Run wrap-and-sort.
-  * Remove some old Breaks/Replaces.
-  * Grab some useful changes from Ubuntu so we can sync.
+  * Remove old Breaks/Replaces, since we're past the LTS.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 01 Jun 2022 16:08:44 -0500
+
+lxqt-openssh-askpass (0.17.0-0ubuntu1) impish; urgency=medium
+
+  * New upstream release 0.17.0
+  * Update debian/control
+    - Bump Standards-Version to 4.5.1
+    - Use liblxqt0-dev 0.17.0
+    - Extend lxqt-openssh-askpass-l10n package description
+  * Update debian/copyright

- -- Simon Quigley <tsimonq2@debian.org>  Wed, 13 Jul 2022 19:27:49 -0500
+ -- apt-ghetto <apt-ghetto@protonmail.com>  Tue, 17 Aug 2021 15:43:58 +0200
+
+lxqt-openssh-askpass (0.16.0-1ubuntu1) hirsute; urgency=medium
+
+  * New upstream version.
+  * Bump debhelper-compat reuqirement to 13.
+  * Fixed manpages.
+
+ -- Raman Sarda <theloudspeaker@disroot.org>  Mon, 22 Feb 2021 00:54:39 +0530

 lxqt-openssh-askpass (0.16.0-1) unstable; urgency=medium

@ -41,6 +54,23 @@ lxqt-openssh-askpass (0.16.0-1) unstable; urgency=medium

 -- Andrew Lee (李健秋) <ajqlee@debian.org>  Thu, 07 Jan 2021 16:22:33 +0800

+lxqt-openssh-askpass (0.15.0-0ubuntu1) groovy; urgency=medium
+
+  * New upstream release.
+    - Update upstream signing key.
+    - Update LXQt build depends.
+  * Bump Standards-version to 4.5.0, no changes needed.
+  * Migrate to debhelper-compat.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 04 Jun 2020 14:06:26 -0500
+
+lxqt-openssh-askpass (0.14.1-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Update build depends.
+
+ -- Raman Sarda <theloudspeaker@lubuntu.me>  Fri, 31 Jan 2020 16:57:22 +0530
+
 lxqt-openssh-askpass (0.14.1-1) unstable; urgency=medium

  * Cherry-picking new upstream version 0.14.1.
@ -48,6 +78,13 @@ lxqt-openssh-askpass (0.14.1-1) unstable; urgency=medium

 -- Alf Gaida <agaida@siduction.org>  Tue, 26 Feb 2019 02:01:54 +0100

+lxqt-openssh-askpass (0.14.1-0ubuntu1) disco; urgency=medium
+
+  * New upstream release.
+  * Run wrap-and-sort.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 09 Mar 2019 13:10:40 -0600
+
 lxqt-openssh-askpass (0.14.0-1) unstable; urgency=medium

  * Cherry-picking new upstream version 0.14.0.
@ -62,6 +99,16 @@ lxqt-openssh-askpass (0.14.0-1) unstable; urgency=medium

 -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 18:25:40 +0100

+lxqt-openssh-askpass (0.14.0-0ubuntu1) disco; urgency=medium
+
+  * New upstream release.
+    - Bump build dependencies.
+  * Bump Standards-version to 4.3.0, no changes needed.
+  * Bump debhelper compat to 12, no changes needed.
+  * Add new lxqt-openssh-askpass-l10n package.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 26 Jan 2019 00:27:56 -0600
+
 lxqt-openssh-askpass (0.13.0-1) unstable; urgency=medium

  * Cherry-picking new upstream version 0.13.0.
@ -70,6 +117,15 @@ lxqt-openssh-askpass (0.13.0-1) unstable; urgency=medium

 -- Alf Gaida <agaida@siduction.org>  Thu, 24 May 2018 22:11:57 +0200

+lxqt-openssh-askpass (0.13.0-0ubuntu1) cosmic; urgency=medium
+
+  * New upstream release.
+  * Update Vcs-* and Maintainer to Lubuntu values.
+  * Update build dependencies.
+  * Update copyright.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 22 May 2018 23:41:00 -0500
+
 lxqt-openssh-askpass (0.12.0-4) unstable; urgency=medium

  * Bumped compat to 11
@ -202,3 +258,4 @@ lxqt-openssh-askpass (0.9.0+20150817-1) unstable; urgency=low
  * Initial release (Closes: #747603)

 -- ChangZhuo Chen (陳昌倬) <czchen@gmail.com>  Mon, 17 Aug 2015 23:40:43 +0800
+
--- a/debian/control
+++ b/debian/control
@ -1,5 +1,6 @@
 Source: lxqt-openssh-askpass
-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
           ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
           Andrew Lee (李健秋) <ajqlee@debian.org>,
@ -9,24 +10,22 @@ Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
               libkf5windowsystem-dev,
-               liblxqt1-dev (>= 1.1.0~),
+               liblxqt1-dev (>= 1.2.0),
               libqt5svg5-dev,
               libqt5x11extras5-dev,
               libx11-dev
 Standards-Version: 4.6.1
-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-openssh-askpass
-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-openssh-askpass.git
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-openssh-askpass-packaging
+Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-openssh-askpass-packaging.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-openssh-askpass
+XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-openssh-askpass.git
 Homepage: https://github.com/lxqt/lxqt-openssh-askpass
-Rules-Requires-Root: no

 Package: lxqt-openssh-askpass
 Architecture: any
 Provides: ssh-askpass
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: lxqt-openssh-askpass-l10n,
-            lxqt-qtplugin,
-            lxqt-session
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: lxqt-openssh-askpass-l10n, lxqt-qtplugin, lxqt-session
 Suggests: lxqt | lxqt-core
 Description: OpenSSH user/password GUI dialog for LXQt
 This module handles openssh security password access for LXQt. The openssh
@ -57,8 +56,7 @@ Package: lxqt-openssh-askpass-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: ${misc:Depends},
-         qttranslations5-l10n
+Depends: qttranslations5-l10n, ${misc:Depends}
 Description: Language package for lxqt-openssh-askpass
 The l10n files for lxqt-openssh-askpass.
 .
--- a/debian/copyright
+++ b/debian/copyright
@ -3,8 +3,8 @@ Upstream-Name: lxqt-openssh-askpass
 Source: https://github.com/lxqt/lxqt-openssh-askpass

 Files: *
-Copyright: 2012-2021 LXQt team
-           2010-2012 Razor team
+Copyright: 2012-2022, LXQt team
+           2010-2012, Razor team
 License: LGPL-2.1+

 Files: debian/*
--- a/debian/rules
+++ b/debian/rules
@ -2,6 +2,7 @@
 # export DH_VERBOSE=1

 export LC_ALL=C.UTF-8
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all

 %:
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@ -1,12 +0,0 @@
-# For more information on what jobs are run see:
-# https://salsa.debian.org/salsa-ci-team/pipeline
-#
-# To enable the jobs, go to your repository (at salsa.debian.org)
-# and click over Settings > CI/CD > Expand (in General pipelines).
-# In "Custom CI config path" write debian/salsa-ci.yml and click
-# in "Save Changes". The CI tests will run after the next commit.
---
-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
-
--- a/debian/source/local-options
+++ b/debian/source/local-options
@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@ -1,6 +0,0 @@
-Name: lxqt-openssh-askpass
-Bug-Database: https://github.com/lxqt/lxqt-openssh-askpass/issues
-Bug-Submit: https://github.com/lxqt/lxqt-openssh-askpass/issues/new
-Changelog: https://github.com/lxqt/lxqt-openssh-askpass/blob/master/CHANGELOG
-Repository: https://github.com/lxqt/lxqt-openssh-askpass
-Repository-Browse: https://github.com/lxqt/lxqt-openssh-askpass
--- a/debian/watch
+++ b/debian/watch
@ -1,6 +1,5 @@
 version=4
-
-# See https://davesteele.github.io/development/2015/05/02/debian-watch-file-format-for-signed-github-source-tars/ for GitHub workaround for releases page.
-
-opts="downloadurlmangle=s/archive\/refs\/tags\/@ANY_VERSION@@ARCHIVE_EXT@/releases\/download\/$1\/@PACKAGE@-$1\.tar\.xz/,filenamemangle=s/@ANY_VERSION@@ARCHIVE_EXT@/@PACKAGE@-$1\.tar\.xz/,pgpsigurlmangle=s/$/.asc/" \
-https://github.com/lxqt/@PACKAGE@/tags .*/@ANY_VERSION@@ARCHIVE_EXT@
+opts="searchmode=plain, \
+pgpsigurlmangle=s/$/.asc/, \
+uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \
+  https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz