[xml/sgml-commit] r1340 - in /packages/libxml-encoding-perl/trunk: ./ bin/ debian/ maps/

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Sun Feb 15 19:30:56 UTC 2009


Author: dleidert-guest
Date: Sun Feb 15 19:30:56 2009
New Revision: 1340

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1340
Log:
Merge Sid with experimental.


Removed:
    packages/libxml-encoding-perl/trunk/Makefile.PL
    packages/libxml-encoding-perl/trunk/bin/
    packages/libxml-encoding-perl/trunk/debian/compile_encoding.1
    packages/libxml-encoding-perl/trunk/debian/libxml-encoding-perl.dirs
    packages/libxml-encoding-perl/trunk/debian/libxml-encoding-perl.manpages
    packages/libxml-encoding-perl/trunk/debian/make_encmap.1
    packages/libxml-encoding-perl/trunk/maps/
Modified:
    packages/libxml-encoding-perl/trunk/debian/changelog
    packages/libxml-encoding-perl/trunk/debian/control
    packages/libxml-encoding-perl/trunk/debian/copyright
    packages/libxml-encoding-perl/trunk/debian/libxml-encoding-perl.install
    packages/libxml-encoding-perl/trunk/debian/rules

Modified: packages/libxml-encoding-perl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml-encoding-perl/trunk/debian/changelog?rev=1340&op=diff
==============================================================================
--- packages/libxml-encoding-perl/trunk/debian/changelog (original)
+++ packages/libxml-encoding-perl/trunk/debian/changelog Sun Feb 15 19:30:56 2009
@@ -1,8 +1,60 @@
-libxml-encoding-perl (2.01-3) UNRELEASED; urgency=low
+libxml-encoding-perl (2.07-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
 
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Thu, 11 Sep 2008 15:25:31 +0200
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Fri, 30 Jan 2009 22:50:28 +0100
+
+libxml-encoding-perl (2.07-1) experimental; urgency=low
+
+  * New upstream release 2.07.
+    - Fixes a minor POD issue.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Fri, 30 Jan 2009 20:45:04 +0100
+
+libxml-encoding-perl (2.06-1) experimental; urgency=low
+
+  * New upstream release 2.06.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 25 Jan 2009 21:41:25 +0100
+
+libxml-encoding-perl (2.05-1) experimental; urgency=low
+
+  * New upstream release 2.05.
+    - Fixes shebang to be less specific (will be set correctly running make).
+
+  * debian/control (Build-Depends): Dropped dpatch.
+  * debian/rules: Ditto.
+    (build-stamp, install): Set MAN1EXT to be "1", not "1p".
+  * debian/patches/shebang_perl_path.dpatch: Dropped. Not necessary anymore.
+  * debian/patches/00list: Dropped empty file.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Fri, 12 Sep 2008 18:25:59 +0200
+
+libxml-encoding-perl (2.04-1) experimental; urgency=low
+
+  * New upstream release 2.04.
+    - Incorporates all changes to the maps done in the Debian package.
+      Dropping all map changes.
+
+  * debian/compile_encoding.1: Removed. Added upstream via POD.
+  * debian/make_encmap.1: Ditto.
+  * debian/libxml-encoding-perl.manpages: Ditto.
+
+  * debian/control: Removed duplicate fields.
+    (Build-Depends): Added dpatch.
+    (Standards-Version): Bumped to 3.8.0.
+    (Vcs-Browser, Vcs-Cvs): Fixed and replaced by Vcs-Svn.
+  * debian/copyright: Updated.
+  * debian/libxml-encoding-perl.dirs: Removed (useless).
+  * debian/libxml-encoding-perl.install: Adjusted to install the maps,
+    entity collections and DTDs.
+  * debian/rules: Added dpatch environment. Rewritten to be short and easy.
+  * debian/patches/shebang_perl_path.dpatch: Added.
+    - bin/compile_encoding: Fixed shebang.
+    - bin/make_encmap: Ditto.
+  * debian/patches/00list: Added and adjusted.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Fri, 12 Sep 2008 17:08:18 +0200
 
 libxml-encoding-perl (2.01-2) unstable; urgency=low
 

Modified: packages/libxml-encoding-perl/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml-encoding-perl/trunk/debian/control?rev=1340&op=diff
==============================================================================
--- packages/libxml-encoding-perl/trunk/debian/control (original)
+++ packages/libxml-encoding-perl/trunk/debian/control Sun Feb 15 19:30:56 2009
@@ -4,17 +4,15 @@
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
 Uploaders: Ardo van Rangelrooij <ardo at debian.org>,
  Daniel Leidert (dale) <daniel.leidert at wgdd.de>
-Vcs-Browser: http://alioth.debian.org/plugins/scmcvs/cvsweb.php/packages/libxml-encoding-perl/?cvsroot=debian-xml-sgml
-Vcs-Cvs: :pserver:anonymous at cvs.alioth.debian.org:/cvsroot/debian-xml-sgml/packages/libxml-encoding-perl
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Build-Depends: debhelper (>= 5.0)
 Build-Depends-Indep: perl, libxml-parser-perl
+Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml-encoding-perl/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/libxml-encoding-perl/trunk/
 Homepage: http://search.cpan.org/dist/XML-Encoding/
 DM-Upload-Allowed: yes
 
 Package: libxml-encoding-perl
-Section: perl
-Priority: optional
 Architecture: all
 Depends: ${perl:Depends}, libxml-parser-perl
 Description: Perl module for parsing encoding map XML files

Modified: packages/libxml-encoding-perl/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml-encoding-perl/trunk/debian/copyright?rev=1340&op=diff
==============================================================================
--- packages/libxml-encoding-perl/trunk/debian/copyright (original)
+++ packages/libxml-encoding-perl/trunk/debian/copyright Sun Feb 15 19:30:56 2009
@@ -1,26 +1,33 @@
 This package was debianized by Ardo van Rangelrooij <ardo at debian.org>
-on Sun, Aug 19, 2001, 13:30:41 -0500.
+on Sun, Aug 19, 2001, 13:30:41 -0500. It is currently co-maintained by
+the Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>.
 
-It was downloaded from the Comprehensive Perl Archive Network (CPAN).
-Visit <http://www.cpan.org/> to find a CPAN site near you.
+Download:
 
-Upstream Author: Clark Cooper <coopercc at netheaven.com>
+  It was downloaded from the Comprehensive Perl Archive Network (CPAN).
+  Visit <http://www.cpan.org/> to find a CPAN site near you.
+
+Upstream Authors:
+
+  Clark Cooper <coopercc at netheaven.com> (1.x)
+  Steve Hay <shay at cpan.org> (2.x)
 
 Copyright:
 
-Copyright (c) 1998 Clark Cooper <coopercc at netheaven.com>
-All rights reserved.
+  Copyright (C) 1998 Clark Cooper <coopercc at netheaven.com>
+  Copyright (C) 2007 Steve Hay <shay at cpan.org>
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of either:
+License: GPL-1+ | Artistic
 
-a) the GNU General Public License as published by the Free Software
-   Foundation; either version 1, or (at your option) any later
-   version, or
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of either:
 
