debian: Migrate packaging to dh

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/debian/changelog b/debian/changelog
index eb86c5f26a822acab0807c32fb33caa3b5b4d964..1902094f5f4a5e9d813cc72c354d49b0fe45e83f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ libyaml (0.1.7-1) UNRELEASED; urgency=medium
     + Fix segfault in yaml_string_write_handler.
     + Fix invalid simple key assertion.
   * Drop upstreamed patches.
+  * Migrate packaging from CDBS to dh.
+  * Drop libyaml-0-2-dbg in favor of automaticly generated
+    libyaml-0-2-dbgsym package.
 
  -- Anders Kaseorg <andersk@mit.edu>  Sat, 03 Sep 2016 06:02:36 -0400
 

diff --git a/debian/control b/debian/control
index 2a56157e0add488c7b377f2a272dec4addd9a01e..9bafea0a886c43b32d4423671a30cf389aee0dcf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,7 @@ Source: libyaml
 Section: libs
 Priority: optional
 Maintainer: Anders Kaseorg <andersk@mit.edu>
-Build-Depends: cdbs (>= 0.4.93~),
- autotools-dev,
+Build-Depends: autotools-dev,
  debhelper (>= 9~),
  dh-buildinfo (>= 0.9+nmu1~),
  dh-autoreconf
@@ -22,19 +21,6 @@ Description: Fast YAML 1.1 parser and emitter library
  LibYAML is a C library for parsing and emitting data in YAML 1.1, a
  human-readable data serialization format.
 
-Package: libyaml-0-2-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, libyaml-0-2 (= ${binary:Version})
-Description: Fast YAML 1.1 parser and emitter library (debugging symbols)
- LibYAML is a C library for parsing and emitting data in YAML 1.1, a
- human-readable data serialization format.
- .
- This package contains detached debuging symbols for the library found
- in libyaml-0-2.
-
 Package: libyaml-dev
 Section: libdevel
 Architecture: any

diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644 (file)
index 944df7b..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,55 +0,0 @@
-Source: libyaml
-Section: libs
-Priority: optional
-Maintainer: Anders Kaseorg <andersk@mit.edu>
-Build-Depends: @cdbs@
-Build-Depends-Indep: doxygen
-Standards-Version: 3.9.6
-Homepage: http://pyyaml.org/wiki/LibYAML
-Vcs-Git: git://andersk.mit.edu/libyaml.git
-Vcs-Browser: http://andersk.mit.edu/gitweb/libyaml.git
-
-Package: libyaml-0-2
-Architecture: any
-Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Description: Fast YAML 1.1 parser and emitter library
- LibYAML is a C library for parsing and emitting data in YAML 1.1, a
- human-readable data serialization format.
-
-Package: libyaml-0-2-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, libyaml-0-2 (= ${binary:Version})
-Description: Fast YAML 1.1 parser and emitter library (debugging symbols)
- LibYAML is a C library for parsing and emitting data in YAML 1.1, a
- human-readable data serialization format.
- .
- This package contains detached debuging symbols for the library found
- in libyaml-0-2.
-
-Package: libyaml-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, libyaml-0-2 (= ${binary:Version})
-Suggests: libyaml-doc
-Description: Fast YAML 1.1 parser and emitter library (development)
- LibYAML is a C library for parsing and emitting data in YAML 1.1, a
- human-readable data serialization format.
- .
- This package contains development headers and static libraries.
-
-Package: libyaml-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Description: Fast YAML 1.1 parser and emitter library (documentation)
- LibYAML is a C library for parsing and emitting data in YAML 1.1, a
- human-readable data serialization format.
- .
- This package contains API documentation for developers in HTML
- format, and some example programs from the LibYAML distribution.

diff --git a/debian/rules b/debian/rules
index bf41f8be6a8c7ae4604903eaef73c419ac39ef52..afa1a024eb41f4701193e9515e0103ed6befa297 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,11 @@
 #!/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/autoreconf.mk
+%:
+       dh $@ --with autoreconf
 
-CDBS_BUILD_DEPENDS += , cdbs (>= 0.4.93~)  # for $(DEB_HOST_MULTIARCH)
-
-# dh_buildinfo < 0.9+nmu1 fails at multiarch: http://bugs.debian.org/620104
-CDBS_BUILD_DEPENDS_rules_debhelper_buildinfo = dh-buildinfo (>= 0.9+nmu1~)
-
-build/libyaml-doc::
+override_dh_auto_build-indep:
        $(MAKE) html
 
-DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-DEB_MAKE_CHECK_TARGET = check
-DEB_DH_INSTALL_SOURCEDIR = $(DEB_DESTDIR)
-DEB_DBG_PACKAGE_libyaml-0-2 = libyaml-0-2-dbg
+override_dh_strip:
+       dh_strip -plibyaml-0-2 --dbgsym-migration='libyaml-0-2-dbg (<< 0.1.7-1~)'
+       dh_strip --remaining

diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644 (file)
index 4c9ca41..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-package-needs-versioned-debhelper-build-depends 9