[neon/neon-packaging/stellarsolver/Neon/release_jammy] debian: rebase on salsa

Tue Jul 9 15:01:15 BST 2024

Git commit 6ee1f30616ed9ace06fdd29e98565b5dfc127feb by Carlos De Maine.
Committed on 09/07/2024 at 14:01.
Pushed by carlosdem into branch 'Neon/release_jammy'.

rebase on salsa

M  +1    -1    debian/changelog
M  +31   -29   debian/control
M  +139  -8    debian/copyright
M  +3    -3    debian/libstellarsolver-dev.install
M  +2    -5    debian/rules

https://invent.kde.org/neon/neon-packaging/stellarsolver/-/commit/6ee1f30616ed9ace06fdd29e98565b5dfc127feb

diff --cc debian/changelog
index 625f967,ae5029f..7d67f9b

--- a/debian/changelog
+++ b/debian/changelog
@@@ -24,14 -24,35 +24,14 @@@ stellarsolver (2.3-1) experimental; urg
  
   -- Pino Toscano <pino at debian.org>  Tue, 24 May 2022 20:45:49 +0200
  
 -stellarsolver (2.2-1) experimental; urgency=medium
 +libstellarsolver (2.2-neon) UNRELEASED; urgency=medium
  
 -  * New upstream release.
 -  * Bump Standards-Version to 4.6.1, no changes required.
 -  * Rename packages according to the new SONAMEs:
 -    - libstellarsolver1 -> libstellarsolver2
 -  * Update install files.
 -  * Update copyright.
 -
 - -- Pino Toscano <pino at debian.org>  Sat, 21 May 2022 06:24:52 +0200
 -
 -stellarsolver (1.9-1) unstable; urgency=medium
 -
 -  * New upstream release.
 -  * Add needed dependencies for libstellarsolver-dev: libcfitsio-dev,
 -    qtbase5-dev.
 -  * CI: enable blhc again, as it should work fine now.
 -  * Small tweak to the description of libstellarsolver1.
 -
 - -- Pino Toscano <pino at debian.org>  Sat, 29 Jan 2022 14:41:22 +0100
 -
 -stellarsolver (1.8-2) unstable; urgency=medium
 -
 -  * Upload to unstable.
 +  * new release
  
 - -- Pino Toscano <pino at debian.org>  Sun, 12 Dec 2021 00:18:18 +0100
 + -- Jonathan Riddell <jr at jriddell.org>  Mon, 23 Nov 2020 10:29:57 +0000
  
 -stellarsolver (1.8-1) experimental; urgency=medium
 +libstellarsolver (1.4) focal; urgency=medium
  
 -  * Initial packaging.
 +  * Initial release.
  
-  -- Jasem Mutlaq <mutlaqja at ikarustech.com>  Wed, 26 Aug 2020 17:00:00 +0300
 - -- Pino Toscano <pino at debian.org>  Fri, 10 Sep 2021 07:01:41 +0200
++ -- Jasem Mutlaq <mutlaqja at ikarustech.com>  Wed, 26 Aug 2020 17:00:00 +0300
diff --cc debian/control
index 562152b,727320b..c162bf8
--- a/debian/control
+++ b/debian/control
@@@ -21,16 -28,11 +28,11 @@@ Description: Sextractor and Astrometry.
  
  Package: libstellarsolver-dev
  Architecture: any
- Depends: libstellarsolver, ${misc:Depends}, ${shlibs:Depends}
- Description: StellarSolver Library development headers
-  .
-  This package includes development headers for an Astrometric Plate Solver for Mac, Linux, and Windows, built on Astrometry.net and SEP.
- 
- Package: libstellarsolver-dbg
- Priority: extra
- Section: debug
- Architecture: any
- Depends: libstellarsolver (= ${binary:Version}), ${misc:Depends}
- Description: StellarSolver Library debug symbols
+ Depends: libstellarsolver2 (= ${binary:Version}),
+  libcfitsio-dev,
+  qtbase5-dev,
+  ${misc:Depends}
+ Description: development files for the Stellar Solver library
+  An Astrometric Plate Solver, built on Astrometry.net and SEP (sextractor).
   .
-  This package contains debug symbols.
 - This package contains the Stellar Solver development files.
++ This package contains the Stellar Solver development files.
diff --cc debian/copyright
index 29090cd,69f55c2..f36a6bb
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,13 -1,144 +1,144 @@@
- This package was debianized by Jasem Mutlaq <mutlaqja at ikarustech.com> on
- Fri, 21 Dec 2007 02:44:13 +0300.
+ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+ Upstream-Name: stellarsolver
+ Source: https://github.com/rlancaste/stellarsolver
  
- Copyright:
+ Files: *
+ Copyright: Robert Lancaster, 2020
+ License: GPL-2+
  
