Patch from 64-bit time_t NMU

diff --git a/debian/changelog b/debian/changelog
index 55ea8ce073abdc0b7553f1c96177b5784484db71..ba0c9ca2c200ae081fe42b815bb8d4ddd4572db1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+solvespace (3.1+ds1-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062911
+
+ -- Benjamin Drung <bdrung@debian.org>  Thu, 29 Feb 2024 17:02:12 +0000
+
 solvespace (3.1+ds1-3) unstable; urgency=medium
 
   * Team upload.

diff --git a/debian/control b/debian/control
index 58bf06bb392ece9e78ce4d3e9dd36dcd2ea58f17..9ea5afc50064024da240169251b5c5c38ea3d7f7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Uploaders: whitequark <whitequark@whitequark.org>,
            Anton Gladky <gladk@debian.org>
 Section: graphics
 Priority: optional
-Build-Depends: cmake (>= 3.9),
+Build-Depends: dpkg-dev (>= 1.22.5), cmake (>= 3.9),
                debhelper-compat (= 13),
                libeigen3-dev,
                libfontconfig1-dev,
@@ -48,7 +48,10 @@ Description: Parametric 2d/3d CAD
   * plane and solid geometry — replace hand-solved trigonometry and
     spreadsheets with a live dimensioned drawing.
 
-Package: libslvs1
+Package: libslvs1t64
+Provides: ${t64:Provides}
+Replaces: libslvs1
+Breaks: libslvs1 (<< ${source:Version})
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -63,7 +66,7 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
-         libslvs1 (= ${binary:Version})
+         libslvs1t64 (= ${binary:Version})
 Description: SolveSpace geometric kernel (development files)
  SolveSpace is a parametric 2d/3d CAD. libslvs contains the geometric
  kernel of SolveSpace, built as a library.

diff --git a/debian/libslvs1.install b/debian/libslvs1.install
deleted file mode 100644 (file)
index ffa6d6e..0000000
--- a/debian/libslvs1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libslvs.so.*

diff --git a/debian/libslvs1t64.install b/debian/libslvs1t64.install
new file mode 100644 (file)
index 0000000..ffa6d6e
--- /dev/null
+++ b/debian/libslvs1t64.install
@@ -0,0 +1 @@
+usr/lib/*/libslvs.so.*

diff --git a/debian/libslvs1t64.lintian-overrides b/debian/libslvs1t64.lintian-overrides
new file mode 100644 (file)
index 0000000..9e5a1f3
--- /dev/null
+++ b/debian/libslvs1t64.lintian-overrides
@@ -0,0 +1 @@
+libslvs1t64: package-name-doesnt-match-sonames libslvs1