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

Carlos De Maine null at kde.org
Mon Jan 16 23:12:47 GMT 2023


Git commit 8a8808627dc9465ea012d645e7ec8b3de53135f9 by Carlos De Maine.
Committed on 16/01/2023 at 23:12.
Pushed by carlosdem into branch 'Neon/unstable'.

manual merge

D  +0    -4    debian/.debhelper/generated/libzxingcore-dev/installed-by-dh_install
D  +0    -3    debian/.debhelper/generated/libzxingcore-dev/installed-by-dh_installdocs
D  +0    -2    debian/.debhelper/generated/libzxingcore1/installed-by-dh_install
D  +0    -3    debian/.debhelper/generated/libzxingcore1/installed-by-dh_installdocs
D  +0    -2    debian/.debhelper/generated/libzxingcore1/triggers
D  +0    -1    debian/.debhelper/libzxingcore1/dbgsym-build-ids
D  +0    -14   debian/.debhelper/libzxingcore1/dbgsym-root/DEBIAN/control
D  +0    -1    debian/.debhelper/libzxingcore1/dbgsym-root/DEBIAN/md5sums
D  +-    --    debian/.debhelper/libzxingcore1/dbgsym-root/usr/lib/debug/.build-id/b6/29b9dba7f85e4daa6ed45a5eae952bfff0dcfb.debug
D  +0    -1    debian/.debhelper/libzxingcore1/dbgsym-root/usr/share/doc/libzxingcore1-dbgsym
M  +48   -16   debian/copyright
R  +0    -0    debian/libzxing-dev.docs [from: debian/libzxingcore-dev.docs - 100% similarity]
R  +0    -0    debian/libzxing-dev.install [from: debian/libzxingcore-dev.install - 100% similarity]
R  +0    -0    debian/libzxing2.docs [from: debian/libzxingcore1.docs - 100% similarity]
R  +1    -1    debian/libzxing2.install [from: debian/libzxingcore1.install - 052% similarity]
A  +1    -0    debian/libzxing2.shlibs
D  +0    -1    debian/libzxingcore-dev.debhelper.log
D  +0    -2    debian/libzxingcore-dev.substvars
D  +0    -1    debian/libzxingcore1.debhelper.log
D  +0    -3    debian/libzxingcore1.substvars
R  +0    -0    debian/python3-xzing-cpp.install [from: debian/libzxingcore1.lintian-overrides - 100% similarity]
A  +1    -0    debian/python3-zxing-cpp.docs
A  +2    -0    debian/python3-zxing-cpp.examples
M  +11   -2    debian/rules

https://invent.kde.org/neon/backports-jammy/zxing-cpp-jammy/commit/8a8808627dc9465ea012d645e7ec8b3de53135f9

