[27550] in Source-Commits

home help back first fref pref prev next nref lref last post

locker-support commit: Add packaging for scripts

daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Dec 18 12:15:00 2013

Date: Wed, 18 Dec 2013 12:14:54 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201312181714.rBIHEsjR001940@drugstore.mit.edu>
To: source-commits@MIT.EDU

https://github.com/mit-athena/locker-support/commit/939f7a3ff98fe8217089c031500c4e4d954e5508
commit 939f7a3ff98fe8217089c031500c4e4d954e5508
Author: Jonathan Reed <jdreed@mit.edu>
Date:   Tue Dec 17 16:10:03 2013 -0500

    Add packaging for scripts
    
    - Add the Python scripts to setup.py
    - Override dh_auto_install to install the scripts to usr/lib
    - Create .install files for both packages to correctly install
      the modules and userland scripts.

 debian/control                                 |   10 ++++++++++
 debian/debathena-locker-utils.install          |    1 +
 debian/debathena-python-locker-support.install |    1 +
 debian/rules                                   |    3 +++
 setup.py                                       |    4 +++-
 5 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/debian/control b/debian/control
index fbd84cd..76e4515 100644
--- a/debian/control
+++ b/debian/control
@@ -14,3 +14,13 @@ Depends: ${misc:Depends},
 Description: Python modules for Athena's "locker" framework
  This package provides the "locker" and "athdir" modules,
  for use with debathena-pyhesiodfs and more
+
+Package: debathena-locker-utils
+Architecture: all
+Depends: ${misc:Depends},
+ ${python:Depends},
+ debathena-python-locker-support,
+Description: Userland utilities for the Athena "locker" framework
+ This package provides the "attach", "detach", "fsid", "athdir", and
+ "quota" commands, though it does not install them in locations
+ searched by the user's path, by default.
diff --git a/debian/debathena-locker-utils.install b/debian/debathena-locker-utils.install
new file mode 100644
index 0000000..bfa227e
--- /dev/null
+++ b/debian/debathena-locker-utils.install
@@ -0,0 +1 @@
+usr/lib/debathena-locker-utils/*
diff --git a/debian/debathena-python-locker-support.install b/debian/debathena-python-locker-support.install
new file mode 100644
index 0000000..84546a4
--- /dev/null
+++ b/debian/debathena-python-locker-support.install
@@ -0,0 +1 @@
+usr/lib/python?.?/*
diff --git a/debian/rules b/debian/rules
index 94483c1..88c6366 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,3 +3,6 @@
 
 %:
 	dh --with-python2 $@
+
+override_dh_auto_install:
+	dh_auto_install -- --install-scripts=/usr/lib/debathena-locker-utils
diff --git a/setup.py b/setup.py
index c1b2069..091a767 100644
--- a/setup.py
+++ b/setup.py
@@ -4,4 +4,6 @@ setup(name='locker-support',
       version='1.0',
       author='Debathena Project',
       author_email='debathena@mit.edu',
-      py_modules=['locker', 'athdir'])
+      py_modules=['locker', 'athdir'],
+      scripts=['attach', 'detach', 'fsid', 'quota', 'athdir'],
+      )

home help back first fref pref prev next nref lref last post