r20240 - in /trunk/libhtml-wikiconverter-perl/debian: ./ cdbs/ cdbs/1/ cdbs/1/rules/ patches/
rmayorga-guest at users.alioth.debian.org
rmayorga-guest at users.alioth.debian.org
Wed May 21 06:41:01 UTC 2008
Author: rmayorga-guest
Date: Wed May 21 06:41:00 2008
New Revision: 20240
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20240
Log:
* Reverting back to cdbs
* Adding 1013-pod-note.... patch to poke users about modules
was splitted since 0.50
* Adding debin/NEWS
Added:
trunk/libhtml-wikiconverter-perl/debian/NEWS
trunk/libhtml-wikiconverter-perl/debian/README.cdbs-tweaks
trunk/libhtml-wikiconverter-perl/debian/cdbs/
trunk/libhtml-wikiconverter-perl/debian/cdbs/1/
trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/
trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/buildinfo.mk
trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/copyright-check.mk
trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/upstream-tarball.mk
trunk/libhtml-wikiconverter-perl/debian/control.in
trunk/libhtml-wikiconverter-perl/debian/copyright_hints
trunk/libhtml-wikiconverter-perl/debian/patches/1013-pod-note-about-splited-dialects.patch
Modified:
trunk/libhtml-wikiconverter-perl/debian/changelog
trunk/libhtml-wikiconverter-perl/debian/control
trunk/libhtml-wikiconverter-perl/debian/patches/1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch
trunk/libhtml-wikiconverter-perl/debian/patches/series
trunk/libhtml-wikiconverter-perl/debian/rules
Added: trunk/libhtml-wikiconverter-perl/debian/NEWS
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/NEWS?rev=20240&op=file
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/NEWS (added)
+++ trunk/libhtml-wikiconverter-perl/debian/NEWS Wed May 21 06:41:00 2008
@@ -1,0 +1,7 @@
+libbhtml-wikiconverter-perl (0.61-1) unstable; urgency=low
+
+ + Upstream decide to remove all dialects shipped with the
+ main package.
+ Please search at the archive for available dialects
+
+ -- Rene Mayorga <rmayorga at debian.org.sv> Wen, 20 May 2008 23:58:36 -0600
Added: trunk/libhtml-wikiconverter-perl/debian/README.cdbs-tweaks
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/README.cdbs-tweaks?rev=20240&op=file
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/README.cdbs-tweaks (added)
+++ trunk/libhtml-wikiconverter-perl/debian/README.cdbs-tweaks Wed May 21 06:41:00 2008
@@ -1,0 +1,111 @@
+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 and autotools classes.
+
+Support multiple build flavors in makefile and autotools classes.
+
+
+
+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 python-autotools class
+--------------------------
+
+Handle autotools-based Python packaging.
+
+
+
+New python-sugar class
+----------------------
+
+Handle packaging of Sugar activities.
+
+
+
+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.
Added: trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/buildinfo.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/buildinfo.mk?rev=20240&op=file
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/buildinfo.mk (added)
+++ trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/buildinfo.mk Wed May 21 06:41:00 2008
@@ -1,0 +1,40 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2004-2006 Jonas Smedegaard <dr at jones.dk>
+# Description: Generate and include build information
+#
+# 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_buildinfo
+_cdbs_rules_buildinfo = 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), dh-buildinfo
+
+common-install-arch common-install-indep:: debian/stamp-buildinfo
+
+debian/stamp-buildinfo:
+ dh_buildinfo
+ touch debian/stamp-buildinfo
+
+clean::
+ rm -f debian/stamp-buildinfo
+
+endif
Added: trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/copyright-check.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/copyright-check.mk?rev=20240&op=file
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/copyright-check.mk (added)
+++ trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/copyright-check.mk Wed May 21 06:41:00 2008
@@ -1,0 +1,93 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# 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
+# 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_copyright-check
+_cdbs_rules_copyright-check := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+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)(\..*)?)$
+
+pre-build:: debian/stamp-copyright-check
+
+debian/stamp-copyright-check:
+ @echo 'Scanning upstream source for new/changed copyright notices (except debian subdir!)...'
+
+# Perl in shell in make requires extra care:
+# * Single-quoting ('...') protects against shell expansion
+# * Double-dollar ($$) expands to plain dollar ($) in make
+ licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
+ | LC_ALL=C perl -e \
+ '$$n=0; while (<>) {'\
+ ' if (/^([^:\s][^:]+):[\s]+(\S.*?)\s*$$/) {'\
+ ' $$files[$$n]{name}=$$1;'\
+ ' $$files[$$n]{license}=$$2;'\
+ ' };'\
+ ' if (/^\s*\[Copyright:\s*(\S.*?)\s*\]/) {'\
+ ' $$files[$$n]{copyright}=$$1;'\
+ ' };'\
+ ' /^$$/ and $$n++;'\
+ '};'\
+ 'foreach $$file (@files) {'\
+ ' $$file->{license} =~ s/\s*\(with incorrect FSF address\)//;'\
+ ' $$file->{license} =~ s/\s+\(v([^)]+) or later\)/-$$1+/;'\
+ ' $$file->{copyright} =~ s/(?<=(\b\d{4}))(?{$$y=$$^N})\s*[,-]\s*((??{$$y+1}))\b/-$$2/g;'\
+ ' $$file->{copyright} =~ s/(?<=\b\d{4})\s*-\s*\d{4}(?=\s*-\s*(\d{4})\b)//g;'\
+ ' $$pattern = "$$file->{license} [$$file->{copyright}]";'\
+ ' push @{ $$patternfiles{"$$pattern"} }, $$file->{name};'\
+ '};'\
+ 'foreach $$pattern ( sort {'\
+ ' @{$$patternfiles{$$b}} <=> @{$$patternfiles{$$a}}'\
+ ' ||'\
+ ' $$a cmp $$b'\
+ ' } keys %patternfiles ) {'\
+ ' print "$$pattern: ", join(", ", sort @{ $$patternfiles{$$pattern} }), "\n";'\
+ '};'\
+ > 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/libhtml-wikiconverter-perl/debian/cdbs/1/rules/upstream-tarball.mk
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/upstream-tarball.mk?rev=20240&op=file
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/upstream-tarball.mk (added)
+++ trunk/libhtml-wikiconverter-perl/debian/cdbs/1/rules/upstream-tarball.mk Wed May 21 06:41:00 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/libhtml-wikiconverter-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/changelog?rev=20240&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/changelog (original)
+++ trunk/libhtml-wikiconverter-perl/debian/changelog Wed May 21 06:41:00 2008
@@ -1,6 +1,6 @@
libhtml-wikiconverter-perl (0.62-1) UNRELEASED; urgency=low
- NOTE: Stills needs some work or some input
+ NOTE: #473304, also waiting some input from Jonas
[ Jonas Smedegaard ]
* Update debian/copyright: Debian Perl Team holds copyright for Debian
@@ -8,33 +8,18 @@
[ Rene Mayorga ]
* New upstream release
- * Convert from cdbs to debhelper
* debian/control
- + remove devscripts B-D
- + add Build-Depends-Indep field and move perl modules to there
+ add ${misc:Depends} field
+ add myself to uploaders
- + Remove libhtml-wikiconverter-perl-dialect from Recommends
- + Add wikiconverter-mediawiki-perl and wikiconverter-moinmoun-perl to Suggests
* debian/copyright
+ Use GPL-any to license debian/* files
- * debian/rules - synced with last dh-make-perl template
- * remove README.cdbs-tweaks, cdbs dir, control.in and copyright_hints FILES
- * refresh 1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch
- patch
+ * refresh 1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-\
+ to-escaping-in-preprocessing.patch patch
* Update debian/watch with the current model used by pkg-perl
+ * Add 1013-pod-note-about-splited-dialects.patch Patch
+ * Add debian/NEWS telling that this package was splitted from Upstream
-- Rene Mayorga <rmayorga at debian.org.sv> Sun, 18 May 2008 17:42:23 -0600
-
-libhtml-wikiconverter-perl (0.61-4) UNRELEASED; urgency=low
-
- NOTE: Wait until have a nice solution for #473304
- ( http://lists.debian.org/debian-perl/2008/05/msg00023.html ) -- rmayorga
-
- * Update debian/copyright: Debian Perl Team holds copyright for Debian
- packaging in 2008.
-
- -- Jonas Smedegaard <dr at jones.dk> Wed, 19 Mar 2008 02:15:46 +0100
libhtml-wikiconverter-perl (0.61-3) unstable; urgency=low
Modified: trunk/libhtml-wikiconverter-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/control?rev=20240&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/control (original)
+++ trunk/libhtml-wikiconverter-perl/debian/control Wed May 21 06:41:00 2008
@@ -1,10 +1,7 @@
Source: libhtml-wikiconverter-perl
Section: perl
Priority: optional
-Build-Depends: quilt, debhelper (>= 5), perl (>= 5.6.0-16)
-Build-Depends-Indep: libhtml-tree-perl (>= 3.18), libcss-perl, liburi-perl (>= 1.35), libhtml-parser-perl, libhtml-tagset-perl,
- libparams-validate-perl (>= 0.77), libclass-data-accessor-perl (>= 0.02), libtest-simple-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-tree-perl (>= 3.18), libcss-perl, liburi-perl (>= 1.35), libhtml-parser-perl, libhtml-tagset-perl, libparams-validate-perl (>= 0.77), libclass-data-accessor-perl (>= 0.02), libtest-simple-perl, libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.04)
Build-conflicts: libwww-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Jonas Smedegaard <dr at jones.dk>, Rene Mayorga <rmayorga at debian.org.sv>
@@ -15,10 +12,8 @@
Package: libhtml-wikiconverter-perl
Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, libhtml-tree-perl (>= 3.18), libcss-perl, liburi-perl (>= 1.35),
- libhtml-parser-perl, libhtml-tagset-perl, libparams-validate-perl (>= 0.77), libclass-data-accessor-perl (>= 0.02)
-Suggests: libhtml-wikiconverter-mediawiki-perl, libhtml-wikiconverter-moimoin-perl
-Recommends: libfile-slurp-perl
+Depends: ${perl:Depends}, ${misc:Depends}, libhtml-tree-perl (>= 3.18), libcss-perl, liburi-perl (>= 1.35), libhtml-parser-perl, libhtml-tagset-perl, libparams-validate-perl (>= 0.77), libclass-data-accessor-perl (>= 0.02)
+Recommends: libhtml-wikiconverter-dialect, libfile-slurp-perl
Description: An HTML to wiki markup converter
HTML::WikiConverter is an HTML to wiki converter. It can convert HTML
source into a variety of wiki markups, called wiki "dialects".
Added: trunk/libhtml-wikiconverter-perl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/control.in?rev=20240&op=file
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/control.in (added)
+++ trunk/libhtml-wikiconverter-perl/debian/control.in Wed May 21 06:41:00 2008
@@ -1,0 +1,22 @@
+Source: libhtml-wikiconverter-perl
+Section: perl
+Priority: optional
+Build-Depends: @cdbs@
+Build-conflicts: libwww-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/collab-maint/deb-maint/libhtml-wikiconverter-perl/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/libhtml-wikiconverter-perl/trunk
+Homepage: http://diberri.dyndns.org/wikipedia/html2wiki/
+
+Package: libhtml-wikiconverter-perl
+Architecture: all
+Depends: ${perl:Depends}, libhtml-tree-perl (>= 3.18), libcss-perl, liburi-perl (>= 1.35), libhtml-parser-perl, libhtml-tagset-perl, libparams-validate-perl (>= 0.77), libclass-data-accessor-perl (>= 0.02)
+Recommends: libhtml-wikiconverter-dialect, libfile-slurp-perl
+Description: An HTML to wiki markup converter
+ HTML::WikiConverter is an HTML to wiki converter. It can convert HTML
+ source into a variety of wiki markups, called wiki "dialects".
+ .
+ This package contains the core modules. You will need at a dialect
+ package too for this package to be of any real use.
Added: trunk/libhtml-wikiconverter-perl/debian/copyright_hints
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/copyright_hints?rev=20240&op=file
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/copyright_hints (added)
+++ trunk/libhtml-wikiconverter-perl/debian/copyright_hints Wed May 21 06:41:00 2008
@@ -1,0 +1,2 @@
+*No copyright* UNKNOWN []: Changes, INSTALL, MANIFEST, META.yml, Makefile.PL, README, bin/html2wiki, lib/HTML/WikiConverter.pm, lib/HTML/WikiConverter/Dialects.pod, lib/HTML/WikiConverter/Normalizer.pm, t/00-load.t, t/01-wikiconverter.t, t/boilerplate.t, t/pod-coverage.t, t/pod.t
+UNKNOWN [1989, 1991 Free Software Foundation, Inc / the software, and]: LICENSE
Modified: trunk/libhtml-wikiconverter-perl/debian/patches/1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/patches/1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch?rev=20240&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/patches/1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch (original)
+++ trunk/libhtml-wikiconverter-perl/debian/patches/1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch Wed May 21 06:41:00 2008
@@ -1,7 +1,7 @@
Index: libhtml-wikiconverter-perl/lib/HTML/WikiConverter.pm
===================================================================
---- libhtml-wikiconverter-perl.orig/lib/HTML/WikiConverter.pm 2008-05-18 18:33:09.000000000 -0600
-+++ libhtml-wikiconverter-perl/lib/HTML/WikiConverter.pm 2008-05-18 18:40:48.000000000 -0600
+--- libhtml-wikiconverter-perl.orig/lib/HTML/WikiConverter.pm 2008-05-20 23:48:23.000000000 -0600
++++ libhtml-wikiconverter-perl/lib/HTML/WikiConverter.pm 2008-05-21 00:33:31.000000000 -0600
@@ -270,13 +270,8 @@
# Concatenate adjacent text nodes
$node->normalize_content();
Added: trunk/libhtml-wikiconverter-perl/debian/patches/1013-pod-note-about-splited-dialects.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/patches/1013-pod-note-about-splited-dialects.patch?rev=20240&op=file
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/patches/1013-pod-note-about-splited-dialects.patch (added)
+++ trunk/libhtml-wikiconverter-perl/debian/patches/1013-pod-note-about-splited-dialects.patch Wed May 21 06:41:00 2008
@@ -1,0 +1,14 @@
+Index: libhtml-wikiconverter-perl/lib/HTML/WikiConverter.pm
+===================================================================
+--- libhtml-wikiconverter-perl.orig/lib/HTML/WikiConverter.pm 2008-05-20 23:50:44.000000000 -0600
++++ libhtml-wikiconverter-perl/lib/HTML/WikiConverter.pm 2008-05-20 23:52:34.000000000 -0600
+@@ -67,6 +67,9 @@
+ for improvements, especially in the form of patches, are very much
+ appreciated.
+
++Since 0.50 version all dialects was separated from HTML:WikiConverter
++Please install the independ dialect modules as you need.
++
+ =head1 METHODS
+
+ =head2 new
Modified: trunk/libhtml-wikiconverter-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/patches/series?rev=20240&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/patches/series (original)
+++ trunk/libhtml-wikiconverter-perl/debian/patches/series Wed May 21 06:41:00 2008
@@ -1,1 +1,2 @@
1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch
+1013-pod-note-about-splited-dialects.patch
Modified: trunk/libhtml-wikiconverter-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-perl/debian/rules?rev=20240&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-perl/debian/rules (original)
+++ trunk/libhtml-wikiconverter-perl/debian/rules Wed May 21 06:41:00 2008
@@ -1,59 +1,30 @@
#!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
-# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
-# be used freely wherever it is useful.
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2007-2008 Jonas Smedegaard <dr at jones.dk>
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# 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 /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include debian/cdbs/1/rules/buildinfo.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+# Put perlmodule.mk after debhelper.mk to dh_clean temp files not in MANIFEST
+include /usr/share/cdbs/1/class/perlmodule.mk
-# If set to a true value then MakeMaker's prompt function will
-# always return the default without waiting for user input.
-export PERL_MM_USE_DEFAULT=1
+DEB_UPSTREAM_PACKAGE = HTML-WikiConverter
+DEB_UPSTREAM_URL = http://www.cpan.org/modules/by-module/HTML
+DEB_UPSTREAM_TARBALL_MD5 = ded45e93a28f6916b06859f7b31045e8
-PERL ?= /usr/bin/perl
-PACKAGE = $(shell dh_listpackages)
-TMP = $(CURDIR)/debian/$(PACKAGE)
+# Needed both by upstream build process and at runtime
+#TODO: Automatically include these to debian/control Depends: line
+dependencies = libhtml-tree-perl (>= 3.18), libcss-perl, liburi-perl (>= 1.35), libhtml-parser-perl, libhtml-tagset-perl, libparams-validate-perl (>= 0.77), libclass-data-accessor-perl (>= 0.02)
-build: build-stamp
-build-stamp:
- dh_testdir
- $(PERL) Makefile.PL INSTALLDIRS=vendor
- $(MAKE)
- $(MAKE) test
- touch $@
+# Needed by upstream build process
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), $(dependencies), libtest-simple-perl
+# Additional undocumented upstream needs
+#CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.04), libwww-perl
+#TODO: Solve building tests while libwww-perl is installed
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.04)
-clean:
- dh_testdir
- dh_testroot
- dh_clean build-stamp install-stamp
- [ ! -f Makefile ] || $(MAKE) realclean
-
-install: install-stamp
-install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
- [ ! -d $(TMP)/usr/lib/perl5 ] || \
- rmdir --ignore-fail-on-non-empty --parents --verbose \
- $(TMP)/usr/lib/perl5
- touch $@
-
-binary-arch:
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installchangelogs Changes
- dh_perl
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+# 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\|0.4.27-1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')
More information about the Pkg-perl-cvs-commits
mailing list