[Python-modules-commits] [sqlobject] 10/12: merge patched into master

[Neil Muller]

This is an automated email from the git hooks/post-receive script.

drnlmza-guest pushed a commit to branch master
in repository sqlobject.

commit c9ca81c4395213009f1338d21e0ecea17ebfd53c
Merge: bb08f2d 00ca43b
Author: Neil <neil at dip.sun.ac.za>
Date:   Thu Oct 29 13:34:42 2015 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 .../0005-Remove-docs-from-installed-files.patch    | 44 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           | 21 -----------
 4 files changed, 47 insertions(+), 23 deletions(-)

diff --cc debian/.git-dpm
index e967a12,0000000..fd4282a
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 6df8b2fa22ee64be7093af035666a18645fb7e7b
- 6df8b2fa22ee64be7093af035666a18645fb7e7b
++00ca43b4d372272b3baf10ea6809fb626490233c
++00ca43b4d372272b3baf10ea6809fb626490233c
 +b0fc031ef948e5006e0776374d265fe894b73917
 +b0fc031ef948e5006e0776374d265fe894b73917
 +sqlobject_2.1.2.orig.tar.gz
 +831cd6b92cbad04c22036dcb2d327f69ab2e8913
 +888210
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0005-Remove-docs-from-installed-files.patch
index 0000000,0000000..2ac28fe
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-Remove-docs-from-installed-files.patch
@@@ -1,0 -1,0 +1,44 @@@
++From 00ca43b4d372272b3baf10ea6809fb626490233c Mon Sep 17 00:00:00 2001
++From: Neil <neil at dip.sun.ac.za>
++Date: Thu, 29 Oct 2015 13:33:31 +0200
++Subject: Remove docs from installed files
++
++We don't want to install the documentation in the package as well,
++since we already install it under /usr/share/doc, so we exclude
++it from setup.py
++---
++ setup.py | 21 ---------------------
++ 1 file changed, 21 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 31cc9e7..7108b20 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -77,27 +77,6 @@ and `GitHub <https://github.com/sqlobject>`_.
++       license="LGPL",
++       packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
++       scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],
++-      package_data={"sqlobject": [
++-                        "../docs/LICENSE", "../docs/*.txt", "../docs/*.css",
++-                        "../docs/html/*.html", "../docs/html/*.css",
++-                        "../docs/html/sqlobject/*.html",
++-                        "../docs/html/sqlobject/firebird/*.html",
++-                        "../docs/html/sqlobject/include/*.html",
++-                        "../docs/html/sqlobject/inheritance/*.html",
++-                        "../docs/html/sqlobject/manager/*.html",
++-                        "../docs/html/sqlobject/maxdb/*.html",
++-                        "../docs/html/sqlobject/mssql/*.html",
++-                        "../docs/html/sqlobject/mysql/*.html",
++-                        "../docs/html/sqlobject/postgres/*.html",
++-                        "../docs/html/sqlobject/rdbhost/*.html",
++-                        "../docs/html/sqlobject/sqlite/*.html",
++-                        "../docs/html/sqlobject/sybase/*.html",
++-                        "../docs/html/sqlobject/util/*.html",
++-                        "../docs/html/sqlobject/versioning/*.html",
++-                    ],
++-                    "sqlobject.include": ["pydispatch/README.txt"],
++-                    "sqlobject.maxdb": ["readme.txt"],
++-                   },
++       **kw
++       )
++ 
diff --cc debian/patches/series
index 40ceddd,0000000..5644b17
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,5 @@@
 +get_rid_of_setuptools
 +change_doc_build_script
 +remove_pkg_resources
 +replace_sf_logo
++0005-Remove-docs-from-installed-files.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sqlobject.git