Bug#365465: gaphor and zope3/python-interface dependency

[Fabio Tranchitella]

Hi,

* 2007-01-07 14:06, Cedric Delfosse wrote:
> Could you please post your NMU patch as a review it ? If it's OK for me,
> I will upload a new package with your patch (giving you all the credits
> for this patch, of course).

I'm attaching a NMU patch to fix the bug splitting the package into gaphor
and gaphor-lib. The latter conflicts on zope3 and python-zopeinterface, and
the former depends on gaphor-lib | zope3.

Thanks,

-- 
Fabio Tranchitella                         http://www.kobold.it
Free Software Developer and Consultant     http://www.tranchitella.it
_____________________________________________________________________
1024D/7F961564, fpr 5465 6E69 E559 6466 BF3D 9F01 2BF8 EE2B 7F96 1564

diff -urN temp/gaphor-0.8.1/debian/changelog gaphor-0.8.1/debian/changelog
--- temp/gaphor-0.8.1/debian/changelog  2007-01-08 00:25:55.000000000 +0100
+++ gaphor-0.8.1/debian/changelog       2007-01-08 00:18:07.000000000 +0100
@@ -1,3 +1,13 @@
+gaphor (0.8.1-5.1) unstable; urgency=medium
+
+  * NMU, fixing a RC bug: urgency medium.
+  * Split gaphor in gaphor and gaphor-lib binary packages. The package
+    gaphor-lib conflicts with zope3 and the package gaphor depends on
+    "gaphor-lib | zope3". In this way, gaphor is still usable if zope3 is
+    already installed in the system. (Closes: #369512)
+
+ -- Fabio Tranchitella <[EMAIL PROTECTED]>  Mon,  8 Jan 2007 00:17:37 +0100
+
 gaphor (0.8.1-5) unstable; urgency=low
 
   * gaphor/misc/resource.py: don't exit if resource file can't be read
diff -urN temp/gaphor-0.8.1/debian/control gaphor-0.8.1/debian/control
--- temp/gaphor-0.8.1/debian/control    2007-01-08 00:25:55.000000000 +0100
+++ gaphor-0.8.1/debian/control 2007-01-08 00:18:41.000000000 +0100
@@ -2,15 +2,26 @@
 Section: devel
 Priority: optional
 Maintainer: Cédric Delfosse <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>= 5.0.37.2), python2.4-dev, python-gtk2, 
python-diacanvas2 (>= 0.14.4), xvfb, xbase-clients, xfonts-base, xsltproc, 
docbook-xsl, python-support (>= 0.3), python-gnome2
+Build-Depends-Indep: python2.4-dev, python-gtk2, python-diacanvas2 (>= 
0.14.4), xvfb, xbase-clients, xfonts-base, xsltproc, docbook-xsl, 
python-support (>= 0.3), python-gnome2
 Build-Depends: debhelper (>= 5.0.37.2), python
 Standards-Version: 3.7.2
 
 Package: gaphor
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-diacanvas2 (>= 0.14.4-3), 
python-gnome2
-Conflicts: zope3, python-zopeinterface
+Depends: ${python:Depends}, ${misc:Depends}, python-diacanvas2 (>= 0.14.4-3), 
python-gnome2, gaphor-lib (= ${Source-Version}) | zope3
 Description: UML modeling tool
  This program is an easy to use UML (Unified Modeling Language) modeling
  environment. It allows you to create UML diagrams for documentation and to
  assist you with design decisions.   
+
+Package: gaphor-lib
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}
+Conflicts: zope3, python-zopeinterface
+Description: UML modeling tool -- zope3 libraries
+ This program is an easy to use UML (Unified Modeling Language) modeling
+ environment. It allows you to create UML diagrams for documentation and to
+ assist you with design decisions.
+ .
+ This package contains some of the zope3 libraries which are needed to
+ run gaphor.
diff -urN temp/gaphor-0.8.1/debian/rules gaphor-0.8.1/debian/rules
--- temp/gaphor-0.8.1/debian/rules      2007-01-08 00:25:55.000000000 +0100
+++ gaphor-0.8.1/debian/rules   2007-01-08 00:18:24.000000000 +0100
@@ -47,6 +47,9 @@
 
        # Add here commands to install the package into debian/gaphor.
        xvfb-run -a python2.4 setup.py install --no-compile --prefix 
$(CURDIR)/debian/gaphor/usr
+       mkdir -p $(CURDIR)/debian/gaphor-lib/usr/lib/python2.4/site-packages
+       mv $(CURDIR)/debian/gaphor/usr/lib/python2.4/site-packages/zope \
+          $(CURDIR)/debian/gaphor-lib/usr/lib/python2.4/site-packages
        
        # Remove some remaining .pyc file
        find $(CURDIR)/debian/gaphor -name \*\.pyc -exec rm -f {} \;
@@ -64,9 +67,9 @@
        dh_testroot
        dh_installchangelogs 
        dh_installdocs
-       dh_installmenu
-       dh_installman gaphor.1
-       dh_desktop
+       dh_installmenu -p gaphor
+       dh_installman -p gaphor gaphor.1
+       dh_desktop -p gaphor
        dh_link
        dh_strip
        dh_compress

signature.asc
Description: Digital signature