r15326 - in /trunk/libconvert-tnef-perl/debian: README.cdbs-tweaks cdbs/1/rules/auto-update.mk cdbs/1/rules/copyright-check.mk cdbs/1/rules/upstream-tarball.mk changelog compat control control.in copyright_hints rules watch
js at users.alioth.debian.org
js at users.alioth.debian.org
Thu Feb 21 01:06:38 UTC 2008
Author: js
Date: Thu Feb 21 01:06:37 2008
New Revision: 15326
URL: http://svn.debian.org/wsvn/?sc=1&rev=15326
Log:
* Pass over maintenance of the package to the Perl group: Change Maintainer,
and add myself to Uploaders.
* Change debian/watch to use svn-upgrade (not uupdate).
* Move Homepage to own field (from pseudo-field in long description).
* Add Vcs-* fields.
* Bump up standards-version to 3.7.3 (no changes needed).
* Bump dephelper compatibility level to 5.
* Fix build-depends-indep -> build-depends.
* Update local cdbs tweaks:
+ Add new snippet update-tarball, implementing get-orig-source and more.
+ Major improvements to copyright-check, including new versioned
build-dependency on devscripts. Update debian/copyright_hints.
+ Drop auto-update.mk. Set DEB_AUTO_UPDATE_DEBIAN_CONTROL directly
instead when needed.
+ Add debian/README.cdbs-tweaks documenting local tweaks.
* Fix double cdbs build-dependencies in debian/rules.
* Semi-auto-update debian/control to apply changes contained in the above:
DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
Added:
trunk/libconvert-tnef-perl/debian/README.cdbs-tweaks
trunk/libconvert-tnef-perl/debian/cdbs/1/rules/upstream-tarball.mk
Removed:
trunk/libconvert-tnef-perl/debian/cdbs/1/rules/auto-update.mk
Modified:
trunk/libconvert-tnef-perl/debian/cdbs/1/rules/copyright-check.mk
trunk/libconvert-tnef-perl/debian/changelog
trunk/libconvert-tnef-perl/debian/compat
trunk/libconvert-tnef-perl/debian/control
trunk/libconvert-tnef-perl/debian/control.in
trunk/libconvert-tnef-perl/debian/copyright_hints
trunk/libconvert-tnef-perl/debian/rules
trunk/libconvert-tnef-perl/debian/watch
Added: trunk/libconvert-tnef-perl/debian/README.cdbs-tweaks
URL: http://svn.debian.org/wsvn/trunk/libconvert-tnef-perl/debian/README.cdbs-tweaks?rev=15326&op=file
==============================================================================
--- trunk/libconvert-tnef-perl/debian/README.cdbs-tweaks (added)
+++ trunk/libconvert-tnef-perl/debian/README.cdbs-tweaks Thu Feb 21 01:06:37 2008
@@ -1,0 +1,95 @@
+CDBS tweak
+==========
+
+CDBS is great. In some corner cases, however, some parts of CDBS
+sometimes needs a few tweaks to work optimally.
+
+This is a collection of such tweaks. The goal is for these tweaks to be
+absorbed into upstream CDBS. We just haven't found time yet to discuss
+them at the CDBS developers' mailinglist. And possible we do not all
+agree that the tweaks are so great - therefore this "staging area".
+
+If you found this file below debian/ subdir in a source package, most
+probably only a subset of the below mentioned tweaks are relevant and
+have been shipped with the package. The repository of all these tweaks
+is here: svn://svn.debian.org/build-common/people/js/overlay/
+
+Web access: http://svn.debian.org/wsvn/build-common/people/js/overlay/
+
+
+
+New buildinfo rule
+------------------
+
+See package description for "buildinfo" for more info.
+
+
+
+Improved support for multiple compilations
+------------------------------------------
+
+Create and clean builddir _after_ resolving per-package DEB_BUILDDIR.
+
+Honour per-package DEB_BUILDDIR in makefile class.
+
+
+
+Various improvements to python-distutils class
+----------------------------------------------
+
+Use full path to python interpreter (Python Policy section 1.3.2).
+
+Add CDBS_BUILD_DEPENDS to old policy method.
+
+Fix CDBS_BUILD_DEPENDS in new policy methods to only depend on debhelper
+when actually used.
+
+Fix DEB_PYTHON_SIMPLE_PACKAGES sometimes installed twice (and only one
+of them honouring DEB_PYTHON_COMPILE_VERSION).
+
+Unify install path using new DEB_PYTHON_DESTDIR.
+
+Quote install path.
+
+
+
+New copyright-check rule
+------------------------
+
+Refuse to build if the source is found to contain different copyright
+info than earlier builds.
+
+
+
+New kernelpatches rule
+----------------------
+
+Small wrapper around dh-kpatches, taking care of build-dependencies too.
+
+
+
+New routines for handling upstream tarball
+------------------------------------------
+
+Rules and variables to help downloading, validating and repackaging
+upstream tarball.
+
+Implements the rules print-version and get-orig-source commonly used
+for group-maintained packages with Debian-specific patches maintained in
+SVN or some other VCS, and automated fetching virgin upstream tarball
+(possibly massaged after download e.g. to strip non-DFSG material).
+
+
+
+Support for custom BTS info
+---------------------------
+
+Include BTS control info found in debian/*.bts files, or alternatively
+redirect bug reports to the email address defined in DEB_BTS_EMAIL.
+
+
+
+New dict class
+--------------
+
+Rules for packaging ispell, aspell, myspell and wordlist dictionaries.
Modified: trunk/libconvert-tnef-perl/debian/cdbs/1/rules/copyright-check.mk
URL: http://svn.debian.org/wsvn/trunk/libconvert-tnef-perl/debian/cdbs/1/rules/copyright-check.mk?rev=15326&op=diff
==============================================================================
--- trunk/libconvert-tnef-perl/debian/cdbs/1/rules/copyright-check.mk (original)
+++ trunk/libconvert-tnef-perl/debian/cdbs/1/rules/copyright-check.mk Thu Feb 21 01:06:37 2008
@@ -1,5 +1,5 @@
# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2005-2006 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,42 +17,55 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
-ifndef _cdbs_bootstrap
_cdbs_scripts_path ?= /usr/lib/cdbs
_cdbs_rules_path ?= /usr/share/cdbs/1/rules
_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
ifndef _cdbs_rules_copyright-check
_cdbs_rules_copyright-check := 1
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)
-clean::
- @echo 'Scanning upstream source for new/changed copyright notices...'
- @echo '(the debian/ subdir is _not_ examined - do that manually!)'
- 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 \
+# 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!)...'
+
+ licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
+ | grep -v '^\(\|.*: \*No copyright\* \(GENERATED FILE\|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
- if [ ! -f debian/copyright_hints ]; then touch debian/copyright_hints; fi
- @echo "diff --normal debian/copyright_hints debian/copyright_newhints | egrep '^>'"
- @diff --normal debian/copyright_hints debian/copyright_newhints | egrep '^>'; \
- if [ "$$?" -eq "0" ]; then \
- echo "New or changed copyright notices discovered! Do this:"; \
- echo " 1) Search source for each of the above lines ('grep -r' is your friend)"; \
- echo " 2) Update debian/copyright as needed"; \
- echo " 3) Replace debian/copyright_hints with 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; \
+ echo "$$newstrings"; \
+ echo; \
+ echo "To fix the situation please do the following:"; \
+ echo " 1) Investigate the above changes and update debian/copyright as needed"; \
+ echo " 2) Replace debian/copyright_hints with debian/copyright_newhints"; \
exit 1; \
fi
@echo 'No new copyright notices found - assuming no news is good news...'
rm -f debian/copyright_newhints
+ touch $@
+
+clean::
+ rm -f debian/stamp-copyright-check
endif
Added: trunk/libconvert-tnef-perl/debian/cdbs/1/rules/upstream-tarball.mk
URL: http://svn.debian.org/wsvn/trunk/libconvert-tnef-perl/debian/cdbs/1/rules/upstream-tarball.mk?rev=15326&op=file
==============================================================================
--- trunk/libconvert-tnef-perl/debian/cdbs/1/rules/upstream-tarball.mk (added)
+++ trunk/libconvert-tnef-perl/debian/cdbs/1/rules/upstream-tarball.mk Thu Feb 21 01:06:37 2008
@@ -1,0 +1,139 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2007-2008 Jonas Smedegaard <dr at jones.dk>
+# Description: Convenience rules for dealing with upstream tarballs
+#
+# 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 2, 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_upstream_tarball
+_cdbs_rules_upstream_tarball := 1
+
+include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix)
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.39)
+
+# 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_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 (without 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)-$(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 = ~
+
+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_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
+_cdbs_deprecated_vars += DEB_UPSTREAM_TARBALL DEB_UPSTREAM_LOCAL_TARBALL DEB_UPSTREAM_REPACKAGE_TARBALL
+_cdbs_deprecated_vars += DEB_UPSTREAM_REPACKAGE_EXCLUDES
+DEB_UPSTREAM_REPACKAGE_EXCLUDE += $(DEB_UPSTREAM_REPACKAGE_EXCLUDES)
+
+print-version:
+ @@echo "Debian version: $(DEB_VERSION)"
+ @@echo "Upstream version: $(DEB_UPSTREAM_TARBALL_VERSION)"
+
+get-orig-source:
+ @@dh_testdir
+ @@mkdir -p "$(DEB_UPSTREAM_WORKDIR)"
+
+ @if [ ! -s "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ] ; then \
+ if [ -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ] ; then \
+ rm "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \
+ fi ; \
+ echo "Downloading $(cdbs_upstream_local_tarball) from $(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball) ..." ; \
+ wget -N -nv -T10 -t3 -O "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" "$(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball)" ; \
+ else \
+ echo "Upstream source tarball have been already downloaded: $(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \
+ fi
+
+ @md5current=`md5sum "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" | sed -e 's/ .*//'`; \
+ if [ -n "$(DEB_UPSTREAM_TARBALL_MD5)" ] ; then \
+ if [ "$$md5current" != "$(DEB_UPSTREAM_TARBALL_MD5)" ] ; then \
+ echo "Expecting upstream tarball md5sum $(DEB_UPSTREAM_TARBALL_MD5), but $$md5current found" ; \
+ echo "Upstream tarball md5sum is NOT trusted! Possible upstream tarball forge!" ; \
+ echo "Purging downloaded file. Try new download." ; \
+ rm -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \
+ false ; \
+ else \
+ echo "Upstream tarball is trusted!" ; \
+ fi; \
+ else \
+ echo "Upstream tarball NOT trusted (current md5sum is $$md5current)!" ; \
+ fi
+
+# 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))" ] || [ "$$uncompress" = "false" ]; then \
+ echo "Repackaging tarball ..." && \
+ mkdir -p "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" && \
+ 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)"; \
+ gzip -9 "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball)"; \
+ fi
+
+DEB_PHONY_RULES += print-version get-orig-source
+
+endif
Modified: trunk/libconvert-tnef-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libconvert-tnef-perl/debian/changelog?rev=15326&op=diff
==============================================================================
--- trunk/libconvert-tnef-perl/debian/changelog (original)
+++ trunk/libconvert-tnef-perl/debian/changelog Thu Feb 21 01:06:37 2008
@@ -1,3 +1,26 @@
+libconvert-tnef-perl (0.17-6) unstable; urgency=low
+
+ * Pass over maintenance of the package to the Perl group: Change Maintainer,
+ and add myself to Uploaders.
+ * Change debian/watch to use svn-upgrade (not uupdate).
+ * Move Homepage to own field (from pseudo-field in long description).
+ * Add Vcs-* fields.
+ * Bump up standards-version to 3.7.3 (no changes needed).
+ * Bump dephelper compatibility level to 5.
+ * Fix build-depends-indep -> build-depends.
+ * Update local cdbs tweaks:
+ + Add new snippet update-tarball, implementing get-orig-source and more.
+ + Major improvements to copyright-check, including new versioned
+ build-dependency on devscripts. Update debian/copyright_hints.
+ + Drop auto-update.mk. Set DEB_AUTO_UPDATE_DEBIAN_CONTROL directly
+ instead when needed.
+ + Add debian/README.cdbs-tweaks documenting local tweaks.
+ * Fix double cdbs build-dependencies in debian/rules.
+ * Semi-auto-update debian/control to apply changes contained in the above:
+ DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
+
+ -- Jonas Smedegaard <dr at jones.dk> Thu, 21 Feb 2008 02:06:29 +0100
+
libconvert-tnef-perl (0.17-5) unstable; urgency=low
* Bump standards-version to 3.7.2 (no changes needed).
Modified: trunk/libconvert-tnef-perl/debian/compat
URL: http://svn.debian.org/wsvn/trunk/libconvert-tnef-perl/debian/compat?rev=15326&op=diff
==============================================================================
--- trunk/libconvert-tnef-perl/debian/compat (original)
+++ trunk/libconvert-tnef-perl/debian/compat Thu Feb 21 01:06:37 2008
@@ -1,1 +1,1 @@
-4
+5
Modified: trunk/libconvert-tnef-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libconvert-tnef-perl/debian/control?rev=15326&op=diff
==============================================================================
--- trunk/libconvert-tnef-perl/debian/control (original)
+++ trunk/libconvert-tnef-perl/debian/control Thu Feb 21 01:06:37 2008
@@ -1,9 +1,13 @@
Source: libconvert-tnef-perl
Section: perl
Priority: optional
-Build-Depends-Indep: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), dh-buildinfo, perl (>= 5.6.0-16), libio-stringy-perl, libmime-perl
-Maintainer: Jonas Smedegaard <dr at jones.dk>
-Standards-Version: 3.7.2
+Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), dh-buildinfo, debhelper (>= 5), perl (>= 5.6.0-16), libio-stringy-perl, libmime-perl
+Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+Uploaders: Jonas Smedegaard <dr at jones.dk>
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libconvert-tnef-perl/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libconvert-tnef-perl/
+Homepage: http://search.cpan.org/dist/Convert-TNEF/
Package: libconvert-tnef-perl
Architecture: all
@@ -12,5 +16,3 @@
TNEF stands for Transport Neutral Encapsulation Format, and if you've
ever been unfortunate enough to receive one of these files as an email
attachment, you may want to use this module.
- .
- Homepage: http://search.cpan.org/dist/Convert-TNEF/
Modified: trunk/libconvert-tnef-perl/debian/control.in
URL: http://svn.debian.org/wsvn/trunk/libconvert-tnef-perl/debian/control.in?rev=15326&op=diff
==============================================================================
--- trunk/libconvert-tnef-perl/debian/control.in (original)
+++ trunk/libconvert-tnef-perl/debian/control.in Thu Feb 21 01:06:37 2008
@@ -1,9 +1,13 @@
Source: libconvert-tnef-perl
Section: perl
Priority: optional
-Build-Depends-Indep: @cdbs@, libio-stringy-perl, libmime-perl
-Maintainer: Jonas Smedegaard <dr at jones.dk>
-Standards-Version: 3.7.2
+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.7.3
+Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libconvert-tnef-perl/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libconvert-tnef-perl/
+Homepage: http://search.cpan.org/dist/Convert-TNEF/
Package: libconvert-tnef-perl
Architecture: all
@@ -12,5 +16,3 @@
TNEF stands for Transport Neutral Encapsulation Format, and if you've
ever been unfortunate enough to receive one of these files as an email
attachment, you may want to use this module.
- .
- Homepage: http://search.cpan.org/dist/Convert-TNEF/
Modified: trunk/libconvert-tnef-perl/debian/copyright_hints
URL: http://svn.debian.org/wsvn/trunk/libconvert-tnef-perl/debian/copyright_hints?rev=15326&op=diff
==============================================================================
--- trunk/libconvert-tnef-perl/debian/copyright_hints (original)
+++ trunk/libconvert-tnef-perl/debian/copyright_hints Thu Feb 21 01:06:37 2008
@@ -1,1 +1,1 @@
-Copyright (c) 1999 Douglas Wilson <dougw at cpan.org>. All rights reserved.
+TNEF.pm: Perl [1999 Douglas Wilson <dougw at cpan.org>. All rights reserved]
Modified: trunk/libconvert-tnef-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libconvert-tnef-perl/debian/rules?rev=15326&op=diff
==============================================================================
--- trunk/libconvert-tnef-perl/debian/rules (original)
+++ trunk/libconvert-tnef-perl/debian/rules Thu Feb 21 01:06:37 2008
@@ -1,10 +1,22 @@
#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2004-2006 Jonas Smedegaard <dr at jones.dk>
+# Copyright © 2004-2008 Jonas Smedegaard <dr at jones.dk>
-include debian/cdbs/1/rules/auto-update.mk
+# See debian/README.cdbs-tweaks for info on local overrides
+include debian/cdbs/1/rules/upstream-tarball.mk
+include debian/cdbs/1/rules/copyright-check.mk
+include debian/cdbs/1/rules/buildinfo.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/1/rules/buildinfo.mk
-include debian/cdbs/1/rules/copyright-check.mk
-# Put perlmodule.mk last to dh_clean temporary files not in MANIFEST
+# Put perlmodule.mk after debhelper.mk to dh_clean temp files not in MANIFEST
include /usr/share/cdbs/1/class/perlmodule.mk
+
+DEB_UPSTREAM_PACKAGE = Convert::TNEF
+DEB_UPSTREAM_URL = http://www.cpan.org/modules/by-module/Convert/
+DEB_UPSTREAM_TARBALL_VERSION := $(shell echo '$(DEB_UPSTREAM_VERSION)' | awk -F. '{print $$1"."$$2$$3$$4$$5}')
+DEB_UPSTREAM_TARBALL_MD5 = ff0ad2dd42089fca307f8e7cf074f148
+
+# Needed by upstream build process
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libio-stringy-perl, libmime-perl
+
+# Fix double cdbs build-dependencies
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')
Modified: trunk/libconvert-tnef-perl/debian/watch
URL: http://svn.debian.org/wsvn/trunk/libconvert-tnef-perl/debian/watch?rev=15326&op=diff
==============================================================================
--- trunk/libconvert-tnef-perl/debian/watch (original)
+++ trunk/libconvert-tnef-perl/debian/watch Thu Feb 21 01:06:37 2008
@@ -1,4 +1,4 @@
# Run the "uscan" command to check for upstream updates and more.
version=3
opts="uversionmangle=s/(\d)\.(\d{2})(\d+)/$1.$2.$3/" \
- http://www.cpan.org/modules/by-module/Convert/Convert-TNEF-([\d\.]+)\.tar\.gz debian uupdate
+ http://www.cpan.org/modules/by-module/Convert/Convert-TNEF-([\d\.]+)\.tar\.gz debian svn-upgrade
More information about the Pkg-perl-cvs-commits
mailing list