[Python-modules-commits] r10927 - in packages/gamera/trunk/debian (changelog control rules)

[jwilk-guest at users.alioth.debian.org]

    Date: Wednesday, December 30, 2009 @ 21:11:10
  Author: jwilk-guest
Revision: 10927

* Make python-gamera-dev ?\226?\128?\156Architecture: all?\226?\128?\157.
* Add stricter internel dependencies between python-gamera and
  python-gamera-dev/gamera-gui.

Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/control
  packages/gamera/trunk/debian/rules

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2009-12-30 20:55:22 UTC (rev 10926)
+++ packages/gamera/trunk/debian/changelog	2009-12-30 21:11:10 UTC (rev 10927)
@@ -3,8 +3,11 @@
   * Provide detached symbols in the *-dbg package.
   * Switch to source format 3.0 (quilt).
   * Refresh the fix-paths.diff patch.
+  * Make python-gamera-dev “Architecture: all”.
+  * Add stricter internel dependencies between python-gamera and
+    python-gamera-dev/gamera-gui.
 
- -- Jakub Wilk <ubanus at users.sf.net>  Tue, 10 Nov 2009 22:35:38 +0100
+ -- Jakub Wilk <ubanus at users.sf.net>  Wed, 30 Dec 2009 17:37:58 +0100
 
 gamera (3.2.3-1) unstable; urgency=low
 

Modified: packages/gamera/trunk/debian/control
===================================================================
--- packages/gamera/trunk/debian/control	2009-12-30 20:55:22 UTC (rev 10926)
+++ packages/gamera/trunk/debian/control	2009-12-30 21:11:10 UTC (rev 10927)
@@ -20,6 +20,7 @@
 Package: python-gamera
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Breaks: gamera-gui (<< ${source:Version}), python-gamera-dev (<< ${source:Version})
 Recommends: python-wxgtk2.8, python-numpy, python-imaging
 Suggests: gamera-doc
 Description: framework for building document analysis applications
@@ -45,9 +46,9 @@
  debug interpreter.
 
 Package: python-gamera-dev
-Architecture: any
+Architecture: all
 Depends: python-dev, libvigraimpex-dev, ${misc:Depends}
-Recommends: python-all-dev, python-gamera (= ${binary:Version})
+Recommends: python-all-dev, python-gamera (>= ${source:Version})
 Description: framework for building document analysis applications (header files)
  The Gamera framework is a Python library for building custom
  applications for document analysis and recognition.
@@ -57,7 +58,7 @@
 
 Package: gamera-gui
 Architecture: all
-Depends: python, ${python:Depends}, python-gamera (>= ${binary:Version}), python-wxgtk2.8, ${misc:Depends}
+Depends: python, ${python:Depends}, python-gamera (>= ${source:Version}), python-wxgtk2.8, ${misc:Depends}
 Recommends: python-matplotlib
 Suggests: gamera-doc
 Description: GUI for the Gamera framework

Modified: packages/gamera/trunk/debian/rules
===================================================================
--- packages/gamera/trunk/debian/rules	2009-12-30 20:55:22 UTC (rev 10926)
+++ packages/gamera/trunk/debian/rules	2009-12-30 21:11:10 UTC (rev 10927)
@@ -44,7 +44,11 @@
 
 .PHONY: install-arch
 install-arch: build-arch
-	dh install -s --before dh_link
+	dh install -s
+
+.PHONY: install-indep
+install-indep: build-indep
+	dh install -i --before dh_link
 	for version in $(shell pyversions -r); do \
 	for suffix in "" _d; do \
 	if [ $$version$$suffix != $(shell pyversions -d) ]; then \
@@ -54,11 +58,7 @@
 	fi \
 	done; \
 	done
-	dh install -s --remaining
-
-.PHONY: install-indep
-install-indep: build-indep
-	dh install -i
+	dh install -i --remaining
 	sed -i -e '1 s|.*|#!/usr/bin/python|' debian/gamera-gui/usr/bin/gamera_gui
 
 .PHONY: binary