[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1062399: liblip: NMU diff for 64-bit time_t transition



Source: liblip
Dear maintainer,

Please find attached a final version of this patch for the time_t
transition.  This patch is being uploaded to unstable.

Note that this adds a versioned build-dependency on dpkg-dev, to guard
against accidental backports with a wrong ABI.

Thanks!


-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-21-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect
diff -Nru liblip-2.0.0/debian/changelog liblip-2.0.0/debian/changelog
--- liblip-2.0.0/debian/changelog	2023-08-09 15:43:43.000000000 +0000
+++ liblip-2.0.0/debian/changelog	2024-02-29 23:44:01.000000000 +0000
@@ -1,3 +1,10 @@
+liblip (2.0.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062399
+
+ -- Benjamin Drung <bdrung@debian.org>  Thu, 29 Feb 2024 23:44:01 +0000
+
 liblip (2.0.0-2) unstable; urgency=medium
 
   * QA upload.
diff -Nru liblip-2.0.0/debian/control liblip-2.0.0/debian/control
--- liblip-2.0.0/debian/control	2023-08-09 15:43:43.000000000 +0000
+++ liblip-2.0.0/debian/control	2024-02-29 23:44:01.000000000 +0000
@@ -2,11 +2,14 @@
 Section: math
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: libtnt-dev (>= 1.2.5-3), autotools-dev
+Build-Depends: dpkg-dev (>= 1.22.5), libtnt-dev (>= 1.2.5-3), autotools-dev
 Homepage: http://www.deakin.edu.au/~gleb/lip.html
 Standards-Version: 3.7.2
 
-Package: liblip2
+Package: liblip2t64
+Provides: ${t64:Provides}
+Replaces: liblip2
+Breaks: liblip2 (<< ${source:Version})
 Section: libs
 Priority: optional
 Architecture: any
@@ -59,7 +62,7 @@
 Section: libdevel
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libtnt-dev, liblip2 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libtnt-dev, liblip2t64 (= ${binary:Version})
 Description: reliable interpolation of multivariate scattered data
  Lip interpolates scattered multivariate data with a Lipschitz function.
  .
diff -Nru liblip-2.0.0/debian/liblip2t64.lintian-overrides liblip-2.0.0/debian/liblip2t64.lintian-overrides
--- liblip-2.0.0/debian/liblip2t64.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ liblip-2.0.0/debian/liblip2t64.lintian-overrides	2024-02-29 23:43:53.000000000 +0000
@@ -0,0 +1 @@
+liblip2t64: package-name-doesnt-match-sonames liblip2
diff -Nru liblip-2.0.0/debian/rules liblip-2.0.0/debian/rules
--- liblip-2.0.0/debian/rules	2023-08-09 15:43:43.000000000 +0000
+++ liblip-2.0.0/debian/rules	2024-02-29 23:44:00.000000000 +0000
@@ -30,7 +30,7 @@
 	-rm -f `find . -name "*~"`
 	-rm -rf tnt shared static
 	-rm -rf debian/tmp debian/files* core debian/substvars debian/debhelper.log
-	-rm -rf debian/liblip2 debian/liblip-dev
+	-rm -rf debian/liblip2t64 debian/liblip-dev
 
 binary-indep: checkroot build
 	$(checkdir)
@@ -39,18 +39,18 @@
 binary-arch: checkroot build
 	$(checkdir)
 	-rm -rf debian/tmp
-	-rm -rf debian/liblip2 debian/liblip-dev
-	install -d debian/tmp/DEBIAN debian/liblip2/usr/share/doc/liblip2/examples
-	cd debian && install -d liblip2 liblip-dev
-	cd debian/liblip2    && install -d DEBIAN usr/share/doc usr/lib/lip
+	-rm -rf debian/liblip2t64 debian/liblip-dev
+	install -d debian/tmp/DEBIAN debian/liblip2t64/usr/share/doc/liblip2t64/examples
+	cd debian && install -d liblip2t64 liblip-dev
+	cd debian/liblip2t64    && install -d DEBIAN usr/share/doc usr/lib/lip
 	cd debian/liblip-dev && install -d DEBIAN usr/share/doc usr/lib/lip usr/include/lip
 
-	cd debian && install -m 644 shlibs liblip2/DEBIAN
+	cd debian && install -m 644 shlibs liblip2t64/DEBIAN
 
 	cd shared/lib && $(STRIP) --strip-unneeded liblip.so.2.0.0
 	cd static/lib && strip --strip-debug liblip.a
 
-	mv shared/lib/liblip.so.* debian/liblip2/usr/lib/lip
+	mv shared/lib/liblip.so.* debian/liblip2t64/usr/lib/lip
 	mv shared/lib/liblip.so debian/liblip-dev/usr/lib/lip	
 	sed "s/^libdir=.*/libdir=\'\/usr\/lib\/lip\'/" shared/lib/liblip.la > debian/liblip-dev/usr/lib/lip/liblip.la
 	mv static/lib/liblip.a debian/liblip-dev/usr/lib/lip	
@@ -60,23 +60,23 @@
 	mv static/include/memblock.h debian/liblip-dev/usr/include/lip
 	chmod +r debian/liblip-dev/usr/include/lip/*
 
-	cp -p debian/copyright debian/liblip2/usr/share/doc/liblip2
-	cp -p debian/changelog debian/liblip2/usr/share/doc/liblip2/changelog.Debian
-	cp -p docs/* debian/liblip2/usr/share/doc/liblip2/
-	cp -p examples/example* debian/liblip2/usr/share/doc/liblip2/examples
-	cp -p examples/Makefile debian/liblip2/usr/share/doc/liblip2/examples
-	cd debian/liblip2/usr/share/doc/liblip2 && gzip -9n changelog.Debian examples/*
-
-	ln -s liblip2 debian/liblip-dev/usr/share/doc/liblip-dev
-
-	dpkg-shlibdeps debian/liblip2/usr/lib/lip/*
-	dpkg-gencontrol -isp -pliblip2 -Pdebian/liblip2
-	cd debian/liblip2 && find * -type f ! -regex "DEBIAN/.*" -print0 |\
+	cp -p debian/copyright debian/liblip2t64/usr/share/doc/liblip2t64
+	cp -p debian/changelog debian/liblip2t64/usr/share/doc/liblip2t64/changelog.Debian
+	cp -p docs/* debian/liblip2t64/usr/share/doc/liblip2t64/
+	cp -p examples/example* debian/liblip2t64/usr/share/doc/liblip2t64/examples
+	cp -p examples/Makefile debian/liblip2t64/usr/share/doc/liblip2t64/examples
+	cd debian/liblip2t64/usr/share/doc/liblip2t64 && gzip -9n changelog.Debian examples/*
+
+	ln -s liblip2t64 debian/liblip-dev/usr/share/doc/liblip-dev
+
+	dpkg-shlibdeps debian/liblip2t64/usr/lib/lip/*
+	dpkg-gencontrol -isp -pliblip2t64 -Pdebian/liblip2t64
+	cd debian/liblip2t64 && find * -type f ! -regex "DEBIAN/.*" -print0 |\
 	LC_ALL=C sort -z | xargs -0r md5sum > DEBIAN/md5sums
-	chown -R root.root debian/liblip2
-	chmod -x debian/liblip2/usr/lib/lip/*
-	chmod -R go=rX debian/liblip2
-	dpkg --build debian/liblip2 ..
+	chown -R root.root debian/liblip2t64
+	chmod -x debian/liblip2t64/usr/lib/lip/*
+	chmod -R go=rX debian/liblip2t64
+	dpkg --build debian/liblip2t64 ..
 
 	dpkg-gencontrol -isp -pliblip-dev -Pdebian/liblip-dev
 	cd debian/liblip-dev && find * -type f ! -regex "DEBIAN/.*" -print0 |\

Reply to: