[neon/neon-packaging/libquotient/Neon/release] debian: manually merge salsa

Jonathan Esk-Riddell null at kde.org
Thu Sep 8 16:59:58 BST 2022 

Git commit f38237a9a68b968a736c658186bc65368acea231 by Jonathan Esk-Riddell.
Committed on 08/09/2022 at 15:59.
Pushed by jriddell into branch 'Neon/release'.

manually merge salsa

M  +27   -3    debian/changelog
M  +7    -7    debian/control
D  +0    -45   debian/copyright
M  +1    -1    debian/files
D  +0    -2    debian/gbp.conf
A  +2    -0    debian/libquotient-dev.dirs
M  +1    -2    debian/libquotient-dev.install
A  +1    -0    debian/libquotient0.6.dirs
M  +1    -1    debian/libquotient0.6.install
M  +6    -1    debian/rules
D  +0    -1    debian/source/format
M  +3    -1    debian/watch

https://invent.kde.org/neon/neon-packaging/libquotient/commit/f38237a9a68b968a736c658186bc65368acea231

diff --git a/debian/changelog b/debian/changelog
index 44e9958..9452f74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,32 @@
-libquotient (0.6.11-0neon) UNRELEASED; urgency=medium
+libquotient (0.6.11-1) unstable; urgency=medium
 
-  * New upstream release
+  * New upstream release.
+
+ -- Hubert Chathi <uhoreg at debian.org>  Sat, 16 Oct 2021 12:21:18 -0400
+
+libquotient (0.6.6-1) unstable; urgency=high
+
+  * New upstream release. This fixes a remotely-triggered crash (see
+    https://github.com/quotient-im/libQuotient/issues/456).
+
+ -- Andres Salomon <dilinger at debian.org>  Sat, 27 Mar 2021 23:51:17 -0400
+
+libquotient (0.6.4-2) unstable; urgency=medium
+
+  * Remove libqmatrixclient-dev dummy package; Hubert pointed out that
+    we may want both dev packages installable, and they don't actually
+    conflict.
+
+ -- Andres Salomon <dilinger at debian.org>  Tue, 19 Jan 2021 17:21:30 -0500
+
+libquotient (0.6.4-1) unstable; urgency=medium
+
+  * New upstream release (closes: #980067).
+  * Add myself as an uploader.
+  * Upstream renamed the library from libqmatrixclient to libQuotient;
+    rename the packages accordingly, with a dummy -dev package.
 
- -- Jonathan Riddell <jr at jriddell.org>  Fri, 20 Nov 2020 15:37:38 +0000
+ -- Andres Salomon <dilinger at debian.org>  Mon, 18 Jan 2021 04:16:19 -0500
 
 libqmatrixclient (0.5.3.2-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 4c5ac96..ba4d455 100644
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,25 @@
 Source: libquotient
 Priority: optional
 Maintainer: Matrix Packaging Team <pkg-matrix-maintainers at lists.alioth.debian.org>
-Uploaders: Hubert Chathi <uhoreg at debian.org>
-Build-Depends: cmake, debhelper-compat (= 12), qtbase5-dev, qtmultimedia5-dev
+Uploaders: Hubert Chathi <uhoreg at debian.org>, Andres Salomon <dilinger at debian.org>
+Build-Depends: debhelper-compat (= 12), cmake, qtbase5-dev, qtmultimedia5-dev
 Standards-Version: 4.3.0
 Section: libs
 Homepage: https://github.com/quotient-im/libQuotient
-Vcs-Git: https://salsa.debian.org/matrix-team/libqmatrixclient.git
-Vcs-Browser: https://salsa.debian.org/matrix-team/libqmatrixclient
+Vcs-Git: https://salsa.debian.org/matrix-team/libquotient.git
+Vcs-Browser: https://salsa.debian.org/matrix-team/libquotient
 
 Package: libquotient-dev
 Section: libdevel
 Architecture: any
 Depends: libquotient0.6 (= ${binary:Version}), ${misc:Depends}
 Description: Qt5 library to write cross-platform clients for Matrix
- libQMatrixClient is a Qt5-based library to make IM clients for the Matrix
+ libQuotient is a Qt5-based library to make IM clients for the Matrix
  protocol. It is the backbone of Quaternion, Spectral and some other projects.
 
 Package: libquotient0.6
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Qt5 library to write cross-platform clients for Matrix
- libQMatrixClient is a Qt5-based library to make IM clients for the Matrix
+ libQuotient is a Qt5-based library to make IM clients for the Matrix
  protocol. It is the backbone of Quaternion, Spectral and some other projects.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 6612e50..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,45 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: libQuotient
-Source: https://github.com/quotient-im/libQuotient
-
-Files: *
-Copyright: 2015-2017 Felix Rohrbach
-           2015-2019 Kitsune Ral
-           2017 Elvis Angelaccio
-           2017 Marius Gripsgard
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
-
-Files: debian/*
-Copyright: 2018-2019 Hubert Chathi <uhoreg at debian.org>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/files b/debian/files
index 336bc44..082b2d3 100644
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-libqmatrixclient_0.5.3.2-1_source.buildinfo libs optional
+libquotient_0.6.11-1_source.buildinfo libs optional
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 4e6d957..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[DEFAULT]
-upstream-vcs-tag = %(version)s
diff --git a/debian/libquotient-dev.dirs b/debian/libquotient-dev.dirs
new file mode 100644
index 0000000..da07fdd
--- /dev/null
+++ b/debian/libquotient-dev.dirs
@@ -0,0 +1,2 @@
+usr/include
+usr/lib
diff --git a/debian/libquotient-dev.install b/debian/libquotient-dev.install
index eff1c41..9b9e44b 100644
--- a/debian/libquotient-dev.install
+++ b/debian/libquotient-dev.install
@@ -1,5 +1,4 @@
 usr/include/*
-usr/lib/*/cmake/*
 usr/lib/*/lib*.so
 usr/lib/*/pkgconfig/*
-usr/share/ndk-modules/Android.mk
+usr/lib/*/cmake/*
diff --git a/debian/libquotient0.6.dirs b/debian/libquotient0.6.dirs
new file mode 100644
index 0000000..6845771
--- /dev/null
+++ b/debian/libquotient0.6.dirs
@@ -0,0 +1 @@
+usr/lib
diff --git a/debian/libquotient0.6.install b/debian/libquotient0.6.install
index b8f8846..3ddde58 100644
--- a/debian/libquotient0.6.install
+++ b/debian/libquotient0.6.install
@@ -1 +1 @@
-usr/lib/*/lib*.so.0.6*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index baf6a3f..2c000bc
--- a/debian/rules
+++ b/debian/rules
@@ -5,4 +5,9 @@
 
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_SHARED_LIBS=1
+	dh_auto_configure -- -DCMAKE_INSTALL_INCLUDEDIR=include/libquotient -DBUILD_SHARED_LIBS=1
+
+override_dh_auto_install:
+	dh_auto_install
+# unused example file -- remove to avoid warning from dh_missing
+	rm debian/tmp/usr/bin/quotest
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/watch b/debian/watch
index 9325eef..9d61d31 100644
--- a/debian/watch
+++ b/debian/watch
@@ -6,4 +6,6 @@
 # Compulsory line, this is a version 4 file
 version=4
 
-https://github.com/quotient-im/libQuotient/releases /quotient-im/libQuotient/archive/refs/tags/([\d.]+).tar.gz
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%<project>-$1.tar.gz%" \
+   https://github.com/quotient-im/libQuotient/tags \
+   (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate

More information about the Neon-commits mailing list