[Python-modules-commits] r26924 - in packages/python-twitter/trunk/debian (10 files)
vbkaisetsu-guest at users.alioth.debian.org
vbkaisetsu-guest at users.alioth.debian.org
Mon Dec 30 13:03:16 UTC 2013
Date: Monday, December 30, 2013 @ 13:03:14
Author: vbkaisetsu-guest
Revision: 26924
update for python-twitter 1.1+git20131227-1
Added:
packages/python-twitter/trunk/debian/python-twitter-doc.doc-base
packages/python-twitter/trunk/debian/python-twitter-doc.docs
packages/python-twitter/trunk/debian/python-twitter.dirs
packages/python-twitter/trunk/debian/python-twitter.install
packages/python-twitter/trunk/debian/python-twitter.manpages
Modified:
packages/python-twitter/trunk/debian/changelog
packages/python-twitter/trunk/debian/control
packages/python-twitter/trunk/debian/patches/10_fix_shebang.patch
packages/python-twitter/trunk/debian/patches/20_remove_simplejson.patch
packages/python-twitter/trunk/debian/rules
Modified: packages/python-twitter/trunk/debian/changelog
===================================================================
--- packages/python-twitter/trunk/debian/changelog 2013-12-30 12:27:14 UTC (rev 26923)
+++ packages/python-twitter/trunk/debian/changelog 2013-12-30 13:03:14 UTC (rev 26924)
@@ -1,3 +1,20 @@
+python-twitter (1.1+git20131227-1) unstable; urgency=medium
+
+ * New upstream release
+ - with the newest revision
+ * debian/control
+ - split the documentation to python-twitter-doc package
+ - dependencies:
+ - remove: python-oauth2
+ - add: python-requests-oauthlib, python-sphinx
+ * debian/patches/*.patch
+ - update for new release
+ * debian/rules
+ - build sphinx documents on build time
+ - add get-orig-source target
+
+ -- Koichi Akabe <vbkaisetsu at gmail.com> Mon, 30 Dec 2013 11:14:50 +0900
+
python-twitter (1.0-1) unstable; urgency=low
* New upstream release (Closes: #712416)
Modified: packages/python-twitter/trunk/debian/control
===================================================================
--- packages/python-twitter/trunk/debian/control 2013-12-30 12:27:14 UTC (rev 26923)
+++ packages/python-twitter/trunk/debian/control 2013-12-30 13:03:14 UTC (rev 26924)
@@ -3,20 +3,35 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Koichi Akabe <vbkaisetsu at gmail.com>
-Build-Depends: debhelper (>= 9.0.0), python (>= 2.6.6-3), python-setuptools, python-oauth2
-Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 9.0.0), python (>= 2.7), python-setuptools, python-requests-oauthlib, python-sphinx
+Standards-Version: 3.9.5
Homepage: https://github.com/bear/python-twitter
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-twitter/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-twitter/trunk/
-X-Python-Version: >= 2.6
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-twitter/trunk/
+X-Python-Version: >= 2.7
Package: python-twitter
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}
-Suggests: www-browser
+Suggests: www-browser, python-twitter-doc
Description: Twitter API wrapper for Python
This library provides a pure Python interface for the Twitter API.
.
Twitter provides a service that allows people to connect via the web, IM, and
SMS. Twitter exposes a web services API (http://twitter.com/help/api) and this
library is intended to make it even easier for Python programmers to use.
+
+Package: python-twitter-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Replaces: python-twitter (<< 1.1+git20131227-1)
+Breaks: python-twitter (<< 1.1+git20131227-1)
+Description: Twitter API wrapper for Python: documentation files
+ This library provides a pure Python interface for the Twitter API.
+ .
+ Twitter provides a service that allows people to connect via the web, IM, and
+ SMS. Twitter exposes a web services API (http://twitter.com/help/api) and this
+ library is intended to make it even easier for Python programmers to use.
+ .
+ This package contains documentation files.
Modified: packages/python-twitter/trunk/debian/patches/10_fix_shebang.patch
===================================================================
--- packages/python-twitter/trunk/debian/patches/10_fix_shebang.patch 2013-12-30 12:27:14 UTC (rev 26923)
+++ packages/python-twitter/trunk/debian/patches/10_fix_shebang.patch 2013-12-30 13:03:14 UTC (rev 26924)
@@ -1,8 +1,6 @@
Description: fix shebang of python scripts
- Scripts specify python2.4 as a shebang. This patch remove version
- numbers from executable scripts and remove shebangs from non-executable
- scripts.
-Last-Update: 2013-06-20
+ This patch removes shebangs from non-executable scripts.
+Last-Update: 2013-12-30
--- python-twitter-1.0.orig/twitter.py
+++ python-twitter-1.0/twitter.py
@@ -11,27 +9,3 @@
#
# vim: sw=2 ts=2 sts=2
#
---- python-twitter-1.0.orig/setup.py
-+++ python-twitter-1.0/setup.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.4
-+#!/usr/bin/python
- #
- # Copyright 2007-2013 The Python-Twitter Developers
- #
---- python-twitter-1.0.orig/examples/tweet.py
-+++ python-twitter-1.0/examples/tweet.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.4
-+#!/usr/bin/python
-
- '''Post a message to twitter'''
-
---- python-twitter-1.0.orig/examples/twitter-to-xhtml.py
-+++ python-twitter-1.0/examples/twitter-to-xhtml.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.4
-+#!/usr/bin/python
-
- '''Load the latest update for a Twitter user and leave it in an XHTML fragment'''
-
Modified: packages/python-twitter/trunk/debian/patches/20_remove_simplejson.patch
===================================================================
--- packages/python-twitter/trunk/debian/patches/20_remove_simplejson.patch 2013-12-30 12:27:14 UTC (rev 26923)
+++ packages/python-twitter/trunk/debian/patches/20_remove_simplejson.patch 2013-12-30 13:03:14 UTC (rev 26924)
@@ -9,8 +9,8 @@
# Extra package metadata to be used only if setuptools is installed
SETUPTOOLS_METADATA = dict(
-- install_requires = ['setuptools', 'simplejson', 'oauth2'],
-+ install_requires = ['setuptools', 'oauth2'],
+- install_requires = ['setuptools', 'simplejson', 'requests', 'requests_oauthlib'],
++ install_requires = ['setuptools', 'requests', 'requests_oauthlib'],
include_package_data = True,
classifiers = [
'Development Status :: 5 - Production/Stable',
Added: packages/python-twitter/trunk/debian/python-twitter-doc.doc-base
===================================================================
--- packages/python-twitter/trunk/debian/python-twitter-doc.doc-base (rev 0)
+++ packages/python-twitter/trunk/debian/python-twitter-doc.doc-base 2013-12-30 13:03:14 UTC (rev 26924)
@@ -0,0 +1,9 @@
+Document: python-twitter
+Title: Python module twitter
+Author: python-twitter at googlegroups.com
+Abstract: Manual for python-twitter
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/python-twitter-doc/html/index.html
+Files: /usr/share/doc/python-twitter-doc/html/*.html
Added: packages/python-twitter/trunk/debian/python-twitter-doc.docs
===================================================================
--- packages/python-twitter/trunk/debian/python-twitter-doc.docs (rev 0)
+++ packages/python-twitter/trunk/debian/python-twitter-doc.docs 2013-12-30 13:03:14 UTC (rev 26924)
@@ -0,0 +1 @@
+doc/_build/html/
Added: packages/python-twitter/trunk/debian/python-twitter.dirs
===================================================================
--- packages/python-twitter/trunk/debian/python-twitter.dirs (rev 0)
+++ packages/python-twitter/trunk/debian/python-twitter.dirs 2013-12-30 13:03:14 UTC (rev 26924)
@@ -0,0 +1 @@
+usr/bin
Added: packages/python-twitter/trunk/debian/python-twitter.install
===================================================================
--- packages/python-twitter/trunk/debian/python-twitter.install (rev 0)
+++ packages/python-twitter/trunk/debian/python-twitter.install 2013-12-30 13:03:14 UTC (rev 26924)
@@ -0,0 +1 @@
+usr/lib
Added: packages/python-twitter/trunk/debian/python-twitter.manpages
===================================================================
--- packages/python-twitter/trunk/debian/python-twitter.manpages (rev 0)
+++ packages/python-twitter/trunk/debian/python-twitter.manpages 2013-12-30 13:03:14 UTC (rev 26924)
@@ -0,0 +1,2 @@
+debian/twitter-to-xhtml.1
+debian/tweet.1
Modified: packages/python-twitter/trunk/debian/rules
===================================================================
--- packages/python-twitter/trunk/debian/rules 2013-12-30 12:27:14 UTC (rev 26923)
+++ packages/python-twitter/trunk/debian/rules 2013-12-30 13:03:14 UTC (rev 26924)
@@ -1,8 +1,12 @@
#!/usr/bin/make -f
%:
- dh "$@" --with python2 --buildsystem=python_distutils
+ dh "$@" --with python2,sphinxdoc --buildsystem=python_distutils
+override_dh_auto_build:
+ dh_auto_build
+ cd $(CURDIR)/doc && $(MAKE) html
+
override_dh_auto_install:
dh_auto_install
install -m 755 $(CURDIR)/examples/tweet.py $(CURDIR)/debian/python-twitter/usr/bin/tweet
@@ -10,4 +14,42 @@
override_dh_auto_clean:
dh_auto_clean
+ cd $(CURDIR)/doc && $(MAKE) clean
rm -rf $(CURDIR)/python_twitter.egg-info
+
+override_dh_compress:
+ dh_compress -X.js -X.inv
+
+override_dh_sphinxdoc:
+ (! test -d $(CURDIR)/debian/python-twitter-doc || dh_sphinxdoc)
+
+PKD = $(abspath $(dir $(MAKEFILE_LIST)))
+PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
+VER = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
+
+## http://wiki.debian.org/onlyjob/get-orig-source
+.PHONY: get-orig-source
+get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE))
+ @
+
+UURL = git://github.com/bear/python-twitter.git
+UDATE = $(shell date --rfc-3339=seconds --date='TZ="UTC" $(shell echo $(VER) | perl -ne 'print "$$1-$$2-$$3" if m/\+(?:git|svn|hg)(\d{4})(\d{2})(\d{2})/')')
+$(PKG)_$(VER)$(DTYPE).orig.tar.xz: $(info I: UDATE=$(UDATE))
+ $(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..))
+ @echo "# Downloading..."
+ git clone $(UURL) $(PKG)-$(VER) \
+ || $(RM) -r $(PKG)-$(VER)
+ cd $(PKG)-$(VER) \
+ && git checkout v$(VER) || git checkout $$(git log -n1 --format=%h --before="$(UDATE)") \
+ && [ -s ChangeLog ] || ( echo "# Generating ChangeLog..." \
+ ; git log --pretty="format:%ad %aN <%aE>%n%n%x09* %s%n" --date=short > ChangeLog \
+ ; touch -d "$$(git log -1 --format='%ci')" ChangeLog) \
+ && echo "# Setting times..." \
+ && for F in $$(git ls-tree -r --name-only HEAD); do touch --no-dereference -d "$$(git log -1 --format="%ai" -- $$F)" "$$F"; done \
+ && echo "# Cleaning-up..." \
+ && $(RM) -r simplejson doc/_build \
+ && $(RM) -r .git .git*
+ @echo "# Packing..."
+ find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
+ | XZ_OPT="-6v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
+ && $(RM) -r "$(PKG)-$(VER)"
More information about the Python-modules-commits
mailing list