[Python-apps-commits] r2257 - in packages/drobo-utils/trunk/debian (6 files)

Thu Jan 22 23:42:23 UTC 2009

Date: Thursday, January 22, 2009 @ 23:42:21
  Author: catlee-guest
Revision: 2257

Adding debug package for binary extension
Undoing package split, it's more trouble than it's worth and could be
confusing to users

Added:
  packages/drobo-utils/trunk/debian/README.Debian
Modified:
  packages/drobo-utils/trunk/debian/control
  packages/drobo-utils/trunk/debian/copyright
  packages/drobo-utils/trunk/debian/drobo-utils.manpages
  packages/drobo-utils/trunk/debian/rules
Deleted:
  packages/drobo-utils/trunk/debian/drobo-utils-gui.manpages

Added: packages/drobo-utils/trunk/debian/README.Debian
===================================================================

--- packages/drobo-utils/trunk/debian/README.Debian	                        (rev 0)
+++ packages/drobo-utils/trunk/debian/README.Debian	2009-01-22 23:42:21 UTC (rev 2257)
@@ -0,0 +1,3 @@
+To use droboview, the graphical interface for managing drobos, make sure that
+you have installed python-qt4 and gparted.  These are part of the "Suggested"
+dependencies, but some users may not have installed them intially.

Modified: packages/drobo-utils/trunk/debian/control
===================================================================
--- packages/drobo-utils/trunk/debian/control	2009-01-22 16:49:24 UTC (rev 2256)
+++ packages/drobo-utils/trunk/debian/control	2009-01-22 23:42:21 UTC (rev 2257)
@@ -3,7 +3,8 @@
 Priority: extra
 Maintainer: Chris AtLee <chris at atlee.ca>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: python-support (>= 0.6), debhelper (>= 5), python-all-dev, libsgutils1-dev
+Build-Depends: python-support (>= 0.6), debhelper (>= 5), python-all-dev,
+ libsgutils1-dev, python-all-dbg
 Standards-Version: 3.8.0
 Homepage: http://drobo-utils.sourceforge.net
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/drobo-utils/trunk/
@@ -12,7 +13,7 @@
 Package: drobo-utils
 Architecture: any
 Recommends: parted, sudo
-Suggests: drobo-utils-gui
+Suggests: gparted, python-qt4
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
 Description: manage data robotics storage units (drobos)
  Provides utilities for managing Data Robotics storage units, also known as
@@ -22,15 +23,15 @@
  easily expanded.  Different sized hard drives can be mixed on the same Drobo.
  See http://drobo.com for more information.
  .
- This package provides the command line interface for managing a Drobo, as well
- as libraries used by the graphical interface provided by the drobo-utils-gui
- package.
+ This package provides a command line interface for managing a Drobo, as well
+ as a graphical dashboard interface.  To enable the graphical interface, please
+ be sure to install the suggested python-qt4 package, as well as gparted.
 
-Package: drobo-utils-gui
+Package: drobo-utils-dbg
 Architecture: any
-Recommends: gparted, sudo
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, drobo-utils (= ${binary:Version}), python-qt4
-Description: manage data robotics storage units (drobos)
+Depends: ${misc:Depends}, drobo-utils (= ${binary:Version}), ${shlibs:Depends},
+ python-dbg
+Description: manage data robotics storage units (drobos) (debug libraries)
  Provides utilities for managing Data Robotics storage units, also known as
  "Drobos".  Drobos are external hard drive enclosures that connect to your PC
  via USB or Firewire and provide RAID-like features.  Drobos provide automatic
@@ -38,4 +39,4 @@
  easily expanded.  Different sized hard drives can be mixed on the same Drobo.
  See http://drobo.com for more information.
  .
- This package provides a graphical interface for managing a Drobo.
+ This package contains the extension built for the Python debug interpreter.

Modified: packages/drobo-utils/trunk/debian/copyright
===================================================================
--- packages/drobo-utils/trunk/debian/copyright	2009-01-22 16:49:24 UTC (rev 2256)
+++ packages/drobo-utils/trunk/debian/copyright	2009-01-22 23:42:21 UTC (rev 2257)
@@ -9,7 +9,7 @@
 
 Copyright:
 
-    Copyright (C) 2008 Peter A Silva
+    Copyright 2008 Peter A Silva
 
 License:
 
