[Pkg-electronics-commits] [sigrok] 03/09: 0.2-1 upload

Jonathan McDowell noodles at moszumanska.debian.org
Wed Sep 20 08:46:41 UTC 2017 

This is an automated email from the git hooks/post-receive script.

noodles pushed a commit to branch master
in repository sigrok.

commit 4ca2818fc3c3414f73a6668f72bf22bb59d2bce0
Author: Uwe Hermann <uwe at debian.org>
Date:   Wed May 23 14:07:17 2012 +0200

    0.2-1 upload
---
 debian/changelog |  8 +++++++
 debian/control   | 26 ++++++-----------------
 debian/copyright | 65 +++-----------------------------------------------------
 debian/menu      |  2 --
 debian/rules     | 11 ----------
 debian/watch     |  3 +--
 6 files changed, 18 insertions(+), 97 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 009be02..5d0b53a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sigrok (0.2-1) unstable; urgency=low
+
+  * The 'sigrok' package is now a metapackage, depending on (almost) all
+    sigrok related packages (Closes: #673854, #653565).
+  * Standards-Version: 3.9.3 (no changes required).
+
+ -- Uwe Hermann <uwe at debian.org>  Wed, 23 May 2012 14:07:17 +0200
+
 sigrok (0.1-1) unstable; urgency=low
 
   * Initial release (Closes: #579600).
diff --git a/debian/control b/debian/control
index 102542b..263c709 100644
--- a/debian/control
+++ b/debian/control
@@ -2,30 +2,16 @@ Source: sigrok
 Section: electronics
 Priority: extra
 Maintainer: Uwe Hermann <uwe at debian.org>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), autotools-dev, libglib2.0-dev, libusb-1.0-0-dev, libftdi-dev, libudev-dev, libzip-dev, python-dev
-Standards-Version: 3.9.1
+Build-Depends: cdbs, debhelper (>= 7.0.50~)
+Standards-Version: 3.9.3
 Homepage: http://sigrok.org
 
 Package: sigrok
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Logic analyzer and protocol decoder software
+Architecture: all
+Depends: ${misc:Depends}, sigrok-cli (>= 0.3.0-2)
+Description: Logic analyzer and protocol decoder software suite (metapackage)
  sigrok is a portable logic analyzer software that supports various
  logic analyzer hardware, input formats, output formats, and protocol decoders.
  .
- The currently supported logic analyzer are:
-  - Saleae Logic
-  - EE Electronics XLA/ESLA100
-  - ASIX SIGMA
-  - Openbench Logic Sniffer
-  - ZEROPLUS Logic Cube LAP-C series
- .
- Supported input/output formats include:
-  - Bits
-  - Hex
-  - ASCII
-  - Binary
-  - VCD
-  - Gnuplot
-  - OLS (Openbench Logic Sniffer format)
+ This is a metapackage depending on (almost) all sigrok related packages.
 
diff --git a/debian/copyright b/debian/copyright
index 63f19ea..f8baf7d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,73 +4,14 @@ This work was packaged for Debian by:
 
 It was downloaded from:
 
-    https://sourceforge.net/projects/sigrok/files/source/
+    None
 
 Upstream Authors:
 
-    Various sigrok developers
-
--------------------------------------------------------------------------------
-
-Files: *
-Copyright: © 2010-2011 Bert Vermeulen <bert at biot.com>
-License: GPL-3+
- 
-On Debian systems, the complete text of the GNU General 
-Public License can be found in `/usr/share/common-licenses/GPL-3'.
- 
--------------------------------------------------------------------------------
-
-Files: libsigrokdecode/decode.c, libsigrokdecode/sigrokdecode.h,
-       libsigrok/output/output_gnuplot.c, libsigrok/output/common.c,
-       libsigrok/output/output_ols.c, libsigrok/output/output_binary.c
-Copyright: © 2010-2011 Uwe Hermann <uwe at hermann-uwe.de>
-License: GPL-2+
- 
-On Debian systems, the complete text of the GNU General 
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
- 
--------------------------------------------------------------------------------
-
-Files: libsigrok/hardware/demo/demo.c
-Copyright: © 2010 Uwe Hermann <uwe at hermann-uwe.de>
-           © 2011 Olivier Fauchon <olivier at aixmarseille.com>
-License: GPL-2+
- 
--------------------------------------------------------------------------------
-
-Files: libsiggrok/hardware/asix-sigma/asix-sigma.[ch]
-Copyright: © 2010 Håvard Espeland <gus at ping.uio.no>
-           © 2010 Martin Stensgård <mastensg at ping.uio.no>
-           © 2010 Carl Henrik Lunde <chlunde at ping.uio.no>
-License: GPL-3+
- 
--------------------------------------------------------------------------------
-
-Files: libsigrok/hardware/zeroplus-logic-cube/analyzer.[ch],
-       libsigrok/hardware/zeroplus-logic-cube/gl_usb.[ch]
-Copyright: © 2010 Sven Peter <sven at fail0verflow.com>
-           © 2010 Haxx Enterprises <bushing at gmail.com>
-License: BSD-2-clause
- 
--------------------------------------------------------------------------------
-
-Files: libsigrok/output/output_vcd.c
-Copyright: © 2010 Bert Vermeulen <bert at biot.com>
-           © 2011 Uwe Hermann <uwe at hermann-uwe.de>
-License: GPL-2+
- 
--------------------------------------------------------------------------------
-
-Files: libsigrok/output/output_text.c
-Copyright: © 2010 Bert Vermeulen <bert at biot.com>
-           © 2011 Håvard Espeland <gus at ping.uio.no>
-License: GPL-3+
- 
--------------------------------------------------------------------------------
+    None
 
 Files: debian/*
-Copyright: © 2011 Uwe Hermann <uwe at debian.org>
+Copyright: © 2012 Uwe Hermann <uwe at debian.org>
 License: public-domain
    The packaging done by Uwe Hermann <uwe at debian.org> is hereby
    released as public domain.
diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index 75b9194..0000000
--- a/debian/menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(sigrok):needs="text|vc" section="Applications/Science/Electronics" \
-  title="sigrok" command="/usr/bin/sigrok-cli"
diff --git a/debian/rules b/debian/rules
index e0a7719..bb9c061 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-# Reduce the number of unneeded dependencies with --as-needed.
-LDFLAGS += "-Wl,--as-needed"
-
-post-patches::
-	@# Copy udev rules file into debian/ so that dh_installudev finds it.
-	cp contrib/z60_sigrok.rules debian/sigrok.udev
-
-clean::
-	rm -f debian/sigrok.udev
-
 common-binary-post-install-arch:: list-missing
 
diff --git a/debian/watch b/debian/watch
index 660d1ab..d43b70b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1 @@
-version=3
-http://sf.net/sigrok/source/sigrok-(.*)\.tar\.gz
+# No watch file needed, this is a mostly empty metapackage.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/sigrok.git

More information about the Pkg-electronics-commits mailing list