-b) the "Artistic License" which comes with Perl.
+  a) the GNU General Public License as published by the Free Software
+     Foundation; either version 1, or (at your option) any later
+     version, or
 
-On a Debian system the complete text of the GNU General Public License
-can be found in the file `/usr/share/common-licenses/GPL' and the
-complete text of the the Artistic Licence can be found in the file
-`/usr/share/common-licenses/Artistic'.
+  b) the "Artistic License" which comes with Perl.
+
+On a Debian system the complete text of the above licenses can be found
+in the files `/usr/share/common-licenses/GPL'
+and '/usr/share/common-licenses/Artistic`

Modified: packages/libxml-encoding-perl/trunk/debian/libxml-encoding-perl.install
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml-encoding-perl/trunk/debian/libxml-encoding-perl.install?rev=1340&op=diff
==============================================================================
--- packages/libxml-encoding-perl/trunk/debian/libxml-encoding-perl.install (original)
+++ packages/libxml-encoding-perl/trunk/debian/libxml-encoding-perl.install Sun Feb 15 19:30:56 2009
@@ -1,2 +1,3 @@
-usr/bin
-usr/share
+maps/*.xml usr/share/libxml-encoding-perl/
+maps/*.ent usr/share/libxml-encoding-perl/
+maps/*.dtd usr/share/libxml-encoding-perl/

Modified: packages/libxml-encoding-perl/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml-encoding-perl/trunk/debian/rules?rev=1340&op=diff
==============================================================================
--- packages/libxml-encoding-perl/trunk/debian/rules (original)
+++ packages/libxml-encoding-perl/trunk/debian/rules Sun Feb 15 19:30:56 2009
@@ -1,102 +1,43 @@
 #!/usr/bin/make -f
-## ----------------------------------------------------------------------
-## debian/rules : package script for libxml-encoding-perl
-## ----------------------------------------------------------------------
-
-## ----------------------------------------------------------------------
-## uncomment this to turn on verbose mode
+#
 #export DH_VERBOSE=1
 
-## ----------------------------------------------------------------------
-MAPS		= \
-		big5 \
-		iso-8859-1 \
-		iso-8859-10 \
-		iso-8859-11 \
-		iso-8859-13 \
-		iso-8859-14 \
-		iso-8859-15 \
-		iso-8859-16 \
-		iso-8859-2 \
-		iso-8859-3 \
-		iso-8859-4 \
-		iso-8859-5 \
-		iso-8859-6 \
-		iso-8859-7 \
-		iso-8859-8 \
-		iso-8859-9 \
-		windows-1250 \
-		windows-1251 \
-		x-euc-jp-jisx0221 \
-		x-euc-jp-unicode \
-		x-sjis-cp932 \
-		x-sjis-jdk117 \
-		x-sjis-jisx0221 \
-		x-sjis-unicode \
+PACKAGE = libxml-encoding-perl
 
-ENTS		= \
-		kana-and-kanji \
-		oem \
-		x-euc-jp-part1 \
-		x-euc-jp-part2 \
-		x-euc-jp-part3 \
-		x-euc-jp-part4 \
-
-DTDS		= \
-		encmap \
-
-PKG		= $(shell dh_listpackages)
-
-MAP_DIR		= $(CURDIR)/debian/$(PKG)/usr/share/$(PKG)/
-ENT_DIR		= $(CURDIR)/debian/$(PKG)/usr/share/$(PKG)/
-DTD_DIR		= $(CURDIR)/debian/$(PKG)/usr/share/$(PKG)/
-
-## ----------------------------------------------------------------------
-TMP_DIR	:=	$(CURDIR)/debian/tmp
-
-## ----------------------------------------------------------------------
-CFLAGS	=	-Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-		CFLAGS	+= -O0
-else
-		CFLAGS	+= -O2
-endif
-
-## ----------------------------------------------------------------------
-## targets
+check: build
+	dh_testdir
+	dh_testroot
+	$(MAKE) test
 
 clean:
+	dh_testdir
+	dh_testroot
+	[ ! -f Makefile ] || $(MAKE) realclean
+	dh_clean build-stamp
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+	perl Makefile.PL INSTALLDIRS=vendor
+	$(MAKE) OPTIMIZE="$(CFLAGS)" MAN1EXT=1
+	touch $@
+
+install: build $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check) 
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/$(PACKAGE) PREFIX=/usr MAN1EXT=1
+
+binary: binary-indep binary-arch
+binary-arch: build install
+binary-indep: build install
 		dh_testdir
 		dh_testroot
-		[ ! -f Makefile ] || $(MAKE) realclean
-		dh_clean build-stamp install-stamp
-
-build:		build-stamp
-build-stamp:
-		dh_testdir
-		perl Makefile.PL INSTALLDIRS=vendor
-		$(MAKE) OPTIMIZE="$(CFLAGS)"
-		$(MAKE) test
-		touch build-stamp
-
-install:	install-stamp
-install-stamp:	build
-		dh_testdir
-		dh_testroot
-		dh_clean -k
-		dh_installdirs
-		$(MAKE) install DESTDIR=$(TMP_DIR) PREFIX=/usr
-		touch install-stamp
-
-binary-indep:	build install
-		dh_testdir
-		dh_testroot
-		dh_install --sourcedir=$(TMP_DIR)
+		dh_installchangelogs Changes
 		dh_installdocs
-		dh_installchangelogs Changes
-		$(foreach map,$(MAPS),install -m 644 maps/$(map).xml $(MAP_DIR);)
-		$(foreach ent,$(ENTS),install -m 644 maps/$(ent).ent $(ENT_DIR);)
-		$(foreach dtd,$(DTDS),install -m 644 maps/$(dtd).dtd $(DTD_DIR);)
+		dh_install
+		chmod 644 $(CURDIR)/debian/$(PACKAGE)/usr/share/libxml-encoding-perl/*.*
 		dh_installman
 		dh_compress
 		dh_fixperms
@@ -106,10 +47,4 @@
 		dh_md5sums
 		dh_builddeb
 
-binary-arch:
-
-binary:		binary-indep binary-arch
-
-.PHONY:		clean build install binary-indep binary-arch binary
-
-## ----------------------------------------------------------------------
+.PHONY: binary binary-arch binary-indep build clean install




More information about the debian-xml-sgml-commit mailing list