[Python-modules-commits] r6305 - in packages/python-feedvalidator/trunk/debian (6 files)

Fri Aug 22 16:28:06 UTC 2008

Date: Friday, August 22, 2008 @ 16:28:05
  Author: nslater-guest
Revision: 6305

more changes for initial version

Added:
  packages/python-feedvalidator/trunk/debian/manpages
Modified:
  packages/python-feedvalidator/trunk/debian/changelog
  packages/python-feedvalidator/trunk/debian/control
  packages/python-feedvalidator/trunk/debian/copyright
  packages/python-feedvalidator/trunk/debian/patches/command-options.patch
  packages/python-feedvalidator/trunk/debian/rules

Modified: packages/python-feedvalidator/trunk/debian/changelog
===================================================================

--- packages/python-feedvalidator/trunk/debian/changelog	2008-08-22 14:47:07 UTC (rev 6304)
+++ packages/python-feedvalidator/trunk/debian/changelog	2008-08-22 16:28:05 UTC (rev 6305)
@@ -1,5 +1,5 @@
-python-feedvalidator (0~svn1022-dfsg-0) experimental; urgency=low
+python-feedvalidator (0~svn1022-1) experimental; urgency=low
 
   * Initial release. Closes: #495940
 
- -- Noah Slater <nslater at bytesexual.org>  Fri, 22 Aug 2008 14:06:56 +0100
+ -- Noah Slater <nslater at bytesexual.org>  Fri, 22 Aug 2008 15:26:19 +0100

Modified: packages/python-feedvalidator/trunk/debian/control
===================================================================
--- packages/python-feedvalidator/trunk/debian/control	2008-08-22 14:47:07 UTC (rev 6304)
+++ packages/python-feedvalidator/trunk/debian/control	2008-08-22 16:28:05 UTC (rev 6305)
@@ -12,7 +12,7 @@
 
 Package: python-feedvalidator
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, ${misc:Depends}, python-libxml2, python-rdflib
 Description: library and tool for validating syndication feeds
  An advanced syndication feed validator that works with RSS, Atom and KML.
  .

Modified: packages/python-feedvalidator/trunk/debian/copyright
===================================================================
--- packages/python-feedvalidator/trunk/debian/copyright	2008-08-22 14:47:07 UTC (rev 6304)
+++ packages/python-feedvalidator/trunk/debian/copyright	2008-08-22 16:28:05 UTC (rev 6305)
@@ -34,31 +34,7 @@
  permitted in any medium without royalty provided the copyright notice and this
  notice are preserved.
 
-Files: fcgi.py
-Copyright: Copyright 2005, Allan Saddi <allan at saddi.com>
-License: BSD-2
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions 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 BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
-Files: src/feedvalidator/timeoutsocket.py
+Files: feedvalidator/timeoutsocket.py
 Copyright: Copyright 2001, Timothy O'Malley <timo at alum.mit.edu>
 License: MIT
  Permission to use, copy, modify, and distribute this software
@@ -78,34 +54,3 @@
  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
  ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  PERFORMANCE OF THIS SOFTWARE.
-
-Files: src/rdflib
-Copyright: Copyright 2005, Daniel Krech <http://eikeon.com/>
-License: BSD-3
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
-   * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
-   * Redistributions 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.
- .
-   * Neither the name of Daniel Krech nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Added: packages/python-feedvalidator/trunk/debian/manpages
===================================================================
--- packages/python-feedvalidator/trunk/debian/manpages	                        (rev 0)
+++ packages/python-feedvalidator/trunk/debian/manpages	2008-08-22 16:28:05 UTC (rev 6305)
@@ -0,0 +1 @@
+feedvalidator.1

