r44990 - in /trunk/libhtml-wikiconverter-markdown-perl/debian: changelog compat control copyright patches/series rules
ghostbar at users.alioth.debian.org
ghostbar at users.alioth.debian.org
Mon Sep 28 00:58:39 UTC 2009
Author: ghostbar
Date: Mon Sep 28 00:58:29 2009
New Revision: 44990
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=44990
Log:
Disabled patches
Updated debian/rules to dh7 and updated versioned debhelper to >=7
Modified:
trunk/libhtml-wikiconverter-markdown-perl/debian/changelog
trunk/libhtml-wikiconverter-markdown-perl/debian/compat
trunk/libhtml-wikiconverter-markdown-perl/debian/control
trunk/libhtml-wikiconverter-markdown-perl/debian/copyright
trunk/libhtml-wikiconverter-markdown-perl/debian/patches/series
trunk/libhtml-wikiconverter-markdown-perl/debian/rules
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/changelog?rev=44990&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/changelog (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/changelog Mon Sep 28 00:58:29 2009
@@ -1,5 +1,9 @@
libhtml-wikiconverter-markdown-perl (0.05-1) UNRELEASED; urgency=low
+ Thinking on removing patches, there are now better ways to migrate to ikiwiki
+ than this module and those patches. Wrote already to Jonas.
+ -- Jose Luis Rivas
+
[ gregor herrmann <gregoa at debian.org> ]
* Add debian/README.source to document quilt usage, as required by
Debian Policy since 3.8.0.
@@ -46,6 +50,8 @@
* Removed patch 1011 and added 1011-2 to accomplish with new sources.
* Updated patch 1012 to accomplish with new sources.
* Updated version of libhtml-wikiconverter-perl to >= 0.67.
+ * debian/control: versioned debhelper to >= 7
+ * Updated debian/rules to dh7.
-- Jose Luis Rivas <ghostbar at debian.org> Sat, 26 Sep 2009 22:12:57 -0430
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/compat?rev=44990&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/compat (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/compat Mon Sep 28 00:58:29 2009
@@ -1,1 +1,1 @@
-6
+7
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/control?rev=44990&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/control (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/control Mon Sep 28 00:58:29 2009
@@ -1,10 +1,10 @@
Source: libhtml-wikiconverter-markdown-perl
Section: perl
Priority: optional
-Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), dh-buildinfo, debhelper (>= 5.0.44), perl, libhtml-wikiconverter-perl (>= 0.67), 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 (>= 7), perl, libhtml-wikiconverter-perl (>= 0.67), 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.3
+Standards-Version: 3.8.3
Homepage: http://diberri.dyndns.org/wikipedia/html2wiki/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/copyright?rev=44990&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/copyright (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/copyright Mon Sep 28 00:58:29 2009
@@ -1,42 +1,35 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=413
-Upstream-Name: HTML::WikiConverter::Markdown
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
Upstream-Maintainer: David J. Iberri <diberri at cpan.org>
-Upstream-Source: http://www.cpan.org/modules/by-module/HTML/
+Upstream-Source: http://search.cpan.org/dist/HTML-WikiConverter-Markdown/
+Upstream-Name: HTML-WikiConverter-Markdown
+Disclaimer: This copyright info was automatically extracted
+ from the perl module. It may not be accurate, so you better
+ check the module sources in order to ensure the module for its
+ inclusion in Debian or for general legal information. Please,
+ if licensing information is incorrectly generated, file a bug
+ on dh-make-perl.
Files: *
-Copyright: © 2006 David J. Iberri <diberri at cpan.org>
-License: GPL | Artistic
- This library is free software; you can redistribute it and/or modify
- it under the same terms as Perl itself.
- .
- Perl is distributed under your choice of the GNU General Public License
- or the Artistic License.
+Copyright: David J. Iberri <diberri at cpan.org>
+License-Alias: Perl
+License: Artistic | GPL-1+
Files: debian/*
-Copyright: © 2007-2008 Jonas Smedegaard <dr at jones.dk>
-License: GPL-2+
-
-Files: debian/cdbs/1/rules/buildinfo.mk
-Copyright: 2004-2007, Jonas Smedegaard <dr at jones.dk>
-License: GPL-2+
-
-Files: debian/cdbs/1/rules/package-relations.mk
-Copyright: 2008, Jonas Smedegaard <dr at jones.dk>
-License: GPL-2+
-
-Files: debian/cdbs/1/rules/copyright-check.mk
-Copyright: 2005-2008, Jonas Smedegaard <dr at jones.dk>
-License: GPL-2+
-
-License: GPL
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
-
-License: GPL-2+
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License version 2 can be found in
- `/usr/share/common-licenses/GPL-2'.
+Copyright: 2007, 2008, Jonas Smedegaard <dr at jones.dk>
+ 2009, Jose Luis Rivas <ghostbar at debian.org>
+License: Artistic | GPL-1+
License: Artistic
- On Debian GNU/Linux systems, the complete text of the Artistic
- License can be found in `/usr/share/common-licenses/Artistic'.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
+
+License: GPL-1+
+ 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 1, or (at your option)
+ any later version.
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/patches/series?rev=44990&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/patches/series (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/patches/series Mon Sep 28 00:58:29 2009
@@ -1,17 +1,17 @@
-1001-Add-support-for-ikiwiki-links-if-wiki-uri-is-specified.patch
-1001-and-1012-2-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch
-1002-Use-syntax-for-mailto-URLs-with-the-email-as-link-text.patch
-1003-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch
-1003-2-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch
-1004-Preserve-all-unsupported-inline-elements.patch
-1005-A-markdown-pre-block-will-escape-markdown-or-markup-so-output-pre-s-with-child-elements-as-HTML.patch
-1006-Output-all-unknown-block-level-elements-and-their-descendants-unchanged.patch
-1007-Remove-special-handling-for-tables-now-subsumed-by-general-block-element-handling.patch
-1008-Use-HTML-for-a-with-name-attr-or-child-elements-preserve-markdown-inside-a.patch
-1009-Avoid-using-an-uninitialized-value-if-code-has-no-backquotes-inside.patch
-1010-Strip-formatting-inside-wiki-links.-Markdown-links-can-have-formatting-so-stop-using-a-for-that.patch
-1011-2-Handle-tt-the-same-as-code.patch
-1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch
-1013-Allow-passing-through-raw-markdown-syntax-wrapped-in-markdown-tags.patch
-1014-Some-entity-handling-and-refactoring.patch
-1015_Adjust_tests_for_changed_block_handling_in_patches_1006-1007.patch
+#1001-Add-support-for-ikiwiki-links-if-wiki-uri-is-specified.patch
+#1001-and-1012-2-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch
+#1002-Use-syntax-for-mailto-URLs-with-the-email-as-link-text.patch
+#1003-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch
+#1003-2-Use-indentation-for-pre-blocks-handle-code-blocks-with-in-them.patch
+#1004-Preserve-all-unsupported-inline-elements.patch
+#1005-A-markdown-pre-block-will-escape-markdown-or-markup-so-output-pre-s-with-child-elements-as-HTML.patch
+#1006-Output-all-unknown-block-level-elements-and-their-descendants-unchanged.patch
+#1007-Remove-special-handling-for-tables-now-subsumed-by-general-block-element-handling.patch
+#1008-Use-HTML-for-a-with-name-attr-or-child-elements-preserve-markdown-inside-a.patch
+#1009-Avoid-using-an-uninitialized-value-if-code-has-no-backquotes-inside.patch
+#1010-Strip-formatting-inside-wiki-links.-Markdown-links-can-have-formatting-so-stop-using-a-for-that.patch
+#1011-2-Handle-tt-the-same-as-code.patch
+#1012-Allow-and-use-rules-for-text-nodes-as-an-alternative-to-escaping-in-preprocessing.patch
+#1013-Allow-passing-through-raw-markdown-syntax-wrapped-in-markdown-tags.patch
+#1014-Some-entity-handling-and-refactoring.patch
+#1015_Adjust_tests_for_changed_block_handling_in_patches_1006-1007.patch
Modified: trunk/libhtml-wikiconverter-markdown-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-wikiconverter-markdown-perl/debian/rules?rev=44990&op=diff
==============================================================================
--- trunk/libhtml-wikiconverter-markdown-perl/debian/rules (original)
+++ trunk/libhtml-wikiconverter-markdown-perl/debian/rules Mon Sep 28 00:58:29 2009
@@ -1,36 +1,32 @@
#!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2007-2008 Jonas Smedegaard <dr at jones.dk>
-# See debian/README.cdbs-tweaks for info on local overrides
-ifneq (,$(DEB_MAINTAINER_MODE))
- # Enable stuff not policy compliant (eg. unsuitable for build daemons)
- DEB_COPYRIGHT_CHECK_STRICT = yes
- DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes
+USES_QUILT := $(shell if [ -f $(CURDIR)/debian/patches/series ]; then echo yes; else echo no; fi)
+ifeq ($(USES_QUILT),yes)
+ include /usr/share/quilt/quilt.make
+
+ PATCH_TARGET := $(QUILT_STAMPFN)
+ UNPATCH_TARGET := unpatch
endif
-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
-DEB_UPSTREAM_PACKAGE = HTML-WikiConverter-Markdown
-DEB_UPSTREAM_URL = http://www.cpan.org/modules/by-module/HTML
-DEB_UPSTREAM_TARBALL_MD5 = bd0d3f9b2a561ee1e1f526f823cfea6e
+build: build-stamp
+build-stamp: $(PATCH_TARGET)
+ dh build
+ touch $@
-# Tests 4 and 5 started failing between 20080628 and 20080711
-DEB_MAKE_CHECK_TARGET =
+clean: $(UNPATCH_TARGET)
+ dh $@
-# Needed both by upstream build process and at runtime
-CDBS_DEPENDS = libhtml-wikiconverter-perl (>= 0.63), libhtml-tagset-perl, libparams-validate-perl, liburi-perl
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), $(CDBS_DEPENDS)
+install: install-stamp
+install-stamp: build-stamp
+ dh install
+ touch $@
-# Needed by upstream build process
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libtest-simple-perl
-# Additional undocumented upstream needs
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libfile-spec-perl, libhtml-parser-perl, libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.04)
+binary-arch: install
+ dh $@
-# Resolve, cleanup and apply CDBS-declared dependencies
-include debian/cdbs/1/rules/package-relations.mk
+binary-indep: install
+ dh $@
+
+binary: binary-arch binary-indep
+
+.PHONY: binary binary-arch binary-indep install clean build
More information about the Pkg-perl-cvs-commits
mailing list