[Python-modules-commits] [sqlobject] 10/15: Split package and include python3 version

Neil Muller drnlmza-guest at moszumanska.debian.org
Wed Jun 29 15:11:07 UTC 2016


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

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

commit b90da1c96b1fa9b3363c71adedd60eadb53b9fa5
Author: Neil Muller <drnlmuller+debian at gmail.com>
Date:   Wed Jun 29 15:09:37 2016 +0200

    Split package and include python3 version
---
 debian/control                                     | 32 +++++++++++-----------
 debian/python-sqlobject-bin.install                |  2 ++
 debian/{manpages => python-sqlobject-bin.manpages} |  0
 debian/{doc-base => python-sqlobject-doc.doc-base} |  4 +--
 debian/{docs => python-sqlobject-doc.docs}         |  0
 debian/{examples => python-sqlobject-doc.examples} |  0
 debian/python-sqlobject.install                    |  2 ++
 debian/{preinst => python-sqlobject.preinst}       |  0
 debian/python3-sqlobject.install                   |  2 ++
 9 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index a2c5ff0..eb7e01c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,10 @@ Build-Depends: debhelper (>= 8.1),
                dh-python,
                python-all (>= 2.7.3-4),
                python-formencode,
-               python-pydispather,
+               python-pydispatch,
                python3-all,
                python3-formencode,
-               python3-pydispather,
+               python3-pydispatch,
 # Documentation
                python-docutils,
 # Used in the test suite
@@ -25,17 +25,17 @@ Homepage: http://www.sqlobject.org
 Package: python-sqlobject
 Architecture: all
 Depends: python-formencode,
-         python-pydispather,
+         python-pydispatch,
          python-pkg-resources (>=0.6c8),
-         python-sqlobject-common (= ${source:Version}),
          ${misc:Depends},
          ${python:Depends}
+Recommends: python-sqlobject-bin (= ${source:Version})
 Suggests: python-fdb,
           python-mysqldb,
           python-psycopg2,
           python-sqlite,
           python-sqlobject-doc
-Description: object relational manager providing an object interface to your database (Python 2 version)
+Description: Python 2 object relational manager providing an object interface to databases
  SQLObject is an object-relational mapper. It allows you to translate RDBMS
  table rows into Python objects, and manipulate those objects to transparently
  manipulate the database.
@@ -56,15 +56,15 @@ Description: object relational manager providing an object interface to your dat
 Package: python3-sqlobject
 Architecture: all
 Depends: python3-formencode,
-         python3-pydispather,
+         python3-pydispatch,
          python3-pkg-resources (>=0.6c8),
-         python-sqlobject-common (= ${source:Version}),
          ${misc:Depends},
          ${python:Depends}
+Recommends: python-sqlobject-bin (= ${source:Version})
 Suggests: python3-mysqldb,
           python3-psycopg2,
           python-sqlobject-doc
-Description: object relational manager providing an object interface to your database (Python 3 version)
+Description: Python 3 object relational manager providing an object interface to databases
  SQLObject is an object-relational mapper. It allows you to translate RDBMS
  table rows into Python objects, and manipulate those objects to transparently
  manipulate the database.
@@ -83,11 +83,12 @@ Description: object relational manager providing an object interface to your dat
  This is the Python 3 version of SQLObject.
 
 Package: python-sqlobject-doc
+Section: doc
 Architecture: all
 Depends: ${misc:Depends},
          ${python:Depends}
-Description: Documentation for SQLObject, an object relational manager providing an object interface to your database
- This is the documenation for SQLObject. SQLObject is an object-relational
+Description: Documentation for SQLObject, a Python object relational manager for databases
+ This is the documentation for SQLObject. SQLObject is an object-relational
  mapper. It allows you to translate RDBMS table rows into Python objects, and
  manipulate those objects to transparently manipulate the database.
  .
@@ -105,12 +106,12 @@ Description: Documentation for SQLObject, an object relational manager providing
  The documentation covers both the Python 2 and Python 3 versions of
  SQLObject.
 
-Package: python-sqlobject-common
+Package: python-sqlobject-bin
 Architecture: all
-Depends: ${misc:Depends},
+Depends: python3-sqlobject (= ${source:Version}),
+         ${misc:Depends},
          ${python:Depends}
-Recommends: python-sqlobject | python3-sqlobject
-Description: Common files for SQLObject, an object relational manager providing an object interface to your database
+Description: Helper applications for SQLObject, a Python ORM
  SQLObject is an object-relational mapper. It allows you to translate RDBMS
  table rows into Python objects, and manipulate those objects to transparently
  manipulate the database.
@@ -126,5 +127,4 @@ Description: Common files for SQLObject, an object relational manager providing
  Python syntax and objects (instead of generating SQL using string
  substitution, as is traditional).
  .
- This package includes manual pages and other data filescommon to both the
- Python 2 and Python 3 versions of SQLObject.
+ This package includes helper applications for use with SQLObject.
diff --git a/debian/python-sqlobject-bin.install b/debian/python-sqlobject-bin.install
new file mode 100644
index 0000000..7742b2a
--- /dev/null
+++ b/debian/python-sqlobject-bin.install
@@ -0,0 +1,2 @@
+/usr/bin/sqlobject-admin
+/usr/bin/sqlobject-convertOldURI
diff --git a/debian/manpages b/debian/python-sqlobject-bin.manpages
similarity index 100%
rename from debian/manpages
rename to debian/python-sqlobject-bin.manpages
diff --git a/debian/doc-base b/debian/python-sqlobject-doc.doc-base
similarity index 70%
rename from debian/doc-base
rename to debian/python-sqlobject-doc.doc-base
index bf695ce..88980eb 100644
--- a/debian/doc-base
+++ b/debian/python-sqlobject-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: Documentation and FAQ about using SQLObject. Includes detailed
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/python-sqlobject/index.html
-Files: /usr/share/doc/python-sqlobject/*.html
+Index: /usr/share/doc/python-sqlobject-doc/index.html
+Files: /usr/share/doc/python-sqlobject-doc/*.html
diff --git a/debian/docs b/debian/python-sqlobject-doc.docs
similarity index 100%
rename from debian/docs
rename to debian/python-sqlobject-doc.docs
diff --git a/debian/examples b/debian/python-sqlobject-doc.examples
similarity index 100%
rename from debian/examples
rename to debian/python-sqlobject-doc.examples
diff --git a/debian/python-sqlobject.install b/debian/python-sqlobject.install
new file mode 100644
index 0000000..f4e6171
--- /dev/null
+++ b/debian/python-sqlobject.install
@@ -0,0 +1,2 @@
+/usr/lib/python2.7/dist-packages/SQLObject*.egg-info
+/usr/lib/python2.7/dist-packages/sqlobject
diff --git a/debian/preinst b/debian/python-sqlobject.preinst
similarity index 100%
rename from debian/preinst
rename to debian/python-sqlobject.preinst
diff --git a/debian/python3-sqlobject.install b/debian/python3-sqlobject.install
new file mode 100644
index 0000000..2d9c36e
--- /dev/null
+++ b/debian/python3-sqlobject.install
@@ -0,0 +1,2 @@
+/usr/lib/python3.*/dist-packages/SQLObject*.egg-info
+/usr/lib/python3.*/dist-packages/sqlobject

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



More information about the Python-modules-commits mailing list