Package: protobuf
Version: 3.21.12-8.1
Severity: normal
Tags: patch  pending

Dear maintainer,

I've prepared an NMU for protobuf (versioned as 3.21.12-8.2) and
uploaded it to unstable.

Regards.


-- 
WBR, wRAR
diff -Nru protobuf-3.21.12/debian/changelog protobuf-3.21.12/debian/changelog
--- protobuf-3.21.12/debian/changelog	2024-03-01 02:15:00.000000000 +0500
+++ protobuf-3.21.12/debian/changelog	2024-03-19 22:24:42.000000000 +0500
@@ -1,3 +1,11 @@
+protobuf (3.21.12-8.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Move dh-elpa and pkg-php-tools to B-D-Indep (Closes: #1062840, #1062847).
+  * Fix /usr/share/doc/{libprotoc,libprotobuf}-dev symlinks.
+
+ -- Andrey Rakhmatullin <w...@debian.org>  Tue, 19 Mar 2024 22:24:42 +0500
+
 protobuf (3.21.12-8.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru protobuf-3.21.12/debian/control protobuf-3.21.12/debian/control
--- protobuf-3.21.12/debian/control	2024-03-01 02:15:00.000000000 +0500
+++ protobuf-3.21.12/debian/control	2024-03-19 21:32:54.000000000 +0500
@@ -5,7 +5,6 @@
 Build-Depends: dpkg-dev (>= 1.22.5),
 # Debian build system
    debhelper-compat (= 13)
- , dh-elpa [amd64 arm64 armel armhf i386 loong64 mips64el mipsel ppc64el s390x hppa ppc64 riscv64 sh4 sparc64 x32]
 # C/C++
  , zlib1g-dev
  , libgmock-dev <!nocheck>
@@ -23,16 +22,17 @@
 # Ruby
  , rake-compiler <!noruby>
  , gem2deb <!noruby>
-# PHP
- , pkg-php-tools (>= 1.7~)
 Build-Depends-Indep:
+   dh-sequence-elpa
 # Java
-   ant
+ , ant
  , default-jdk
  , javahelper
  , maven-repo-helper
  , libguava-java
  , libgoogle-gson-java
+# PHP
+ , pkg-php-tools (>= 1.7~)
 Standards-Version: 4.6.1
 Rules-Requires-Root: no
 Homepage: https://github.com/google/protobuf/
diff -Nru protobuf-3.21.12/debian/rules protobuf-3.21.12/debian/rules
--- protobuf-3.21.12/debian/rules	2023-11-08 21:59:09.000000000 +0500
+++ protobuf-3.21.12/debian/rules	2024-03-19 22:23:42.000000000 +0500
@@ -19,11 +19,7 @@
 API_VERSION=$(SONAME)-0
 
 %:
-ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 loong64 mips64el mipsel ppc64el s390x hppa ppc64 riscv64 sh4 sparc64 x32))
-	dh $@ --with autoreconf,elpa
-else
-	dh $@ --with autoreconf -Nelpa-protobuf-mode
-endif
+	dh $@
 
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 override_dh_auto_configure:
@@ -162,9 +158,9 @@
 
 	# Convert doc dir to symlink for the -dev packages
 	$(RM) -r $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev
-	ln -s libprotobuf$(SONAME) $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev
+	ln -s libprotobuf$(SONAME)t64 $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev
 	$(RM) -r $(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev
-	ln -s libprotoc$(SONAME) $(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev
+	ln -s libprotoc$(SONAME)t64 $(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev
 
 	# Remove compiler headers from libprotobuf-dev
 	$(RM) -r $(CURDIR)/debian/libprotobuf-dev/usr/include/google/protobuf/compiler

Attachment: signature.asc
Description: PGP signature

Reply via email to