[libsigrokdecode] 02/08: Import Debian changes 0.3.0-1
Zoltan Gyarmati
zgyarmati-guest at moszumanska.debian.org
Wed Mar 29 21:40:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
zgyarmati-guest pushed a commit to branch master
in repository libsigrokdecode.
commit 6cba9f09131cb16b03a140c7f2d1aa1a4f92d8bf
Author: Uwe Hermann <uwe at debian.org>
Date: Sat May 24 16:41:10 2014 +0200
Import Debian changes 0.3.0-1
libsigrokdecode (0.3.0-1) unstable; urgency=medium
* New upstream release.
+ The Python dependency is now on >= 3.2.
+ Change the package name from libsigrokdecode1 to libsigrokdecode2
due to an upstream SO name change.
* Switch from cdbs to debhelper.
* Add multiarch support:
+ Bump build-depend on debhelper (>= 9).
+ Add "Pre-Depends: ${misc:Pre-Depends}" to the lib package.
+ debian/compat: Bump version to 9.
+ Adapt the paths in *.install files.
+ Add "Multi-Arch: same" to the lib and -dev package.
+ This should also fix issues on e.g. MIPS systems (Closes: #723452).
Thanks YunQiang Su <wzssyqa at gmail.com> for the report!
* Standards-Version: 3.9.5 (no changes required).
* debian/control: Update to 'X-Python3-Version: >= 3.2'.
* Use dh-autoreconf instead of autotools-dev in order to fix FTBFS on
(e.g.) ppc64el (Closes: #744062). Thanks Logan Rosen <logan at ubuntu.com>!
* Add/update patches: 10_decodersdir.patch, 20_no_pdtests.patch.
libsigrokdecode (0.2.0-2) unstable; urgency=low
* Fixed upload for 0.2.0-1 (which never left the NEW queue).
* The upstream SONAME bumped to 1, so change the lib package name to
libsigrokdecode1. However, only use one libsigrokdecode-dev always, i.e.
don't encode the SONAME in the -dev package name (as per FTP Master
recommendation). Since the old name was libsigrokdecode0-dev, add a
transitional package to nicely handle the transition.
libsigrokdecode (0.2.0-1) unstable; urgency=low
* New upstream release.
+ Bump version of libglib2.0-dev build-dep to >= 2.24.0.
+ API and ABI changed, so change package name to libsigrokdecode1*.
+ Decoders are installed to /usr/share/libsigrokdecode1 (dirname
includes SONAME) to avoid "identical file in multiple packages"
issues when upgrading.
* Standards-Version: 3.9.4 (no changes required).
* Add missing dependency on Python 3 (Closes: #709406).
- Use ${python3:Depends} as dependency of libsigrokdecode1.
- Add X-Python-Version: >= 3.0.
- Versioned build-dep on cdbs (>= 0.4.90~) for dh_python2 support.
* debian/watch: Update to new download URLs.
libsigrokdecode (0.1.0-2) unstable; urgency=low
* libsigrokdecode0-dev: Add missing dependencies on -dev libs.
libsigrokdecode (0.1.0-1) unstable; urgency=low
* Initial release (Closes: #669071).
---
debian/changelog | 62 +++++++++++++++++++++++++++++
debian/compat | 1 +
debian/control | 47 ++++++++++++++++++++++
debian/copyright | 79 +++++++++++++++++++++++++++++++++++++
debian/libsigrokdecode-dev.dirs | 2 +
debian/libsigrokdecode-dev.install | 4 ++
debian/libsigrokdecode2.dirs | 1 +
debian/libsigrokdecode2.install | 2 +
debian/patches/10_decodersdir.patch | 18 +++++++++
debian/patches/20_no_pdtests.patch | 15 +++++++
debian/patches/series | 2 +
debian/rules | 14 +++++++
debian/source/format | 1 +
debian/watch | 2 +
14 files changed, 250 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..d44bcd1
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,62 @@
+libsigrokdecode (0.3.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ + The Python dependency is now on >= 3.2.
+ + Change the package name from libsigrokdecode1 to libsigrokdecode2
+ due to an upstream SO name change.
+ * Switch from cdbs to debhelper.
+ * Add multiarch support:
+ + Bump build-depend on debhelper (>= 9).
+ + Add "Pre-Depends: ${misc:Pre-Depends}" to the lib package.
+ + debian/compat: Bump version to 9.
+ + Adapt the paths in *.install files.
+ + Add "Multi-Arch: same" to the lib and -dev package.
+ + This should also fix issues on e.g. MIPS systems (Closes: #723452).
+ Thanks YunQiang Su <wzssyqa at gmail.com> for the report!
+ * Standards-Version: 3.9.5 (no changes required).
+ * debian/control: Update to 'X-Python3-Version: >= 3.2'.
+ * Use dh-autoreconf instead of autotools-dev in order to fix FTBFS on
+ (e.g.) ppc64el (Closes: #744062). Thanks Logan Rosen <logan at ubuntu.com>!
+ * Add/update patches: 10_decodersdir.patch, 20_no_pdtests.patch.
+
+ -- Uwe Hermann <uwe at debian.org> Sat, 24 May 2014 16:41:10 +0200
+
+libsigrokdecode (0.2.0-2) unstable; urgency=low
+
+ * Fixed upload for 0.2.0-1 (which never left the NEW queue).
+ * The upstream SONAME bumped to 1, so change the lib package name to
+ libsigrokdecode1. However, only use one libsigrokdecode-dev always, i.e.
+ don't encode the SONAME in the -dev package name (as per FTP Master
+ recommendation). Since the old name was libsigrokdecode0-dev, add a
+ transitional package to nicely handle the transition.
+
+ -- Uwe Hermann <uwe at debian.org> Mon, 26 Aug 2013 08:51:54 +0200
+
+libsigrokdecode (0.2.0-1) unstable; urgency=low
+
+ * New upstream release.
+ + Bump version of libglib2.0-dev build-dep to >= 2.24.0.
+ + API and ABI changed, so change package name to libsigrokdecode1*.
+ + Decoders are installed to /usr/share/libsigrokdecode1 (dirname
+ includes SONAME) to avoid "identical file in multiple packages"
+ issues when upgrading.
+ * Standards-Version: 3.9.4 (no changes required).
+ * Add missing dependency on Python 3 (Closes: #709406).
+ - Use ${python3:Depends} as dependency of libsigrokdecode1.
+ - Add X-Python-Version: >= 3.0.
+ - Versioned build-dep on cdbs (>= 0.4.90~) for dh_python2 support.
+ * debian/watch: Update to new download URLs.
+
+ -- Uwe Hermann <uwe at debian.org> Tue, 28 May 2013 17:51:55 +0200
+
+libsigrokdecode (0.1.0-2) unstable; urgency=low
+
+ * libsigrokdecode0-dev: Add missing dependencies on -dev libs.
+
+ -- Uwe Hermann <uwe at debian.org> Wed, 23 May 2012 13:47:21 +0200
+
+libsigrokdecode (0.1.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #669071).
+
+ -- Uwe Hermann <uwe at debian.org> Sun, 13 May 2012 14:47:05 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..0ebdac7
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,47 @@
+Source: libsigrokdecode
+Priority: extra
+Maintainer: Uwe Hermann <uwe at debian.org>
+Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config (>= 0.22), libglib2.0-dev (>= 2.24.0), python3-dev (>= 3.2)
+Standards-Version: 3.9.5
+Section: libs
+X-Python3-Version: >= 3.2
+Homepage: http://sigrok.org/wiki/Libsigrokdecode
+
+Package: libsigrokdecode-dev
+Section: libdevel
+Conflicts: libsigrokdecode-dev (<< 0.2.0-2), libsigrokdecode0-dev (<< 0.2.0-2)
+Replaces: libsigrokdecode0-dev
+Architecture: any
+Multi-Arch: same
+Depends: libsigrokdecode2 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev (>= 2.24.0), python3-dev (>= 3.2)
+Description: sigrok protocol decoding library - development files
+ libsigrokdecode is a shared library which provides (streaming) protocol
+ decoding functionality.
+ .
+ The protocol decoders are written in Python (>= 3.2).
+ .
+ This package contains the header files and other development files.
+
+Package: libsigrokdecode2
+Section: libs
+Conflicts: libsigrokdecode0 (<< 0.2.0-2)
+Replaces: libsigrokdecode0 (<< 0.2.0-2)
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
+Description: sigrok protocol decoding library - shared library
+ libsigrokdecode is a shared library which provides (streaming) protocol
+ decoding functionality.
+ .
+ The protocol decoders are written in Python (>= 3.2).
+ .
+ This package contains the shared library and the protocol decoders.
+
+Package: libsigrokdecode0-dev
+Section: oldlibs
+Architecture: all
+Depends: libsigrokdecode-dev (>= 0.2.0-2), ${misc:Depends}
+Description: sigrok protocol decoding library (transitional dummy package)
+ This is a dummy transitional package that can be safely removed if no
+ packages depend on it.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..25d1cc9
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,79 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: libsigrokdecode
+Upstream-Contact: <sigrok-devel at lists.sourceforge.net>
+Source: http://sigrok.org/download/source/libsigrokdecode
+
+Files: *
+Copyright: 2010 Uwe Hermann <uwe at hermann-uwe.de>
+ 2012 Bert Vermeulen <bert at biot.com>
+License: GPL-3.0+
+
+Files: exception.c module_sigrokdecode.c type_decoder.c type_logic.c
+Copyright: 2012 Bert Vermeulen <bert at biot.com>
+License: GPL-3.0+
+
+Files: log.c version.c
+Copyright: 2011-2012 Uwe Hermann <uwe at hermann-uwe.de>
+License: GPL-2.0+
+
+Files: sigrokdecode-internal.h
+Copyright: 2011 Uwe Hermann <uwe at hermann-uwe.de>
+ 2012 Bert Vermeulen <bert at biot.com>
+License: GPL-2.0+
+
+Files: decoders/*
+Copyright: 2010-2012 Uwe Hermann <uwe at hermann-uwe.de>
+License: GPL-2.0+
+
+Files: decoders/i2s/*
+Copyright: 2012 Joel Holdsworth <joel at airwebreathe.org.uk>
+License: GPL-2.0+
+
+Files: decoders/spi/spi.py decoders/usb/usb.py
+Copyright: 2011 Gareth McMullin <gareth at blacksphere.co.nz>
+ 2012 Uwe Hermann <uwe at hermann-uwe.de>
+License: GPL-2.0+
+
+Files: decoders/edid/* decoders/i2cfilter/*
+Copyright: 2012 Bert Vermeulen <bert at biot.com>
+License: GPL-3.0+
+
+Files: debian/*
+Copyright: 2012 Uwe Hermann <uwe at debian.org>
+License: GPL-2.0+
+
+License: GPL-2.0+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: GPL-3.0+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
diff --git a/debian/libsigrokdecode-dev.dirs b/debian/libsigrokdecode-dev.dirs
new file mode 100644
index 0000000..4418816
--- /dev/null
+++ b/debian/libsigrokdecode-dev.dirs
@@ -0,0 +1,2 @@
+usr/lib
+usr/include
diff --git a/debian/libsigrokdecode-dev.install b/debian/libsigrokdecode-dev.install
new file mode 100644
index 0000000..76f28fa
--- /dev/null
+++ b/debian/libsigrokdecode-dev.install
@@ -0,0 +1,4 @@
+usr/include/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/libsigrokdecode2.dirs b/debian/libsigrokdecode2.dirs
new file mode 100644
index 0000000..6845771
--- /dev/null
+++ b/debian/libsigrokdecode2.dirs
@@ -0,0 +1 @@
+usr/lib
diff --git a/debian/libsigrokdecode2.install b/debian/libsigrokdecode2.install
new file mode 100644
index 0000000..3b64df4
--- /dev/null
+++ b/debian/libsigrokdecode2.install
@@ -0,0 +1,2 @@
+usr/lib/*/lib*.so.*
+usr/share
diff --git a/debian/patches/10_decodersdir.patch b/debian/patches/10_decodersdir.patch
new file mode 100644
index 0000000..41e1c3d
--- /dev/null
+++ b/debian/patches/10_decodersdir.patch
@@ -0,0 +1,18 @@
+# The decoders directory must always match the package name + SONAME (e.g.
+# libsigrokdecode1, libsigrokdecode2, and so on).
+# This is needed in order to avoid problems with identical files in multiple
+# packages, e.g. when upgrading from libsigrokdecode1 to libsigrokdecode2.
+
+Index: a/configure.ac
+===================================================================
+--- a/configure.ac 2014-05-24 18:25:00.696985195 +0200
++++ b/configure.ac 2014-05-24 18:25:10.877000181 +0200
+@@ -143,7 +143,7 @@
+ # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
+ AC_CHECK_HEADER([sys/resource.h], [], [build_runtc="no"])
+
+-AC_SUBST(DECODERS_DIR, "$datadir/libsigrokdecode/decoders")
++AC_SUBST(DECODERS_DIR, "$datadir/libsigrokdecode2/decoders")
+ AC_SUBST(MAKEFLAGS, '--no-print-directory')
+ AC_SUBST(AM_LIBTOOLFLAGS, '--silent')
+
diff --git a/debian/patches/20_no_pdtests.patch b/debian/patches/20_no_pdtests.patch
new file mode 100644
index 0000000..7526e2e
--- /dev/null
+++ b/debian/patches/20_no_pdtests.patch
@@ -0,0 +1,15 @@
+# Don't build/run PD tests.
+
+Index: a/configure.ac
+===================================================================
+--- a/configure.ac 2014-05-24 18:32:46.149671334 +0200
++++ b/configure.ac 2014-05-24 18:47:41.446823725 +0200
+@@ -139,6 +139,8 @@
+ AC_SUBST([LIBSIGROK_CFLAGS])
+ AC_SUBST([LIBSIGROK_LIBS])
+
++build_runtc="no"
++
+ # Checks for header files.
+ # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
+ AC_CHECK_HEADER([sys/resource.h], [], [build_runtc="no"])
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0a98e05
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10_decodersdir.patch
+20_no_pdtests.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..e3fcec3
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+# export DH_VERBOSE=1
+
+# Reduce the number of unneeded dependencies with --as-needed.
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+%:
+ dh $@ --with autoreconf,python3 --parallel
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf decoders/**/__pycache__
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..b2ad197
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sigrok.org/download/source/libsigrokdecode libsigrokdecode-(.*)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libsigrokdecode.git
More information about the debian-science-commits
mailing list