r13149 - in /trunk/libhtml-wikiconverter-markdown-perl/debian: README.cdbs-tweaks cdbs/1/rules/buildcore.mk cdbs/1/rules/copyright-check.mk cdbs/1/rules/upstream-tarball.mk control copyright_hints rules
js at users.alioth.debian.org
js at users.alioth.debian.org
Mon Jan 21 16:33:26 UTC 2008
Author: js
Date: Mon Jan 21 16:33:26 2008
New Revision: 13149
URL: http://svn.debian.org/wsvn/?sc=1&rev=13149
Log:
Update cdbs routines.
Removed:
trunk/libhtml-wikiconverter-markdown-perl/debian/cdbs/1/rules/buildcore.mk
Modified:
trunk/libhtml-wikiconverter-markdown-perl/debian/README.cdbs-tweaks
trunk/libhtml-wikiconverter-markdown-perl/debian/cdbs/1/rules/copyright-check.mk
trunk/libhtml-wikiconverter-markdown-perl/debian/cdbs/1/rules/upstream-tarball.mk
trunk/libhtml-wikiconverter-markdown-perl/debian/control
trunk/libhtml-wikiconverter-markdown-perl/debian/copyright_hints
trunk/libhtml-wikiconverter-markdown-perl/debian/rules
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/README.cdbs-tweaks
URL: http://svn.debian.org/wsvn/trunk/libhtml-wikiconverter-markdown-perl/debian/README.cdbs-tweaks?rev=13149&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/README.cdbs-tweaks (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/README.cdbs-tweaks Mon Jan 21 16:33:26 2008
@@ -15,24 +15,6 @@
is here: svn://svn.debian.org/build-common/people/js/overlay/
Web access: http://svn.debian.org/wsvn/build-common/people/js/overlay/
-
-
-
-Improved support for cdbs-autoupdate
-------------------------------------
-
-CDBS invented a cool way to help keep build-dependencies up-to-date.
-
-It is disabled by default, as messing with debian/rules at build time
-violates Debian Policy: A build must not change conditions for building.
-
-Some consider this CDBS feature evil.
-
-Some enable the feature within a package, and gets smacked by ftp-master
-or others (there's even a lintian check to complain about it now).
-
-This tweak enables the feature when the build environment contains the
-non-default hint "cdbs-autoupdate" in the DEB_BUILD_OPTIONS variable.
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/cdbs/1/rules/copyright-check.mk
URL: http://svn.debian.org/wsvn/trunk/libhtml-wikiconverter-markdown-perl/debian/cdbs/1/rules/copyright-check.mk?rev=13149&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/cdbs/1/rules/copyright-check.mk (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/cdbs/1/rules/copyright-check.mk Mon Jan 21 16:33:26 2008
@@ -1,5 +1,5 @@
# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2005-2007 Jonas Smedegaard <dr at jones.dk>
+# Copyright © 2005-2008 Jonas Smedegaard <dr at jones.dk>
# Description: Check for changes to copyright notices in source
#
# This program is free software; you can redistribute it and/or
@@ -17,10 +17,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
-# TODO: Save scan as "file: match" (needs rewrite of main loop in perl)
-
-# TODO: Save scan as "file (license): match" (needs /usr/bin/licensecheck from kdesdk-scripts)
-
_cdbs_scripts_path ?= /usr/lib/cdbs
_cdbs_rules_path ?= /usr/share/cdbs/1/rules
_cdbs_class_path ?= /usr/share/cdbs/1/class
@@ -30,28 +26,34 @@
include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-cdbs_copyright-check_find_opts := -not -regex 'debian/.*' -not -regex '\(.*/\)?config\.\(guess\|sub\|rpath\)\(\..*\)?'
-cdbs_copyright-check_egrep_opts := --text -rih '(copyright|\(c\) ).*[0-9]{4}'
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), devscripts (>= 2.10.7)
+
+# Single regular expression for files to include or ignore
+DEB_COPYRIGHT_CHECK_REGEX = .*
+DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(debian/.*|(.*/)?config\.(guess|sub|rpath)(\..*)?)$
+
+# By default sort by license and then by filename
+DEB_COPYRIGHT_CHECK_SORT_OPTS = -t : -k2,1 -k1
pre-build:: debian/stamp-copyright-check
debian/stamp-copyright-check:
@echo 'Scanning upstream source for new/changed copyright notices (except debian subdir!)...'
- find * -type f $(cdbs_copyright-check_find_opts) -exec cat '{}' ';' \
- | tr '\r' '\n' \
- | LC_ALL=C sed -e 's/[^[:print:]]//g' \
- | egrep $(cdbs_copyright-check_egrep_opts) \
- | sed -e 's/^[[:space:]*#]*//' -e 's/[[:space:]]*$$//' \
- | LC_ALL=C sort -u \
+
+ licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
+ | grep -v '^\(\|.*: \*No copyright\* UNKNOWN\)$$' \
+ | sed 's/\s*(with incorrect FSF address)\s*$$//; s/\s(\+v\(.\+\) or later)/-\1\+/; s/^\s*\[Copyright:\s*/ \[/' \
+ | awk '/^[^ ]/{printf "%s",$$0;next}{print}' \
+ | LC_ALL=C sort $(DEB_COPYRIGHT_CHECK_SORT_OPTS) \
> debian/copyright_newhints
+ @patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | LANG=C sort -u | grep . -c`"; \
+ echo "Found $$patterncount different copyright and licensing combinations."
@if [ ! -f debian/copyright_hints ]; then touch debian/copyright_hints; fi
@newstrings=`diff -u debian/copyright_hints debian/copyright_newhints | sed '1,2d' | egrep '^\+' | sed 's/^\+//'`; \
if [ -n "$$newstrings" ]; then \
- echo "Error: The following new or changed copyright notices discovered:"; \
+ echo "ERROR: The following new or changed copyright notices discovered:"; \
+ echo; \
echo "$$newstrings"; \
- echo "Trying to locate the files containing the new/changed copyright notices..."; \
- echo "(Strings part of binary data you need to resolve yourself)"; \
- find * -type f $(cdbs_copyright-check_find_opts) -exec grep -F -l -e "$$newstrings" '{}' ';'; \
echo; \
echo "To fix the situation please do the following:"; \
echo " 1) Investigate the above changes and update debian/copyright as needed"; \
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/cdbs/1/rules/upstream-tarball.mk
URL: http://svn.debian.org/wsvn/trunk/libhtml-wikiconverter-markdown-perl/debian/cdbs/1/rules/upstream-tarball.mk?rev=13149&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/cdbs/1/rules/upstream-tarball.mk (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/cdbs/1/rules/upstream-tarball.mk Mon Jan 21 16:33:26 2008
@@ -30,26 +30,33 @@
# Prefix for upstream location of all upstream tarballs (mandatory!)
#DEB_UPSTREAM_URL =
+
DEB_UPSTREAM_PACKAGE = $(DEB_SOURCE_PACKAGE)
DEB_UPSTREAM_TARBALL_VERSION = $(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE)),$(DEB_UPSTREAM_VERSION:$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG)=),$(DEB_UPSTREAM_VERSION))
-DEB_UPSTREAM_TARBALL_BASENAME = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION)
DEB_UPSTREAM_TARBALL_EXTENSION = tar.gz
# Checksum to ensure integrity of downloadeds using get-orig-source (optional)
#DEB_UPSTREAM_TARBALL_MD5 =
DEB_UPSTREAM_WORKDIR = ../tarballs
+# Perl regexp to change locally used string into that in upstream URL and srcdir
+#DEB_UPSTREAM_TARBALL_VERSION_MANGLE
+cdbs_upstream_tarball_version_mangled = $(if $(strip $(DEB_UPSTREAM_TARBALL_VERSION_MANGLE)),$(shell echo '$(DEB_UPSTREAM_TARBALL_VERSION)' | perl -pe '$(DEB_UPSTREAM_TARBALL_VERSION_MANGLE)'),$(DEB_UPSTREAM_TARBALL_VERSION))
+
+# Base filename (withour extension) as used in upstream URL
+DEB_UPSTREAM_TARBALL_BASENAME = $(DEB_UPSTREAM_PACKAGE)-$(cdbs_upstream_tarball_version_mangled)
+
# Base directory within tarball
-DEB_UPSTREAM_TARBALL_SRCDIR = $(DEB_UPSTREAM_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION)
+DEB_UPSTREAM_TARBALL_SRCDIR = $(DEB_UPSTREAM_PACKAGE)-$(cdbs_upstream_tarball_version_mangled)
# Space-delimited list of directories and files to strip (optional)
#DEB_UPSTREAM_REPACKAGE_EXCLUDE = CVS .cvsignore doc/rfc*.txt doc/draft*.txt
DEB_UPSTREAM_REPACKAGE_TAG = dfsg
-DEB_UPSTREAM_REPACKAGE_DELIMITER = .
+DEB_UPSTREAM_REPACKAGE_DELIMITER = ~
cdbs_upstream_tarball = $(DEB_UPSTREAM_TARBALL_BASENAME).$(DEB_UPSTREAM_TARBALL_EXTENSION)
cdbs_upstream_local_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.$(if $(findstring $(DEB_UPSTREAM_TARBALL_EXTENSION),tgz),tar.gz,$(DEB_UPSTREAM_TARBALL_EXTENSION))
-cdbs_upstream_repackaged_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION)$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG).orig.tar.gz
+cdbs_upstream_repackaged_basename = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION)$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG).orig
cdbs_upstream_uncompressed_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.tar
# # These variables are deprecated
@@ -90,25 +97,41 @@
echo "Upstream tarball NOT trusted (current md5sum is $$md5current)!" ; \
fi
- @case "$(cdbs_upstream_local_tarball)" in \
+# TODO: Rewrite using make variables like cdbs_upstream_unpack_cmd and
+# DEB_UPSTREAM_SUPPORTED_COMPRESSIONS (recent dpkg supports bz2)
+ @untar="tar -x -C"; \
+ case "$(cdbs_upstream_local_tarball)" in \
*.tar.gz) unpack="gunzip -c";; \
*.tar.bz2) unpack="bunzip2 -c"; uncompress="bunzip2";; \
*.tar.Z) unpack="uncompress -c"; uncompress="uncompress";; \
+ *.zip) unpack="unzip -q"; uncompress="false"; untar="-d"; nopipe="true";; \
*.tar) unpack="cat"; uncompress="true";; \
*) echo "Unknown extension for upstream tarball $(cdbs_upstream_local_tarball)"; false;; \
esac && \
- if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ]; then \
+ if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ] || [ "$$uncompress" = "false" ]; then \
echo "Repackaging tarball ..." && \
mkdir -p "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" && \
- $$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" \
- | tar -x -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)) && \
- GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_repackaged_tarball)" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(DEB_UPSTREAM_TARBALL_SRCDIR) && \
+ if [ -n "$$nopipe" ]; then \
+ $$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" \
+ $$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \
+ else \
+ $$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" \
+ | $$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \
+ fi && \
+ if [ "$(DEB_UPSTREAM_TARBALL_SRCDIR)" != "$(cdbs_upstream_repackaged_basename)" ]; then \
+ mv -T "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(DEB_UPSTREAM_TARBALL_SRCDIR)" "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(cdbs_upstream_repackaged_basename)"; \
+ fi && \
+ if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ]; then \
+ GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_repackaged_basename).tar.gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_repackaged_basename)"; \
+ else \
+ GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball).gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_repackaged_basename)"; \
+ fi && \
echo "Cleaning up" && \
rm -rf "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)"; \
elif [ -n "$$uncompress" ]; then \
echo "Recompressing tarball ..." && \
$$uncompress "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)"; \
- bzip -9 "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball)"; \
+ gzip -9 "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball)"; \
fi
DEB_PHONY_RULES += print-version get-orig-source
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libhtml-wikiconverter-markdown-perl/debian/control?rev=13149&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/control (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/control Mon Jan 21 16:33:26 2008
@@ -1,7 +1,7 @@
Source: libhtml-wikiconverter-markdown-perl
Section: perl
Priority: optional
-Build-Depends: cdbs (>= 0.4.39), quilt, patchutils (>= 0.2.25), dh-buildinfo, debhelper (>= 5), perl (>= 5.6.0-16), libhtml-wikiconverter-perl (>= 0.60), libhtml-tagset-perl, libparams-validate-perl, liburi-perl, libtest-simple-perl, libfile-spec-perl, libhtml-parser-perl, libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.04)
+Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), dh-buildinfo, debhelper (>= 5), perl (>= 5.6.0-16), libhtml-wikiconverter-perl (>= 0.60), libhtml-tagset-perl, libparams-validate-perl, liburi-perl, libtest-simple-perl, libfile-spec-perl, libhtml-parser-perl, libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.04)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Jonas Smedegaard <dr at jones.dk>
Standards-Version: 3.7.2
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/copyright_hints
URL: http://svn.debian.org/wsvn/trunk/libhtml-wikiconverter-markdown-perl/debian/copyright_hints?rev=13149&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/copyright_hints (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/copyright_hints Mon Jan 21 16:33:26 2008
@@ -1,2 +1,1 @@
-Copyright (C) 2006 David J. Iberri
-Copyright 2006 David J. Iberri, all rights reserved.
+README: UNKNOWN [AND LICENCE / 2006 David J. Iberri]
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libhtml-wikiconverter-markdown-perl/debian/rules?rev=13149&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/rules (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/rules Mon Jan 21 16:33:26 2008
@@ -3,7 +3,6 @@
# Copyright © 2007 Jonas Smedegaard <dr at jones.dk>
# See debian/README.cdbs-tweaks for info on local overrides
-include debian/cdbs/1/rules/buildcore.mk
include debian/cdbs/1/rules/upstream-tarball.mk
include debian/cdbs/1/rules/copyright-check.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
More information about the Pkg-perl-cvs-commits
mailing list