@@ -26,7 +26,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-The Debian packaging is (C) 2008, Chris AtLee <chris at atlee.ca> and
+The Debian packaging is Copyright 2009, Chris AtLee <chris at atlee.ca> and
 is licensed under the GPLv3, see `/usr/share/common-licenses/GPL-3'.
 
 DroboDMP.c is heavily based on sample code from Data Robotics Inc...

Deleted: packages/drobo-utils/trunk/debian/drobo-utils-gui.manpages
===================================================================
--- packages/drobo-utils/trunk/debian/drobo-utils-gui.manpages	2009-01-22 16:49:24 UTC (rev 2256)
+++ packages/drobo-utils/trunk/debian/drobo-utils-gui.manpages	2009-01-22 23:42:21 UTC (rev 2257)
@@ -1 +0,0 @@
-debian/droboview.8

Modified: packages/drobo-utils/trunk/debian/drobo-utils.manpages
===================================================================
--- packages/drobo-utils/trunk/debian/drobo-utils.manpages	2009-01-22 16:49:24 UTC (rev 2256)
+++ packages/drobo-utils/trunk/debian/drobo-utils.manpages	2009-01-22 23:42:21 UTC (rev 2257)
@@ -1 +1,2 @@
 debian/drobom.8
+debian/droboview.8

Modified: packages/drobo-utils/trunk/debian/rules
===================================================================
--- packages/drobo-utils/trunk/debian/rules	2009-01-22 16:49:24 UTC (rev 2256)
+++ packages/drobo-utils/trunk/debian/rules	2009-01-22 23:42:21 UTC (rev 2257)
@@ -5,23 +5,27 @@
 #export DH_VERBOSE=1
 
 PKGNAME := drobo-utils
-GUIPKGNAME := drobo-utils-gui
 
 PYVERS=$(shell pyversions -vs)
 
-build: $(PYVERS:%=build-python%-stamp)
+build: $(PYVERS:%=build-python%-stamp) $(PYVERS:%=build-dbg-python%-stamp)
 
 build-python%-stamp:
 	python$* setup.py build
 	touch $@
 
+build-dbg-python%-stamp:
+	python$*-dbg setup.py build
+	touch $@
+
 clean:
 	dh_testdir
 	dh_testroot
 
 	[ ! -d build ] || rm -rf build
 
-	python setup.py clean
+	python setup.py clean --all
+	python-dbg setup.py clean --all
 
 	find . -name "*\.pyc" -delete
 
@@ -35,16 +39,20 @@
 
 	for py in $(PYVERS); do \
 	    python$$py setup.py install_lib -d $(CURDIR)/debian/$(PKGNAME)/usr/lib/python$$py/site-packages; \
-	    python$$py setup.py install_lib -d $(CURDIR)/debian/$(GUIPKGNAME)/usr/lib/python$$py/site-packages; \
+	    python$$py-dbg setup.py install_lib -d $(CURDIR)/debian/$(PKGNAME)-dbg/usr/lib/python$$py/site-packages; \
 	done
 	python setup.py install_data -d $(CURDIR)/debian/$(PKGNAME)/usr/share/$(PKGNAME)
 	python setup.py install_scripts -d $(CURDIR)/debian/$(PKGNAME)/usr/sbin
-	python setup.py install_scripts -d $(CURDIR)/debian/$(GUIPKGNAME)/usr/sbin
-	for s in $(CURDIR)/debian/$(PKGNAME)/usr/sbin/* $(CURDIR)/debian/$(GUIPKGNAME)/usr/sbin/*; do \
+	for s in $(CURDIR)/debian/$(PKGNAME)/usr/sbin/*; do \
 	    sed -i '1s,#!.*python.*,#!/usr/bin/python,' $$s; \
 	done
-	find $(CURDIR)/debian/$(PKGNAME) \( -name droboview -o -name DroboGUI.py \) -exec rm -v {} \;
-	find $(CURDIR)/debian/$(GUIPKGNAME) \( -name drobom -o -name Drobo.py -o -name *.so \) -exec rm -v {} \;
+	find debian/$(PKGNAME)-dbg ! -type d ! -name '*.so' | xargs rm -f
+	find debian/$(PKGNAME)-dbg -depth -empty -exec rmdir {} \;
+	for py in $(PYVERS); do        \
+	    rm -rf debian/$(PKGNAME)-dbg/usr/include/python$$py; \
+	    mkdir -p debian/$(PKGNAME)-dbg/usr/include/python$${py}_d; \
+	    ln -s ../python$$py/$(PKGNAME) debian/$(PKGNAME)-dbg/usr/include/python$${py}_d/$(PKGNAME); \
+	done
 
 binary-indep: build install
 
@@ -55,6 +63,10 @@
 	dh_installdocs
 	dh_pysupport
 	dh_strip
+	dh_link
+	dh_strip -p$(PKGNAME) --dbg-package=$(PKGNAME)-dbg
+	rm -rf debian/$(PKGNAME)-dbg/usr/share/doc/$(PKGNAME)-dbg
+	ln -s $(PKGNAME) debian/$(PKGNAME)-dbg/usr/share/doc/$(PKGNAME)-dbg
 	dh_installman
 	dh_compress 		-X.py
 	dh_fixperms


