Revert a sync from Debian.

This reverts commit f8db30cbfb.
1 year ago · 2ca50a684c
parent f8db30cbfb
commit 2ca50a684c
5 changed files with 41 additions and 46 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,17 +1,24 @@
-lximage-qt (1.2.0-2) unstable; urgency=medium
+lximage-qt (1.2.0-2ubuntu1) lunar; urgency=medium

-  * Merge to unstable.
+  * Revert a sync from Debian.

- -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Fri, 02 Dec 2022 13:16:18 +0800
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Fri, 10 Feb 2023 14:19:56 -0600

-lximage-qt (1.2.0-1) experimental; urgency=medium
+lximage-qt (1.2.0-0ubuntu2) lunar; urgency=medium
+
+  * No-change rebuild against libfm-qt 1.2.1.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Fri, 27 Jan 2023 15:46:45 -0600
+
+lximage-qt (1.2.0-0ubuntu1) lunar; urgency=medium

  * New upstream release.
-  * Remove unnecessary patch.
-  * Fix d/watch for GitHub.
-  * Sort d/copyright.
+  * Fix the watch file, for real this time.
+  * Lubuntuify the package slightly, to make debhelper happy.
+  * Bump build dependencies in debian/control.
+  * Remove reverse-applicable patch.

- -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Wed, 30 Nov 2022 22:07:50 +0800
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 17 Nov 2022 17:52:27 -0600

 lximage-qt (1.1.0-2) unstable; urgency=medium

@ -61,24 +68,11 @@ lximage-qt (1.1.0-1) experimental; urgency=medium

 lximage-qt (1.0.0-1) unstable; urgency=medium

-  [ S. 7 ]
  * New upstream release
  * Bumped Standards-Version to 4.6.0, no changes needed
  * Update debian/copyright

-  [ Aaron Rainbolt ]
-  * New upstream release.
-  * Removed trailing whitespace from changelog.
-  * Upstreamed packaging changes from Ubuntu, modifying the following files:
-    - control
-    - copyright
-    - lintian-overrides
-    - lximage-qt.install
-    - rules
-    - upstream/*
-    - patches directory
-
- -- Aaron Rainbolt <arraybolt3@gmail.com>  Wed, 13 Jul 2022 19:06:28 -0500
+ -- S. 7 <severusseptimius7@gmail.com>  Thu, 25 Nov 2021 18:19:55 +0200

 lximage-qt (0.16.0-1) unstable; urgency=medium

--- a/debian/control
+++ b/debian/control
@ -1,32 +1,33 @@
 Source: lximage-qt
-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>,
-           Simon Quigley <tsimonq2@debian.org>,
-           Aaron Rainbolt <arraybolt3@gmail.com>
+           Andrew Lee (李健秋) <ajqlee@debian.org>
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
               libexif-dev,
-               libfm-qt-dev (>= 1.2.0-3~),
+               libfm-qt-dev (>= 1.2.0),
               libkf5windowsystem-dev,
               libqt5svg5-dev,
               libqt5x11extras5-dev,
               libx11-dev,
               libxfixes-dev,
-               lxqt-build-tools (>= 0.12.0~),
+               lxqt-build-tools (>= 0.12.0),
 Standards-Version: 4.6.1
-Vcs-Browser: https://salsa.debian.org/lxqt-team/lximage-qt
-Vcs-Git: https://salsa.debian.org/lxqt-team/lximage-qt.git
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-about-packaging
+Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-about-packaging.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-about
+XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-about.git
 Homepage: https://github.com/lxqt/lximage-qt
-Rules-Requires-Root: no

 Package: lximage-qt
 Architecture: any
 Depends: ${misc:Depends},
         ${shlibs:Depends}
-Recommends: lximage-qt-l10n, qt5-image-formats-plugins
+Recommends: lximage-qt-l10n,
+            qt5-image-formats-plugins
 Description: Image viewer for LXQt
 A simple image viewer for LXQt. Additional file formats can be processed if
 one install qt5-image-formats-plugins.
--- a/debian/copyright
+++ b/debian/copyright
@ -18,28 +18,28 @@ Copyright: 2013-2016 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
 License: GPL-2+

 Files: src/mrumenu.cpp
-Copyright: 2013 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-           2018 Nathan Osman <nathan@quickmediasolutions.com>
+Copyright: 2018, Nathan Osman <nathan@quickmediasolutions.com>
+           2013, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
 License: GPL-2+

 Files: src/resizeimagedialog.cpp
       src/resizeimagedialog.h
-Copyright: 2020 Andrea Diamantini <adjam@protonmail.com>
-           2010 Aurélien Gâteau <agateau@kde.org>
-           2013 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+Copyright: 2020, Andrea Diamantini <adjam@protonmail.com>
+           2013, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+           2010, Aurélien Gâteau <agateau@kde.org>
 License: GPL-2+

 Files: src/statusbar.cpp
       src/statusbar.h
-Copyright: 2013 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-           2013 Pedram Pourang <tsujan2000@gmail.com>
+Copyright: 2013, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+           2013, Pedram Pourang <tsujan2000@gmail.com>
 License: GPL-2+

 Files: src/upload/imgbbprovider.cpp
       src/upload/imgbbprovider.h
       src/upload/imgbbupload.cpp
       src/upload/imgbbupload.h
-Copyright: 2017 Nathan Osman <nathan@quickmediasolutions.com>
+Copyright: 2017, Nathan Osman <nathan@quickmediasolutions.com>
 License: GPL-2+

 Files: data/lximage-qt.metainfo.xml
@ -49,7 +49,7 @@ License: CC-BY-4.0
 Files: debian/*
 Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
           2015-2022 Andrew Lee (李健秋) <ajqlee@debian.org>
-           2015-2022 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
+           2015      ChangZhuo Chen (陳昌倬) <czchen@debian.org>
           2022      Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
 License: LGPL-2.1+

--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@ -4,3 +4,4 @@ Bug-Submit: https://github.com/lxqt/lximage-qt/issues/new
 Changelog: https://github.com/lxqt/lximage-qt/blob/master/CHANGELOG
 Repository: https://github.com/lxqt/lximage-qt
 Repository-Browse: https://github.com/lxqt/lximage-qt
+
--- 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\/(.*)\.tar\.gz/releases\/download\/$1\/@PACKAGE@-$1\.tar\.xz/,filenamemangle=s/([\d\.]+)\.tar\.gz/@PACKAGE@-$1\.tar\.xz/,pgpsigurlmangle=s/$/.asc/" \
-https://github.com/lxqt/@PACKAGE@/tags .*/([\d\.]+)\.tar\.gz
+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