[neon/backports-jammy/zxing-cpp-jammy/Neon/unstable] debian: fixing botched merge

[Carlos De Maine]

Git commit 334c4b42aaae94417cbcf952447c60d912b6c838 by Carlos De Maine.
Committed on 16/01/2023 at 21:28.
Pushed by carlosdem into branch 'Neon/unstable'.

fixing botched merge

M  +20   -5    debian/control

https://invent.kde.org/neon/backports-jammy/zxing-cpp-jammy/commit/334c4b42aaae94417cbcf952447c60d912b6c838

diff --git a/debian/control b/debian/control
index 081d785..66babea 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,18 @@ Section: libs
 Priority: optional
 Maintainer: Boyuan Yang <byang at debian.org>
 Build-Depends:
+ cmake,
  debhelper-compat (= 13),
- cmake (>= 3.10),
+ dh-sequence-python3,
+ libfmt-dev <!nocheck>,
+ libopencv-dev,
+ libstb-dev,
+ pkg-config,
+ pybind11-dev,
+ python3,
+ python3-dev,
+ python3-numpy <!nocheck>,
+ python3-pil <!nocheck>,
  qtbase5-dev,
  qtdeclarative5-dev,
  qtmultimedia5-dev,
@@ -14,12 +24,17 @@ Homepage: https://github.com/zxing-cpp/zxing-cpp
 Vcs-Git: https://salsa.debian.org/debian/zxing-cpp.git
 Vcs-Browser: https://salsa.debian.org/debian/zxing-cpp
 
-Package: libzxingcore-dev
+Package: libzxing-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends:
+ libzxing2 (= ${binary:Version}),
  ${misc:Depends},
- libzxingcore1 (= ${binary:Version}),
+Replaces:
+ libzxingcore-dev (<< 1.3.0~),
+Breaks:
+ libzxingcore-dev (<< 1.3.0~),
 Description: C++ port of ZXing library (development files)
  ZXing-C++ ("zebra crossing") is an open-source, multi-format 1D/2D
  barcode image processing library implemented in C++.
@@ -32,7 +47,7 @@ Description: C++ port of ZXing library (development files)
  .
  This package provides development files for zxing-cpp library.
 
-Package: libzxingcore1
+Package: libzxing2
 Architecture: any
 Multi-Arch: same
 Depends:
@@ -98,4 +113,4 @@ Description: Utilities provided by ZXing library
  EAN-8, EAN-13, DataBar/RSS, Code 39, Code 93, Code 128, Codabar, ITF.
  .
  This package provides various example utilities written with zxing-cpp
- library.
\ No newline at end of file
+ library.