Hi, Attached is the diff for my gpib 3.2.06-3.1 NMU.
-- ·O· Pierre Habouzit ··O [EMAIL PROTECTED] OOO http://www.madism.org
diff -u gpib-3.2.06/debian/control gpib-3.2.06/debian/control
--- gpib-3.2.06/debian/control
+++ gpib-3.2.06/debian/control
@@ -2,8 +2,11 @@
Priority: optional
Section: science
Maintainer: Robert Jordens <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.1.67), cdbs, dh-buildinfo, bzip2, quilt,
autotools-dev, doxygen, docbook-utils, docbook-to-man, python2.3-dev,
python2.4-dev, python-dev, perl (>= 5.6.0-16), php4-dev (>= 4:4.4.0-1),
module-assistant
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 5.0.37.2), cdbs, dh-buildinfo, bzip2, quilt,
+ autotools-dev, doxygen, docbook-utils, docbook-to-man, perl (>= 5.6.0-16),
+ python-all-dev (>= 2.3.5-11), python-support (>= 0.3),
+ php4-dev (>= 4:4.4.0-1), module-assistant
+Standards-Version: 3.7.2
Package: libgpib0-dev
Section: libdevel
@@ -42,38 +45,25 @@
${Common:Description}
This package contains the bindings for perl.
-Package: php4-gpib
-Section: science
-Architecture: any
-Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}
-Description: libgpib php bindings
- ${Common:Description}
- This package contains the bindings for php.
-
-Package: python2.3-gpib
-Section: python
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Description: libgpib Python 2.3 bindings
- ${Common:Description}
- This package contains the bindings for Python 2.3.
-
-Package: python2.4-gpib
+Package: python-gpib
Section: python
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Description: libgpib Python 2.4 bindings
+Provides: ${python:Provides}
+Replaces: python2.3-gpib (<< 3.2.06-3.1), python2.4-gpib (<< 3.2.06-3.1)
+Conflicts: python2.3-gpib (<< 3.2.06-3.1), python2.4-gpib (<< 3.2.06-3.1)
+XB-Python-Version: ${python:Versions}
+Description: libgpib python bindings (default package)
${Common:Description}
- This package contains the bindings for Python 2.4.
+ This package contains the bindings for Python.
-Package: python-gpib
-Section: python
+Package: php4-gpib
+Section: science
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Description: libgpib python bindings (default package)
+Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}
+Description: libgpib php bindings
${Common:Description}
- This package is an empty dummy package that always depends on
- a package built for Debian's default Python version.
+ This package contains the bindings for php.
Package: gpib-modules-source
Section: science
reverted:
--- gpib-3.2.06/debian/python2.4-gpib.examples
+++ gpib-3.2.06.orig/debian/python2.4-gpib.examples
@@ -1 +0,0 @@
-build-tree/linux-gpib-*/language/python/gpibtest.py
reverted:
--- gpib-3.2.06/debian/python2.3-gpib.examples
+++ gpib-3.2.06.orig/debian/python2.3-gpib.examples
@@ -1 +0,0 @@
-build-tree/linux-gpib-*/language/python/gpibtest.py
reverted:
--- gpib-3.2.06/debian/python2.3-gpib.install
+++ gpib-3.2.06.orig/debian/python2.3-gpib.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/python2.3
diff -u gpib-3.2.06/debian/rules gpib-3.2.06/debian/rules
--- gpib-3.2.06/debian/rules
+++ gpib-3.2.06/debian/rules
@@ -9,6 +9,8 @@
# $Id$
#
+DEB_PYTHON_SYSTEM=pysupport
+
PACKAGE = gpib-modules
MA_DIR ?= /usr/share/modass
-include $(MA_DIR)/include/generic.make
@@ -27,11 +29,10 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
-# force using a specific python version for build
-#DEB_PYTHON_COMPILE_VERSION := 2.3
-DEB_PYTHON_VERSIONS = 2.3 2.4
+
+DEB_PYTHON_MODULE_PACKAGE := python-gpib
DEB_PYTHON_SETUP_CMD := language/python/setup.py
-DEB_PYTHON_INSTALL_ARGS_ALL = --root=$(CURDIR)/debian/tmp
+DEB_PYTHON_INSTALL_ARGS_ALL = --root=$(CURDIR)/debian/python-gpib
phpapiver=$(shell php-config4 --phpapi)
diff -u gpib-3.2.06/debian/common-description
gpib-3.2.06/debian/common-description
--- gpib-3.2.06/debian/common-description
+++ gpib-3.2.06/debian/common-description
@@ -1 +1 @@
-Common:Description=The Linux GPIB Package is a support package for GPIB (IEEE
488) hardware. The package contains kernel driver modules, and a C user-space
library with Guile, Perl, PHP, Python and TCL bindings. The API of the C
library is intended to be compatible with National Instrument's GPIB
library.${Newline} .${Newline} The General Purpose Instrumentation Bus (GPIB)
is a short-range digital communications cable standard connecting electronic
test and measurement devices to control devices. Developed by HP in 1970 (and
then called HP-IB) it has been standardized in 1978 by the Institute of
Electrical and Electronics Engineers as the IEEE Standard Digital Interface for
Programmable Instrumentation, IEEE-488-1978 (now 488.1).${Newline} .${Newline}
IEEE-488 allows up to 15 intelligent devices to share a single bus by
daisy-chaining, with the slowest device participating in the control and data
transfer handshakes to determine the speed of the transaction. The maximum data
rate is about one megabit per second. Paraphrasing the 1989 HP Test &
Measurement Catalog: HP-IB has a party-line structure wherein all devices on
the bus are connected in parallel. The 16 signal lines within the passive
interconnecting HP-IB cable are grouped into three clusters according to their
functions: Data Bus, Data Byte Transfer.${Newline} .${Newline} To use these
packages you have be using a 2.6 kernel, install gpib-modules-source, compile a
gpib-modules-KVERS package out of it, install that and libgpib0 as well a
libgpib-bin. Documentation and headers are contained in libgpib0-dev. Language
bindings for python, perl and php are available in separate packages as well.
+Common:Description=The Linux GPIB Package is a support package for GPIB (IEEE
488) hardware. The${Newline} package contains kernel driver modules, and a C
user-space library with${Newline} Guile, Perl, PHP, Python and TCL bindings.
The API of the C library is${Newline} intended to be compatible with National
Instrument's GPIB library.${Newline} .${Newline} The General Purpose
Instrumentation Bus (GPIB) is a short-range digital${Newline} communications
cable standard connecting electronic test and measurement${Newline} devices to
control devices. Developed by HP in 1970 (and then called HP-IB)${Newline} it
has been standardized in 1978 by the Institute of Electrical and${Newline}
Electronics Engineers as the IEEE Standard Digital Interface for
Programmable${Newline} Instrumentation, IEEE-488-1978 (now 488.1).${Newline}
.${Newline} IEEE-488 allows up to 15 intelligent devices to share a single bus
by${Newline} daisy-chaining, with the slowest device participating in the
control and data${Newline} transfer handshakes to determine the speed of the
transaction. The maximum${Newline} data rate is about one megabit per second.
Paraphrasing the 1989 HP Test &${Newline} Measurement Catalog: HP-IB has a
party-line structure wherein all devices on${Newline} the bus are connected in
parallel. The 16 signal lines within the passive${Newline} interconnecting
HP-IB cable are grouped into three clusters according to${Newline} their
functions: Data Bus, Data Byte Transfer.${Newline} .${Newline} To use these
packages you have be using a 2.6 kernel, install${Newline} gpib-modules-source,
compile a gpib-modules-KVERS package out of it, install${Newline} that and
libgpib0 as well a libgpib-bin. Documentation and headers are${Newline}
contained in libgpib0-dev. Language bindings for python, perl and php
are${Newline} available in separate packages as well.
diff -u gpib-3.2.06/debian/changelog gpib-3.2.06/debian/changelog
--- gpib-3.2.06/debian/changelog
+++ gpib-3.2.06/debian/changelog
@@ -1,3 +1,11 @@
+gpib (3.2.06-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update package to the last python policy (Closes: #373440).
+ * Wrap description correctly.
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]> Sun, 2 Jul 2006 00:25:58 +0200
+
gpib (3.2.06-3) unstable; urgency=high
* break circular dependency around libgpib-bin; closes: Bug#356589 (libgpib0
reverted:
--- gpib-3.2.06/debian/python2.4-gpib.install
+++ gpib-3.2.06.orig/debian/python2.4-gpib.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/python2.4
only in patch2:
unchanged:
--- gpib-3.2.06.orig/debian/pycompat
+++ gpib-3.2.06/debian/pycompat
@@ -0,0 +1 @@
+2
only in patch2:
unchanged:
--- gpib-3.2.06.orig/debian/python-gpib.examples
+++ gpib-3.2.06/debian/python-gpib.examples
@@ -0,0 +1 @@
+build-tree/linux-gpib-*/language/python/gpibtest.py
only in patch2:
unchanged:
--- gpib-3.2.06.orig/debian/python-gpib.install
+++ gpib-3.2.06/debian/python-gpib.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/python*
signature.asc
Description: Digital signature
