[xml/sgml-commit] r1348 - in /packages/xmlroff/trunk/debian: README.Debian changelog control copyright rules xmlroff.docs

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Sun Feb 15 23:11:05 UTC 2009


Author: dleidert-guest
Date: Sun Feb 15 23:11:05 2009
New Revision: 1348

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


Added:
    packages/xmlroff/trunk/debian/README.Debian
      - copied unchanged from r1347, packages/xmlroff/branches/experimental/debian/README.Debian
    packages/xmlroff/trunk/debian/xmlroff.docs
      - copied unchanged from r1347, packages/xmlroff/branches/experimental/debian/xmlroff.docs
Modified:
    packages/xmlroff/trunk/debian/changelog
    packages/xmlroff/trunk/debian/control
    packages/xmlroff/trunk/debian/copyright
    packages/xmlroff/trunk/debian/rules

Modified: packages/xmlroff/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlroff/trunk/debian/changelog?rev=1348&op=diff
==============================================================================
--- packages/xmlroff/trunk/debian/changelog (original)
+++ packages/xmlroff/trunk/debian/changelog Sun Feb 15 23:11:05 2009
@@ -1,8 +1,24 @@
-xmlroff (0.6.0-2) UNRELEASED; urgency=low
+xmlroff (0.6.1-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
 
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Mon, 01 Dec 2008 01:23:23 +0100
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Mon, 01 Dec 2008 02:22:11 +0100
+
+xmlroff (0.6.1-1) experimental; urgency=low
+
+  * New upstream release 0.6.1.
+
+  * debian/control (Standards-Version): Bumped to 3.8.0.
+  * debian/copyright: Updated and fixed.
+  * debian/rules: Removed manual page related stuff (creatd by source).
+    (DEB_CONFIGURE_EXTRA_FLAGS): Disable gtk-doc and enable manual page
+    building.
+    (install): Remove the library documentation (closes: #492221).
+  * debian/xmlroff.docs: Added to install the users guide and the HTML version
+    of the manual page.
+  * debian/README.Debian: Added to inform about the fix for #492221.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Mon, 01 Dec 2008 01:35:18 +0100
 
 xmlroff (0.6.0-1.1) unstable; urgency=low
 

Modified: packages/xmlroff/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlroff/trunk/debian/control?rev=1348&op=diff
==============================================================================
--- packages/xmlroff/trunk/debian/control (original)
+++ packages/xmlroff/trunk/debian/control Sun Feb 15 23:11:05 2009
@@ -4,13 +4,13 @@
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
 Uploaders: W. Martin Borgert <debacle at debian.org>,
  Daniel Leidert (dale) <daniel.leidert at wgdd.de>
-Standards-Version: 3.7.3
-Build-Depends: autotools-dev, debhelper (>= 5), cdbs, libxslt1-dev,
- libgtk2.0-dev, libcairo2-dev, libpango1.0-dev, libgnomeprint2.2-dev,
- xsltproc, docbook-xsl, libcunit1-dev, xml-core
+Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5), autotools-dev, cdbs, docbook-xsl,
+ libcairo2-dev, libcunit1-dev, libgnomeprint2.2-dev, libpango1.0-dev,
+ libgtk2.0-dev, libxslt1-dev, xml-core, xsltproc
 Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlroff/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/xmlroff/trunk/
-Homepage: http://xmlroff.org/
+Homepage: http://xmlroff.org
 DM-Upload-Allowed: yes
 
 Package: xmlroff

Modified: packages/xmlroff/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlroff/trunk/debian/copyright?rev=1348&op=diff
==============================================================================
--- packages/xmlroff/trunk/debian/copyright (original)
+++ packages/xmlroff/trunk/debian/copyright Sun Feb 15 23:11:05 2009
@@ -1,42 +1,80 @@
 This package was debianized by W. Martin Borgert
 <debacle at debian.org> on Sat, 16 Jun 2007 21:03:12 +0000.
 
-Home page at http://xmlroff.org/.
+It was downloaded from:
+
+    http://xmlroff.org/
+
+Upstream Author:
+
+    Tony Graham <tkg at menteith.com>
 
 Copyright:
 
-Copyright (c) 2001, 2002 Sun Microsystems. All Rights Reserved.
-Copyright (c) 2007 Menteith Consulting
+    Copyright (C) 2001-2006 Sun Microsystems. All Rights Reserved.
+    Copyright (C) 2007,2008 Menteith Consulting Ltd.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+License: (BSD-3)
 
- - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
 
- - Redistribution in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the
-   distribution.
+     - Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
 
-Neither the name of Sun Microsystems or the names of contributors may
-be used to endorse or promote products derived from this software
-without specific prior written permission.
+     - Redistribution in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the
+       distribution.
 
-This software is provided "AS IS," without a warranty of any kind. ALL
-EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
-INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE OR NON INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
-MICROSYSTEMS AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES
-SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
-THE SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS OR
-ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
-DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
-DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
-ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN
-MICROSYSTEMS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+    -  Neither the name of Sun Microsystems or the names of contributors may
+       be used to endorse or promote products derived from this software
+       without specific prior written permission.
 
-You acknowledge that this Software is not designed, licensed or
-intended for use in the design, construction, operation or maintenance
-of any nuclear facility.
+    This software is provided "AS IS," without a warranty of any kind. ALL
+    EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+    INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+    PARTICULAR PURPOSE OR NON INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+    MICROSYSTEMS AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES
+    SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+    THE SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS OR
+    ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+    DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+    DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
+    ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN
+    MICROSYSTEMS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+    You acknowledge that this Software is not designed, licensed or
+    intended for use in the design, construction, operation or maintenance
+    of any nuclear facility.
+
+
+Copyright: libfo/expr/*
+
+    Copyright (C) 1998-2002 Daniel Veillard.
+    Copyright (C) 2001-2002 Sun Microsystems.
+
+License: libfo/expr/* (MIT)
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is fur-
+    nished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+    NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+    AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+    NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    Except as contained in this notice, the name of the authors shall not
+    be used in advertising or otherwise to promote the sale, use or other deal-
+    ings in this Software without prior written authorization from them.
+

Modified: packages/xmlroff/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlroff/trunk/debian/rules?rev=1348&op=diff
==============================================================================
--- packages/xmlroff/trunk/debian/rules (original)
+++ packages/xmlroff/trunk/debian/rules Sun Feb 15 23:11:05 2009
@@ -6,23 +6,16 @@
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-cunit
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-cunit --disable-gtk-doc --enable-man
 DEB_INSTALL_CHANGELOGS_ALL := NEWS
-DEB_INSTALL_MANPAGES_xmlroff := debian/xmlroff.1
 DEB_MAKE_INSTALL_TARGET += xmldir="\$$(datadir)/xml/libfo"
-
-debian/%.1 : docs/%.xml
-	xsltproc --nonet --novalid -o $(@D)/ $(DB2MAN) $<
-
-clean::
-	rm -f $(DEB_INSTALL_MANPAGES_xmlroff)
-
-common-build-arch:: $(DEB_INSTALL_MANPAGES_xmlroff)
 
 binary-install/xmlroff::
 	dh_installxmlcatalogs
 
-# remove libfo stuff - ATM no other package needs it
+# remove libfo and doc stuff - ATM no other package needs it
 install/xmlroff::
-	rm -r debian/xmlroff/usr/include/ debian/xmlroff/usr/lib/
-	rm debian/xmlroff/usr/share/xml/libfo/xmlroff.*
+	rm -rf debian/xmlroff/usr/include/ \
+	       debian/xmlroff/usr/lib/ \
+	       debian/xmlroff/usr/share/gtk-doc/ \
+	       debian/xmlroff/usr/share/xml/libfo/xmlroff.*




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