Merging debian version 3.6-3.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

12 files changed, 31 insertions, 18 deletions

diff --git a/debian/.gitignore b/debian/.gitignore
deleted file mode 100644
index 2c8afeb..0000000
--- a/debian/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/files
diff --git a/debian/changelog b/debian/changelog
index e8e3314..2ddc496 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+parted (3.6-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063216
+
+ -- Benjamin Drung <bdrung@debian.org>  Thu, 29 Feb 2024 19:58:31 +0000
+
 parted (3.6-3~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index 68f8504..e788a35 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/parted
 XSBC-Original-Vcs-Browser: https://salsa.debian.org/parted-team/parted
 XSBC-Original-Vcs-Git: https://salsa.debian.org/parted-team/parted.git
 Homepage: https://www.gnu.org/software/parted
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  debhelper-compat (= 13),
  libncurses-dev | libncurses5-dev,
  libreadline-dev | libreadline6-dev,
@@ -31,7 +31,7 @@ Rules-Requires-Root: no
 
 Package: parted
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libparted2 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libparted2t64 (= ${binary:Version})
 Suggests: parted-doc
 Conflicts: parted-doc (<< 3.5-2~)
 Multi-Arch: foreign
@@ -65,13 +65,15 @@ XB-Installer-Menu-Item: 99999
 Depends: ${shlibs:Depends}, libparted2-udeb (= ${binary:Version}), ${misc:Depends}
 Description: Manually partition a hard drive (parted)
 
-Package: libparted2
+Package: libparted2t64
+Replaces: libparted2
+Breaks: libparted2 (<< ${source:Version})
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, dmidecode [amd64 i386]
 Suggests: parted, libparted-dev, libparted-i18n (= ${source:Version})
-Provides: libparted
+Provides: ${t64:Provides}, libparted
 Multi-Arch: same
 Description: disk partition manipulator - shared library
  GNU Parted is a program that allows you to create, destroy, resize,
@@ -81,11 +83,14 @@ Description: disk partition manipulator - shared library
  .
  This package contains the shared library.
 
-Package: libparted-fs-resize0
+Package: libparted-fs-resize0t64
+Provides: ${t64:Provides}
+Replaces: libparted-fs-resize0
+Breaks: libparted-fs-resize0 (<< ${source:Version})
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, libparted2 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libparted2t64 (= ${binary:Version})
 Suggests: libparted-dev
 Multi-Arch: same
 Description: disk partition manipulator - shared FS resizing library
@@ -128,7 +133,7 @@ Description: disk partition manipulator - FS resizing library udeb
 Package: libparted-i18n
 Architecture: all
 Section: localization
-Depends: libparted2, ${misc:Depends}
+Depends: libparted2t64, ${misc:Depends}
 Description: disk partition manipulator - i18n support
  GNU Parted is a program that allows you to create, destroy, resize,
  move, and copy disk partitions. This is useful for creating space
@@ -140,7 +145,7 @@ Description: disk partition manipulator - i18n support
 Package: libparted-dev
 Architecture: any
 Section: libdevel
-Depends: libc6-dev, libparted2 (= ${binary:Version}), libparted-fs-resize0 (= ${binary:Version}), libdevmapper-dev [linux-any], uuid-dev, libblkid-dev, ${misc:Depends}
+Depends: libc6-dev, libparted2t64 (= ${binary:Version}), libparted-fs-resize0t64 (= ${binary:Version}), libdevmapper-dev [linux-any], uuid-dev, libblkid-dev, ${misc:Depends}
 Suggests: parted (= ${binary:Version}), parted-doc
 Multi-Arch: same
 Description: disk partition manipulator - development files
diff --git a/debian/libparted-fs-resize0.install b/debian/libparted-fs-resize0t64.install
index 5101a40..5101a40 100644
--- a/debian/libparted-fs-resize0.install
+++ b/debian/libparted-fs-resize0t64.install
diff --git a/debian/libparted-fs-resize0t64.lintian-overrides b/debian/libparted-fs-resize0t64.lintian-overrides
new file mode 100644
index 0000000..b9118f6
--- /dev/null
+++ b/debian/libparted-fs-resize0t64.lintian-overrides
@@ -0,0 +1 @@
+libparted-fs-resize0t64: package-name-doesnt-match-sonames libparted-fs-resize0
diff --git a/debian/libparted-fs-resize0.maintscript b/debian/libparted-fs-resize0t64.maintscript
index 33226c0..33226c0 100644
--- a/debian/libparted-fs-resize0.maintscript
+++ b/debian/libparted-fs-resize0t64.maintscript
diff --git a/debian/libparted-fs-resize0.symbols b/debian/libparted-fs-resize0t64.symbols
index ef4987e..9bd9c3c 100644
--- a/debian/libparted-fs-resize0.symbols
+++ b/debian/libparted-fs-resize0t64.symbols
@@ -1,4 +1,4 @@
-libparted-fs-resize.so.0 libparted-fs-resize0 #MINVER#
+libparted-fs-resize.so.0 libparted-fs-resize0t64 #MINVER#
 * Build-Depends-Package: libparted-dev
  LIBPARTED_FS_RESIZE_0.0.0@LIBPARTED_FS_RESIZE_0.0.0 3.1
  ped_file_system_close@LIBPARTED_FS_RESIZE_0.0.0 3.1
diff --git a/debian/libparted2.docs b/debian/libparted2t64.docs
index edc0071..edc0071 100644
--- a/debian/libparted2.docs
+++ b/debian/libparted2t64.docs
diff --git a/debian/libparted2.install b/debian/libparted2t64.install
index c104532..c104532 100644
--- a/debian/libparted2.install
+++ b/debian/libparted2t64.install
diff --git a/debian/libparted2t64.lintian-overrides b/debian/libparted2t64.lintian-overrides
new file mode 100644
index 0000000..fd304c7
--- /dev/null
+++ b/debian/libparted2t64.lintian-overrides
@@ -0,0 +1 @@
+libparted2t64: package-name-doesnt-match-sonames libparted2
diff --git a/debian/libparted2.symbols b/debian/libparted2t64.symbols
index 27eea22..b6fb380 100644
--- a/debian/libparted2.symbols
+++ b/debian/libparted2t64.symbols
@@ -1,4 +1,4 @@
-libparted.so.2 libparted2 #MINVER#
+libparted.so.2 libparted2t64 #MINVER#
 * Build-Depends-Package: libparted-dev
  ped_alignment_align_down@Base 3.1
  ped_alignment_align_nearest@Base 3.1
diff --git a/debian/rules b/debian/rules
index de1fd95..ceb2064 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,18 +69,18 @@ override_dh_install:
 	dh_install -pparted-udeb -plibparted2-udeb -plibparted-fs-resize0-udeb --sourcedir=debian/tmp-udeb
 
 override_dh_installdocs-arch:
-	dh_installdocs --link-doc=libparted2
+	dh_installdocs --link-doc=libparted2t64
 
 override_dh_installdocs-indep:
-	dh_installdocs -pparted-doc --doc-main-package=libparted2
+	dh_installdocs -pparted-doc --doc-main-package=libparted2t64
 	dh_installdocs --remaining-packages
 
 override_dh_strip:
-	dh_strip -plibparted2 --ddeb-migration='libparted2-dbg (<< 3.2-11~)'
-	dh_strip -plibparted-fs-resize0 \
+	dh_strip -plibparted2t64 --ddeb-migration='libparted2-dbg (<< 3.2-11~)'
+	dh_strip -plibparted-fs-resize0t64 \
 		--ddeb-migration='libparted-fs-resize0-dbg (<< 3.2-11~)'
-	dh_strip -Nlibparted2 -Nlibparted-fs-resize0
+	dh_strip -Nlibparted2t64 -Nlibparted-fs-resize0t64
 
 override_dh_makeshlibs:
-	dh_makeshlibs -plibparted2 --add-udeb=libparted2-udeb -- -c4
-	dh_makeshlibs -plibparted-fs-resize0 --add-udeb=libparted-fs-resize0-udeb -- -c4
+	dh_makeshlibs -plibparted2t64 --add-udeb=libparted2-udeb -- -c4
+	dh_makeshlibs -plibparted-fs-resize0t64 --add-udeb=libparted-fs-resize0-udeb -- -c4