Modified: packages/python-feedvalidator/trunk/debian/patches/command-options.patch
===================================================================
--- packages/python-feedvalidator/trunk/debian/patches/command-options.patch	2008-08-22 14:47:07 UTC (rev 6304)
+++ packages/python-feedvalidator/trunk/debian/patches/command-options.patch	2008-08-22 16:28:05 UTC (rev 6305)
@@ -1,6 +1,6 @@
-diff -Nur -x '*.orig' -x '*~' python-feedvalidator-0~svn1022-dfsg/src/demo.py python-feedvalidator-0~svn1022-dfsg.new/src/demo.py
---- python-feedvalidator-0~svn1022-dfsg/src/demo.py    2008-03-12 18:22:48.000000000 +0000
-+++ python-feedvalidator-0~svn1022-dfsg.new/src/demo.py        2008-08-22 14:45:03.000000000 +0100
+diff -Nur -x '*.orig' -x '*~' python-feedvalidator-0~svn1022-dfsg/demo.py python-feedvalidator-0~svn1022-dfsg.new/demo.py
+--- python-feedvalidator-0~svn1022-dfsg/demo.py    2008-03-12 18:22:48.000000000 +0000
++++ python-feedvalidator-0~svn1022-dfsg.new/demo.py        2008-08-22 14:45:03.000000000 +0100
 @@ -6,6 +6,7 @@
  __version__ = "$Revision: 988 $"
  __copyright__ = "Copyright (c) 2002 Sam Ruby and Mark Pilgrim"
@@ -36,9 +36,9 @@
 +        if opt in ("-h", "--help"):
 +            sys.stdout.write("""Usage: feedvalidator [OPTION] [FEED] [LEVEL]
 +
-+Validate a FEED as RSS, Atom or KML. The FEED can be a local or remote URI.
++Validate a feed as RSS, Atom or KML. The feed can be a local or remote URI.
 +
-+The optional LEVEL argument can be one of the following:
++The optional level argument can be one of the following:
 +
 +  A    basic level only
 +  AA   mimic the online validator (default)

Modified: packages/python-feedvalidator/trunk/debian/rules
===================================================================
--- packages/python-feedvalidator/trunk/debian/rules	2008-08-22 14:47:07 UTC (rev 6304)
+++ packages/python-feedvalidator/trunk/debian/rules	2008-08-22 16:28:05 UTC (rev 6305)
@@ -10,27 +10,36 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_ORIG_URI = http://feedvalidator.googlecode.com/svn/trunk/feedvalidator
+DEB_ORIG_URI = http://feedvalidator.googlecode.com/svn/trunk/feedvalidator/src
 DEB_ORIG_DIRECTORY = $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
 DEB_ORIG_FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-DEB_REPOS_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r "s/.*~svn([0-9]+).*/\1/")
+DEB_REPOS_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r "s/.*~svn//")
 
 # @@ workaround for #486848
 binary-arch binary-indep: build
 
+clean::
+	rm -rf feedvalidator.1
+
+cleanbuilddir::
+	sed -i -e "s/$(DEB_UPSTREAM_VERSION)/@version@/" demo.py
+
+post-patches::
+	sed -i -e "s/@version@/$(DEB_UPSTREAM_VERSION)/" demo.py
+
 common-install-prehook-impl::
-	sed "s/@version@/$(DEB_REPOS_VERSION)/" src/demo.py \
-	    > debian/python-feedvalidator/usr/bin/python-feedvalidator
-	cp -R src/* debian/python-feedvalidator/usr/share/python-support/python-feedvalidator
-	rm -f debian/python-feedvalidator/usr/share/python-support/python-feedvalidator/demo.py
+	cp -R feedvalidator \
+	    debian/python-feedvalidator/usr/share/python-support/python-feedvalidator
+	PYTHONPATH=debian/python-feedvalidator/usr/bin/python-feedvalidator \
+	help2man -N -n "a tool for validating syndication feeds" ./demo.py > feedvalidator.1
+	cp demo.py debian/python-feedvalidator/usr/bin/feedvalidator
 
+binary-install/python-feedvalidator::
+	dh_pysupport -ppython-feedvalidator
+
 # @@ only works from source directory, see #494141
 .PHONY: get-orig-source
 get-orig-source:
 	svn export -r $(DEB_REPOS_VERSION) $(DEB_ORIG_URI) $(DEB_ORIG_DIRECTORY)
-	rm -f $(DEB_ORIG_DIRECTORY)/runtest.py
-	rm -fr $(DEB_ORIG_DIRECTORY)/docs
-	rm -fr $(DEB_ORIG_DIRECTORY)/docs-xml
-	rm -fr $(DEB_ORIG_DIRECTORY)/testcases
 	tar -czf $(DEB_ORIG_FILENAME) $(DEB_ORIG_DIRECTORY)
 	rm -fr $(DEB_ORIG_DIRECTORY)