diff --git a/debian/.debhelper/generated/libzxingcore-dev/installed-by-dh_install b/debian/.debhelper/generated/libzxingcore-dev/installed-by-dh_install
deleted file mode 100644
index 3cd2827..0000000
--- a/debian/.debhelper/generated/libzxingcore-dev/installed-by-dh_install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/usr/include/ZXing/
-debian/tmp/usr/lib/x86_64-linux-gnu/cmake/ZXing/
-debian/tmp/usr/lib/x86_64-linux-gnu/libZXing.so
-debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/zxing.pc
diff --git a/debian/.debhelper/generated/libzxingcore-dev/installed-by-dh_installdocs b/debian/.debhelper/generated/libzxingcore-dev/installed-by-dh_installdocs
deleted file mode 100644
index a30a7e7..0000000
--- a/debian/.debhelper/generated/libzxingcore-dev/installed-by-dh_installdocs
+++ /dev/null
@@ -1,3 +0,0 @@
-./README.md
-./NOTICE
-./AUTHORS.ZXing
diff --git a/debian/.debhelper/generated/libzxingcore1/installed-by-dh_install b/debian/.debhelper/generated/libzxingcore1/installed-by-dh_install
deleted file mode 100644
index 7199ab5..0000000
--- a/debian/.debhelper/generated/libzxingcore1/installed-by-dh_install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/x86_64-linux-gnu/libZXing.so.1
-debian/tmp/usr/lib/x86_64-linux-gnu/libZXing.so.1.2.0
diff --git a/debian/.debhelper/generated/libzxingcore1/installed-by-dh_installdocs b/debian/.debhelper/generated/libzxingcore1/installed-by-dh_installdocs
deleted file mode 100644
index a30a7e7..0000000
--- a/debian/.debhelper/generated/libzxingcore1/installed-by-dh_installdocs
+++ /dev/null
@@ -1,3 +0,0 @@
-./README.md
-./NOTICE
-./AUTHORS.ZXing
diff --git a/debian/.debhelper/generated/libzxingcore1/triggers b/debian/.debhelper/generated/libzxingcore1/triggers
deleted file mode 100644
index dc601d4..0000000
--- a/debian/.debhelper/generated/libzxingcore1/triggers
+++ /dev/null
@@ -1,2 +0,0 @@
-# Triggers added by dh_makeshlibs/13.3.3ubuntu3+p20.04+tstable+git20210331.1431
-activate-noawait ldconfig
diff --git a/debian/.debhelper/libzxingcore1/dbgsym-build-ids b/debian/.debhelper/libzxingcore1/dbgsym-build-ids
deleted file mode 100644
index be02b61..0000000
--- a/debian/.debhelper/libzxingcore1/dbgsym-build-ids
+++ /dev/null
@@ -1 +0,0 @@
-b629b9dba7f85e4daa6ed45a5eae952bfff0dcfb 
\ No newline at end of file
diff --git a/debian/.debhelper/libzxingcore1/dbgsym-root/DEBIAN/control b/debian/.debhelper/libzxingcore1/dbgsym-root/DEBIAN/control
deleted file mode 100644
index 072825c..0000000
--- a/debian/.debhelper/libzxingcore1/dbgsym-root/DEBIAN/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Package: libzxingcore1-dbgsym
-Package-Type: ddeb
-Source: zxing-cpp
-Version: 1.2.0-1
-Auto-Built-Package: debug-symbols
-Architecture: amd64
-Maintainer: Boyuan Yang <byang at debian.org>
-Installed-Size: 4198
-Depends: libzxingcore1 (= 1.2.0-1)
-Section: debug
-Priority: optional
-Multi-Arch: same
-Description: debug symbols for libzxingcore1
-Build-Ids: b629b9dba7f85e4daa6ed45a5eae952bfff0dcfb
diff --git a/debian/.debhelper/libzxingcore1/dbgsym-root/DEBIAN/md5sums b/debian/.debhelper/libzxingcore1/dbgsym-root/DEBIAN/md5sums
deleted file mode 100644
index 9a62da6..0000000
--- a/debian/.debhelper/libzxingcore1/dbgsym-root/DEBIAN/md5sums
+++ /dev/null
@@ -1 +0,0 @@
-18d6ef06ae72d224f1964768c1a2acbc  usr/lib/debug/.build-id/b6/29b9dba7f85e4daa6ed45a5eae952bfff0dcfb.debug
diff --git a/debian/.debhelper/libzxingcore1/dbgsym-root/usr/lib/debug/.build-id/b6/29b9dba7f85e4daa6ed45a5eae952bfff0dcfb.debug b/debian/.debhelper/libzxingcore1/dbgsym-root/usr/lib/debug/.build-id/b6/29b9dba7f85e4daa6ed45a5eae952bfff0dcfb.debug
deleted file mode 100644
index dd879db..0000000
Binary files a/debian/.debhelper/libzxingcore1/dbgsym-root/usr/lib/debug/.build-id/b6/29b9dba7f85e4daa6ed45a5eae952bfff0dcfb.debug and /dev/null differ
diff --git a/debian/.debhelper/libzxingcore1/dbgsym-root/usr/share/doc/libzxingcore1-dbgsym b/debian/.debhelper/libzxingcore1/dbgsym-root/usr/share/doc/libzxingcore1-dbgsym
deleted file mode 120000
index eb19e24..0000000
--- a/debian/.debhelper/libzxingcore1/dbgsym-root/usr/share/doc/libzxingcore1-dbgsym
+++ /dev/null
@@ -1 +0,0 @@
-libzxingcore1
\ No newline at end of file
diff --git a/debian/copyright b/debian/copyright
index e56fe8d..2742047 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,40 +9,53 @@ Files-Excluded:
 Files: *
 Copyright:
  2007-2016 ZXing authors
