[libsigrokdecode] 05/08: remove patches, change maintainer, rename to libsigrokdecode3

[Zoltan Gyarmati]

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

zgyarmati-guest pushed a commit to branch master
in repository libsigrokdecode.

commit c7f6d1abad0ff3496e6aeff0e43c24df9fa9b8f7
Author: Zoltan Gyarmati <Zoltan Gyarmati mr.zoltan.gyarmati at gmail.com>
Date:   Wed Mar 1 00:56:24 2017 +0100

    remove patches, change maintainer, rename to libsigrokdecode3
---
 debian/changelog                                    |  6 ++++++
 debian/control                                      | 21 ++++++---------------
 ...{libsigrokdecode2.dirs => libsigrokdecode3.dirs} |  0
 ...grokdecode2.install => libsigrokdecode3.install} |  0
 debian/patches/10_decodersdir.patch                 | 18 ------------------
 debian/patches/20_no_pdtests.patch                  | 15 ---------------
 debian/patches/series                               |  2 --
 7 files changed, 12 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d44bcd1..32fb39e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libsigrokdecode (0.4.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Zoltan Gyarmati <mr.zoltan.gyarmati at gmail.com>  Tue, 28 Feb 2017 23:10:29 +0100
+
 libsigrokdecode (0.3.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 0ebdac7..2e9682d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,15 @@
 Source: libsigrokdecode
 Priority: extra
-Maintainer: Uwe Hermann <uwe at debian.org>
+Maintainer: Zoltan Gyarmati <mr.zoltan.gyarmati at gmail.com>
 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
+Standards-Version: 3.9.8
 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)
+Conflicts: libsigrokdecode-dev (<< 0.3.0-2)
 Replaces: libsigrokdecode0-dev
 Architecture: any
 Multi-Arch: same
@@ -22,10 +22,10 @@ Description: sigrok protocol decoding library - development files
  .
  This package contains the header files and other development files.
 
-Package: libsigrokdecode2
+Package: libsigrokdecode3
 Section: libs
-Conflicts: libsigrokdecode0 (<< 0.2.0-2)
-Replaces: libsigrokdecode0 (<< 0.2.0-2)
+Conflicts: libsigrokdecode2 (<< 0.4.1-1)
+Replaces: libsigrokdecode2 (<< 0.4.1-1)
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
@@ -36,12 +36,3 @@ Description: sigrok protocol decoding library - shared library
  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/libsigrokdecode2.dirs b/debian/libsigrokdecode3.dirs
similarity index 100%
rename from debian/libsigrokdecode2.dirs
rename to debian/libsigrokdecode3.dirs
diff --git a/debian/libsigrokdecode2.install b/debian/libsigrokdecode3.install
similarity index 100%
rename from debian/libsigrokdecode2.install
rename to debian/libsigrokdecode3.install
diff --git a/debian/patches/10_decodersdir.patch b/debian/patches/10_decodersdir.patch
deleted file mode 100644
index 41e1c3d..0000000
--- a/debian/patches/10_decodersdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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
deleted file mode 100644
index 7526e2e..0000000
--- a/debian/patches/20_no_pdtests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
deleted file mode 100644
index 0a98e05..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-10_decodersdir.patch
-20_no_pdtests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libsigrokdecode.git