[libpandoc-elements-perl] 05/11: Refactor to limit use of CDBS. Stop build-depend on cdbs or licensecheck.

Jonas Smedegaard dr at jones.dk
Fri Mar 31 11:16:03 UTC 2017


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

js pushed a commit to branch master
in repository libpandoc-elements-perl.

commit 6f1292211d2a8302edba3d6aec62a5a509e2d259
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Mar 31 12:50:37 2017 +0200

    Refactor to limit use of CDBS. Stop build-depend on cdbs or licensecheck.
---
 debian/README.source                    | 11 -----------
 debian/control                          | 33 +++++++++++++++++++++++----------
 debian/control.in                       | 26 --------------------------
 debian/copyright-check                  | 24 ++++++++++++++++++++++++
 debian/libpandoc-elements-perl.examples |  1 +
 debian/rules                            | 23 ++---------------------
 6 files changed, 50 insertions(+), 68 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index f88449e..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,11 +0,0 @@
-CDBS+git-buildpackage
----------------------
-
-This source package uses CDBS and git-buildpackage.  NMUs need not (but
-are encouraged to) make special use of these tools.  In particular, the
-debian/control.in file can be completely ignored.
-
-More info here: http://wiki.debian.org/CDBS+git-buildpackage
-
-
- -- Jonas Smedegaard <dr at jones.dk>  Mon, 18 Feb 2013 12:55:37 +0100
diff --git a/debian/control b/debian/control
index 647853a..da5c0d2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,20 @@
 Source: libpandoc-elements-perl
 Section: perl
 Priority: optional
-Build-Depends: cdbs (>= 0.4.122~),
- licensecheck,
- perl,
- libmodule-build-tiny-perl,
+Build-Depends:
  debhelper,
  dh-buildinfo,
+ libmodule-build-tiny-perl,
+ perl,
+# tests
+ libtest-exception-perl,
+ libtest-output-perl,
+ libtest-deep-perl,
+# runtime
  libhash-multivalue-perl,
  libipc-run3-perl,
  libjson-perl,
- libtest-exception-perl,
- libtest-output-perl
+ libpandoc-wrapper-perl,
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>
 Standards-Version: 3.9.8
@@ -21,13 +24,23 @@ Homepage: https://github.com/nichtich/Pandoc-Elements
 
 Package: libpandoc-elements-perl
 Architecture: all
-Depends: ${cdbs:Depends},
+Depends:
  ${misc:Depends},
- ${perl:Depends}
-Recommends: ${cdbs:Recommends}
-Enhances: ${cdbs:Enhances}
+ ${perl:Depends},
+# runtime
+ libhash-multivalue-perl,
+ libipc-run3-perl,
+ libjson-perl,
+ libpandoc-wrapper-perl,
+Recommends:
+ pandoc
+Enhances:
+ pandoc
 Description: create and process Pandoc documents
  Pandoc::Elements provides utility functions to create abstract syntax
  trees (AST) of Pandoc documents.  The resulting data structure can be
  converted by Pandoc to many other document formats, such as HTML,
  LaTeX, ODT, and ePUB.
+ .
+ This package includes the Perl module Pandoc::Elements,
+ and the pandoc filter multifilter.
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 01d2059..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,26 +0,0 @@
-Source: libpandoc-elements-perl
-Section: perl
-Priority: optional
-Build-Depends: @cdbs@
-Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Jonas Smedegaard <dr at jones.dk>
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libpandoc-elements-perl
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libpandoc-elements-perl.git
-Homepage: https://github.com/nichtich/Pandoc-Elements
-
-Package: libpandoc-elements-perl
-Architecture: all
-Depends: ${cdbs:Depends},
- ${misc:Depends},
- ${perl:Depends}
-Recommends: ${cdbs:Recommends}
-Enhances: ${cdbs:Enhances}
-Description: create and process Pandoc documents
- Pandoc::Elements provides utility functions to create abstract syntax
- trees (AST) of Pandoc documents.  The resulting data structure can be
- converted by Pandoc to many other document formats, such as HTML,
- LaTeX, ODT, and ePUB.
- .
- This package includes the Perl module Pandoc::Elements,
- and the pandoc filter multifilter.
diff --git a/debian/copyright-check b/debian/copyright-check
new file mode 100755
index 0000000..129b94d
--- /dev/null
+++ b/debian/copyright-check
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Copyright © 2016-2017  Jonas Smedegaard <dr at jones.dk>
+# Description: helper script to update copyright_hints
+#
+# 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, 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, see <http://www.gnu.org/licenses/>.
+
+set -eu
+
+make -f /usr/share/cdbs/1/rules/utils.mk pre-build || true
+make -f /usr/share/cdbs/1/rules/utils.mk clean DEB_COPYRIGHT_CHECK_STRICT=1
+
+# unconditionally merge changes - safe to do with git-tracked package
+[ ! -f debian/copyright_newhints ] || mv -f debian/copyright_newhints debian/copyright_hints
diff --git a/debian/libpandoc-elements-perl.examples b/debian/libpandoc-elements-perl.examples
new file mode 100644
index 0000000..e39721e
--- /dev/null
+++ b/debian/libpandoc-elements-perl.examples
@@ -0,0 +1 @@
+examples/*
diff --git a/debian/rules b/debian/rules
index af0d0ba..013d431 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,24 +16,5 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/perl-build.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-pkg = $(DEB_SOURCE_PACKAGE)
-
-# Needed by upstream build and (always) at runtime
-deps = libhash-multivalue-perl, libipc-run3-perl, libjson-perl, libpandoc-wrapper-perl
-
-# Needed by upstream testsuite
-deps-test = libtest-exception-perl, libtest-output-perl, libtest-deep-perl
-
-# Needed (often) and improves
-recommends-enhances = pandoc
-
-CDBS_BUILD_DEPENDS +=, $(deps), $(deps-test)
-CDBS_DEPENDS_$(pkg) = $(deps)
-CDBS_RECOMMENDS_$(pkg) = $(recommends-enhances)
-CDBS_ENHANCES_$(pkg) = $(recommends-enhances)
-
-DEB_INSTALL_EXAMPLES_$(pkg) += examples/*
+%:
+	dh $@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libpandoc-elements-perl.git



More information about the Pkg-perl-cvs-commits mailing list