- 2019 Nu-book Inc.
+ 2019-2022 Nu-book Inc.
 License: Apache-2.0
 Comment:
  The full ZXing authors list can be found in the AUTHORS.ZXing file as
  distributed in the docs.
 
 Files: debian/*
-Copyright: 2020, Boyuan Yang <byang at debian.org>
+Copyright: 2020-2022, Boyuan Yang <byang at debian.org>
 License: CC0-1.0
 
 Files: core/*
 Copyright:
  2016 ZXing authors
- 2016-2019 Nu-book Inc.
+ 2016-2021 Nu-book Inc.
+ 2017-2022 Axel Waggershauser
+ 2016 Huy Cuong Nguyen
+ 2006 Jeremias Maerki
 License: Apache-2.0
 
-Files: examples/*
+Files: example/*
 Copyright:
  2016 Nu-book Inc.
+ 2020-2022 Axel Waggershauser
 License: Apache-2.0
 
-Files: wrappers/android/java/com/zxing/BarcodeFormat.java
-Copyright: 2007 ZXing authors
+Files:
+ test/blackbox/*
+Copyright:
+ 2016 Nu-book Inc.
+ 2019 Axel Waggershauser
 License: Apache-2.0
 
-Files: wrappers/android/java/com/zxing/BarcodeReader.java
-       wrappers/android/jni/*
-       wrappers/gdiplus/*
-Copyright: 2016 Nu-book Inc.
+Files:
+ test/unit/*
+Copyright:
+ 2016 Jeremias Maerki
+ 2017-2022 Axel Waggershauser
+ 2017 Huy Cuong Nguyen
+ 2008-2017 ZXing authors
+ 2021-2022 gitlost
 License: Apache-2.0
 
-Files: wrappers/gdiplus/BarcodeGenerator.*
-Copyright: 2017 Huy Cuong Nguyen
-License: Apache-2.0
+Files:
+ wrappers/wasm/base64ArrayBuffer.js
+Copyright:
+ 2011 Jon Leighton
+License: Expat
 
 Files:
  core/src/textcodec/Big5TextDecoder.cpp
@@ -89,7 +102,7 @@ License: LGPL-2.1 with Qt-LGPL-exception-1.1
  2.1, the object code form of a "work that uses the Library" may incorporate
  material from a header file that is part of the Library.  You may distribute
  such object code under terms of your choice, provided that:
-     (i)   the header files of the Library have not been modified; and 
+     (i)   the header files of the Library have not been modified; and
      (ii)  the incorporated material is limited to numerical parameters, data
            structure layouts, accessors, macros, inline functions and
            templates; and
@@ -127,7 +140,7 @@ License: LGPL-3.0 with Qt-LGPL-exception-1.1
  2.1, the object code form of a "work that uses the Library" may incorporate
  material from a header file that is part of the Library.  You may distribute
  such object code under terms of your choice, provided that:
-     (i)   the header files of the Library have not been modified; and 
+     (i)   the header files of the Library have not been modified; and
      (ii)  the incorporated material is limited to numerical parameters, data
            structure layouts, accessors, macros, inline functions and
            templates; and
@@ -150,4 +163,23 @@ License: CC0-1.0
 
 License: Apache-2.0
  On Debian systems, the complete text of the Apache License Version 2.0
- can be found in "/usr/share/common-licenses/Apache-2.0".
\ No newline at end of file
+ can be found in "/usr/share/common-licenses/Apache-2.0".
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/debian/libzxingcore-dev.docs b/debian/libzxing-dev.docs
similarity index 100%
rename from debian/libzxingcore-dev.docs
rename to debian/libzxing-dev.docs
diff --git a/debian/libzxingcore-dev.install b/debian/libzxing-dev.install
similarity index 100%
rename from debian/libzxingcore-dev.install
rename to debian/libzxing-dev.install
diff --git a/debian/libzxingcore1.docs b/debian/libzxing2.docs
similarity index 100%
rename from debian/libzxingcore1.docs
rename to debian/libzxing2.docs
diff --git a/debian/libzxingcore1.install b/debian/libzxing2.install
similarity index 52%
rename from debian/libzxingcore1.install
rename to debian/libzxing2.install
index 4c630f8..fac1ca1 100644
--- a/debian/libzxingcore1.install
+++ b/debian/libzxing2.install
@@ -1,2 +1,2 @@
-usr/lib/*/libZXing.so.1
+usr/lib/*/libZXing.so.2
 usr/lib/*/libZXing.so.1.*
