tags 445277 + patch
thanks

Hi,

Please ignore my previous message :)

The following is the diff for my gaphor 0.12.5-3.1 NMU to force gaphor
to use python2.4.

diff -u gaphor-0.12.5/debian/pyversions gaphor-0.12.5/debian/pyversions
--- gaphor-0.12.5/debian/pyversions
+++ gaphor-0.12.5/debian/pyversions
@@ -1 +1 @@
-2.4-
+2.4
diff -u gaphor-0.12.5/debian/changelog gaphor-0.12.5/debian/changelog
--- gaphor-0.12.5/debian/changelog
+++ gaphor-0.12.5/debian/changelog
@@ -1,3 +1,11 @@
+gaphor (0.12.5-3.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Depend on python2.4, and make sure /usr/bin/gaphor uses python2.4
+    (Closes: #445277)
+
+ -- Chris AtLee <[EMAIL PROTECTED]>  Thu, 15 May 2008 13:57:09 -0400
+
 gaphor (0.12.5-3) unstable; urgency=low
 
   * Depends on python-pkg-resources instead of python-setuptools
diff -u gaphor-0.12.5/debian/rules gaphor-0.12.5/debian/rules
--- gaphor-0.12.5/debian/rules
+++ gaphor-0.12.5/debian/rules
@@ -20,7 +20,7 @@
        dh_testdir
 
        # Add here commands to compile the package.
-       python setup.py build
+       python2.4 setup.py build
        touch build-stamp
 
 clean: clean-patched unpatch
@@ -34,12 +34,14 @@
        -rm -fr build
        -rm -f ez_setup.pyc
 
+       -rm -f gaphor/UML/uml2.py
+
        dh_clean 
 
 clean-patched: patch
        dh_testdir
        dh_testroot
-       python setup.py clean
+       python2.4 setup.py clean
        touch $@
 
 install: build
@@ -52,7 +54,7 @@
        mkdir -p debian/gaphor/usr/share/pixmaps
        cp debian/gaphor.xpm debian/gaphor/usr/share/pixmaps
 
-       python setup.py install --root=$(CURDIR)/debian/gaphor
+       python2.4 setup.py install --root=$(CURDIR)/debian/gaphor
 
        # Comment zope requirement because zope3 package does not provide a
        # egg-info directory
diff -u gaphor-0.12.5/debian/control gaphor-0.12.5/debian/control
--- gaphor-0.12.5/debian/control
+++ gaphor-0.12.5/debian/control
@@ -2,13 +2,13 @@
 Section: devel
 Priority: optional
 Maintainer: Cédric Delfosse <[EMAIL PROTECTED]>
-Build-Depends: python, python-support (>= 0.6.4), debhelper (>= 5), 
python-setuptools, python-nose (>= 0.9.2), dpatch
+Build-Depends: python2.4, python-support (>= 0.6.4), debhelper (>= 5), 
python-setuptools, python-nose (>= 0.9.2), dpatch
 Build-Depends-Indep: xsltproc, docbook-xsl
 Standards-Version: 3.7.3
 
 Package: gaphor
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-gaphas, zope3, 
python-pkg-resources, python-cairo, python-gnome2, python-gtk2
+Depends: python2.4 | python (<< 2.5), ${misc:Depends}, python-gaphas, zope3, 
python-pkg-resources, python-cairo, python-gnome2, python-gtk2
 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
only in patch2:
unchanged:
--- gaphor-0.12.5.orig/gaphor.egg-info/SOURCES.txt
+++ gaphor-0.12.5/gaphor.egg-info/SOURCES.txt
@@ -58,6 +58,7 @@
 gaphor/UML/properties.py
 gaphor/UML/uml2.gaphor
 gaphor/UML/uml2.override
+gaphor/UML/uml2.py
 gaphor/UML/umllex.py
 gaphor/UML/tests/__init__.py
 gaphor/UML/tests/test_elementfactory.py
@@ -303,4 +304,4 @@
 utils/command/msgfmt.py
 utils/command/override.py
 utils/command/pygettext.py
-utils/command/run.py
+utils/command/run.py
\ No newline at end of file



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to