-     Robert Lancaster <rlancaste at gmail.com> (c) 2020
+ Files: cmake/*
+ Copyright: 2006, 2016, Jasem Mutlaq <mutlaqja at ikarustech.com>
+            2014, Kelly Thompson <kgt at lanl.gov>
+            2007-2009, Kitware, Inc.
+            2020, Robert Lancaster <rlancaste at gmail.com>
+ License: BSD-3-clause
  
- License:
+ Files: stellarsolver/astrometry/*
+ Copyright: 2006-2015 astrometry.net, Dustin Lang, Keith Mierle, David W. Hogg,
+  Gerard Jungman, Michael Blanton, Denis Vida, Brian Grough, Sam Roweis,
+  Christopher Stumm, David Warde-Farley, Michal Kočer, Tamas Budavari
+  2008 B.A. Weaver,
+  1992, 1993 The Regents of the University of California,
+  1970-2003, Wm. Randolph Franklin,
+  2002-2007 Gene Cash,
+  2007-2008 Ianaré Sévi
+  2015 Ole Streicher <olebole at debian.org> (debian)
+ License: BSD-3-clause
  
-     GPL v2
+ Files: stellarsolver/astrometry/blind/windirent.h
+ Copyright: 1998-2019, Toni Ronkko
+ License: dirent-MIT
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  .
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
  
- The Debian packaging is (C) 2007, Jasem Mutlaq <mutlaqja at ikarustech.com> and
- is licensed under the BSD License.
+ Files: stellarsolver/astrometry/include/astrometry/anqfits.h
+        stellarsolver/astrometry/include/astrometry/qfits_byteswap.h
+        stellarsolver/astrometry/include/astrometry/qfits_card.h
+        stellarsolver/astrometry/include/astrometry/qfits_error.h
+        stellarsolver/astrometry/include/astrometry/qfits_float.h
+        stellarsolver/astrometry/include/astrometry/qfits_header.h
+        stellarsolver/astrometry/include/astrometry/qfits_image.h
+        stellarsolver/astrometry/include/astrometry/qfits_md5.h
+        stellarsolver/astrometry/include/astrometry/qfits_memory.h
+        stellarsolver/astrometry/include/astrometry/qfits_rw.h
+        stellarsolver/astrometry/include/astrometry/qfits_std.h
+        stellarsolver/astrometry/include/astrometry/qfits_table.h
+        stellarsolver/astrometry/include/astrometry/qfits_time.h
+        stellarsolver/astrometry/include/astrometry/qfits_tools.h
+ Copyright: 2001-2004, European Southern Observatory
+            2007-2013, Dustin Lang
+ License: GPL-2+
+ 
+ Files: stellarsolver/astrometry/libkd/an-fls.h
+ Copyright: 1990, 1993, The Regents of the University of California.  All rights reserved.
+ License: BSD-3-clause
+ 
+ Files: stellarsolver/astrometry/qfits-an/*
+ Copyright: Nicolas Devillard <ndevilla at gmail.com>
+            2001-2004, European Southern Observatory
+            2002, Yves Jung <yjung at eso.org>
+            2007, 2010, 2013, Dustin Lang
+ License: GPL-2+
+ 
+ Files: stellarsolver/astrometry/util/md5.c
+ Copyright: 2001-2003, Christophe Devine
+ License: GPL-2+
+ 
+ Files: stellarsolver/sep/*
+ Copyright: 1993-2011, Emmanuel Bertin
+            2014, SEP developers
+ License: LGPL-3+
+ 
+ Files: stellarsolver/sep/overlap.h
+        stellarsolver/sep/util.cpp
+ Copyright: Thomas Robitaille
+            Kyle Barbary
+ License: BSD-3-clause
+ 
+ Files: ssolverutils/bayer.c
+        ssolverutils/bayer.h
+ Copyright: Damien Douxchamps
+            Frederic Devernay
+            Dave Coffin
+ License: LGPL-2.1+
+ 
+ Files: ssolverutils/dms.cpp
+        ssolverutils/dms.h
+        tester/nan.h
+ Copyright: 2001, Jason Harris <jharris at 30doradus.org>
+            2013, Akarsh Simha <akarsh.simha at kdemail.net>
+ License: GPL-2+
+ 
+ Files: debian/*
+ Copyright: 2021-2022, Pino Toscano <pino at debian.org>
+ License: LGPL-2.1+
+ 
+ License: BSD-3-clause
+  modification, are permitted provided that the following conditions
+  are met:
+  .
+  1. Redistributions of source code must retain the copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+  3. The name of the author may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+  .
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ 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: LGPL-2.1+
+  On Debian systems, the full text of the GNU Lesser General Public License
+  version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
+ 
+ License: LGPL-3+
+  On Debian systems, the full text of the GNU Lesser General Public License
 - version 3 can be found in the file `/usr/share/common-licenses/LGPL-3'.
++ version 3 can be found in the file `/usr/share/common-licenses/LGPL-3'.
diff --cc debian/libstellarsolver-dev.install
index c6bd9e1,7dd0003..0afd375
--- a/debian/libstellarsolver-dev.install
+++ b/debian/libstellarsolver-dev.install
@@@ -1,4 -1,4 +1,4 @@@
- usr/include/libstellarsolver/*
- usr/lib/*/cmake/
+ usr/include/libstellarsolver/
+ usr/lib/*/cmake/StellarSolver/
  usr/lib/*/libstellarsolver.so
--usr/lib/*/pkgconfig/stellarsolver.pc
++usr/lib/*/pkgconfig/stellarsolver.pc
diff --cc debian/rules
index 5f94258,2d33f6a..ed7f152
--- a/debian/rules
+++ b/debian/rules
@@@ -1,7 -1,4 +1,4 @@@
  #!/usr/bin/make -f
  
- include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/class/cmake.mk
- 
- #DEB_SRCDIR=stellarsolver
- #DEB_DH_SHLIBDEPS_ARGS=-u--ignore-missing-info
+ %:
 -	dh $@
++	dh $@