diff --git a/debian/libzxing2.shlibs b/debian/libzxing2.shlibs
new file mode 100644
index 0000000..4329de5
--- /dev/null
+++ b/debian/libzxing2.shlibs
@@ -0,0 +1 @@
+libZXing 2 libzxing2 (>= 1.4.0)
diff --git a/debian/libzxingcore-dev.debhelper.log b/debian/libzxingcore-dev.debhelper.log
deleted file mode 100644
index 6991c52..0000000
--- a/debian/libzxingcore-dev.debhelper.log
+++ /dev/null
@@ -1 +0,0 @@
-dh_auto_configure
diff --git a/debian/libzxingcore-dev.substvars b/debian/libzxingcore-dev.substvars
deleted file mode 100644
index 978fc8b..0000000
--- a/debian/libzxingcore-dev.substvars
+++ /dev/null
@@ -1,2 +0,0 @@
-misc:Depends=
-misc:Pre-Depends=
diff --git a/debian/libzxingcore1.debhelper.log b/debian/libzxingcore1.debhelper.log
deleted file mode 100644
index 6991c52..0000000
--- a/debian/libzxingcore1.debhelper.log
+++ /dev/null
@@ -1 +0,0 @@
-dh_auto_configure
diff --git a/debian/libzxingcore1.substvars b/debian/libzxingcore1.substvars
deleted file mode 100644
index 4e672bc..0000000
--- a/debian/libzxingcore1.substvars
+++ /dev/null
@@ -1,3 +0,0 @@
-shlibs:Depends=libc6 (>= 2.14), libgcc-s1 (>= 3.4), libstdc++6 (>= 5.2)
-misc:Depends=
-misc:Pre-Depends=
diff --git a/debian/libzxingcore1.lintian-overrides b/debian/python3-xzing-cpp.install
similarity index 100%
rename from debian/libzxingcore1.lintian-overrides
rename to debian/python3-xzing-cpp.install
diff --git a/debian/python3-zxing-cpp.docs b/debian/python3-zxing-cpp.docs
new file mode 100644
index 0000000..961136a
--- /dev/null
+++ b/debian/python3-zxing-cpp.docs
@@ -0,0 +1 @@
+usr/lib/*/zxingcpp.cpython-*.so usr/lib/python3/dist-packages/
diff --git a/debian/python3-zxing-cpp.examples b/debian/python3-zxing-cpp.examples
new file mode 100644
index 0000000..4a63e0e
--- /dev/null
+++ b/debian/python3-zxing-cpp.examples
@@ -0,0 +1,2 @@
+wrappers/python/demo_reader.py
+wrappers/python/demo_writer.py
diff --git a/debian/rules b/debian/rules
index 06d9e91..18792db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,17 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export QT_SELECT := 5
 
 %:
-	dh $@
+	dh $@ --with python3
 
+# Disabled flags:
+#
+# BLACKBOX_TESTS: see #1004653
+# UNIT_TESTS: requires tests/samples/* files with unclear license
+# PYTHON_EXECUTABLE: force select default python version
 override_dh_auto_configure:
 	dh_auto_configure -- \
-	        -DBUILD_BLACKBOX_TESTS=OFF   # requires internet connection
+	        -DBUILD_BLACKBOX_TESTS=ON  \
+	        -DBUILD_UNIT_TESTS=OFF     \
+	        -DBUILD_PYTHON_MODULE=ON   \
+	        -DBUILD_SYSTEM_DEPS=ALWAYS \
+	        -DPYTHON_EXECUTABLE:FILEPATH=$(shell command -v $$(py3versions -d))


More information about the Neon-commits mailing list