tag 373331 + patch
thanks
Hi,
Attached is the diff for my python-orbit 0.3.1-12.2 NMU.
Cheers,
--
Raphaël Hertzog
Premier livre français sur Debian GNU/Linux :
http://www.ouaza.com/livre/admin-debian/
diff -u python-orbit-0.3.1/debian/changelog python-orbit-0.3.1/debian/changelog
--- python-orbit-0.3.1/debian/changelog
+++ python-orbit-0.3.1/debian/changelog
@@ -1,3 +1,12 @@
+python-orbit (0.3.1-12.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update for the new python policy. Closes: #373331
+ - Drop python2.3/2.4-orbit.
+ - Put everything into python-orbit.
+
+ -- Raphael Hertzog <[EMAIL PROTECTED]> Sat, 17 Jun 2006 12:19:34 +0200
+
python-orbit (0.3.1-12.1) unstable; urgency=low
* Non-maintainer upload.
diff -u python-orbit-0.3.1/debian/control python-orbit-0.3.1/debian/control
--- python-orbit-0.3.1/debian/control
+++ python-orbit-0.3.1/debian/control
@@ -2,33 +2,20 @@
Section: python
Priority: optional
Maintainer: Tom Cato Amundsen <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), liborbit-dev (>= 0.5.7), python2.3-dev,
python2.4-dev, libglib1.2-dev, docbook-to-man
+Build-Depends: debhelper (>= 5.0.37.1), python(>= 2.3.5-7), liborbit-dev (>=
0.5.7), python-all-dev, libglib1.2-dev, docbook-to-man
+XS-Python-Version: all
Standards-Version: 3.5.6.0
Package: python-orbit
Architecture: any
-Depends: python (>= 2.3), python (<< 2.4), python2.3-orbit
+Depends: ${python:Depends}
+Replaces: python2.3-orbit, python2.4-orbit
+Conflicts: python2.3-orbit (<< 0.3.1-12.2), python2.4-orbit (<< 0.3.1-12.2),
python2.3-orbit2, python2.4-orbit2
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
Description: Python bindings for ORBit
- This package only contains a dependency on the appropriately
- versioned pythonX.Y-orbit package that contain python bindings
- for ORBit. ORBit is the CORBA Object Request Broker used e.g.
- by Gnome.
-
-Package: python2.3-orbit
-Architecture: any
-Depends: python2.3, ${shlibs:Depends}
-Conflicts: python2.3-orbit2
-Description: Python 2.3 bindings for ORBit
- Python bindings for ORBit compiled for Python 2.3. ORBit is the
- CORBA Object Request Broker used e.g. by Gnome.
-
-Package: python2.4-orbit
-Architecture: any
-Depends: python2.4, ${shlibs:Depends}
-Conflicts: python2.4-orbit2
-Description: Python 2.4 bindings for ORBit
- Python bindings for ORBit compiled for Python 2.4. ORBit is the
- CORBA Object Request Broker used e.g. by Gnome.
+ Python bindings for ORBit. ORBit is the CORBA Object Request
+ Broker used e.g. by Gnome.
Package: python-orbit-dev
Architecture: all
diff -u python-orbit-0.3.1/debian/rules python-orbit-0.3.1/debian/rules
--- python-orbit-0.3.1/debian/rules
+++ python-orbit-0.3.1/debian/rules
@@ -24,77 +24,60 @@
confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
-python-2.3/config.status: configure
- dh_testdir
- # For Python 2.3 package
- mkdir -p python-2.3
- cd python-2.3 \
- && PYTHON=/usr/bin/python2.3 ../configure $(confflags) --prefix=/usr
+PYVERS=$(shell pyversions -v -r debian/control)
+PYDEF=$(shell pyversions -dv)
-python-2.4/config.status: configure
+python-%/config.status: configure
dh_testdir
- # For Python 2.4 package
- mkdir -p python-2.4
- cd python-2.4 \
- && PYTHON=/usr/bin/python2.4 ../configure $(confflags) --prefix=/usr
-
+ mkdir -p python-$*
+ cd python-$* && PYTHON=/usr/bin/python$* ../configure $(confflags)
--prefix=/usr && cd ..
build: build-stamp
-build-stamp: python-2.3/config.status \
- python-2.4/config.status
+build-stamp: $(PYVERS:%=python-%/config.status)
dh_testdir
-
- cd python-2.3 && $(MAKE) CFLAGS="$(CFLAGS)"
- cd python-2.4 && $(MAKE) CFLAGS="$(CFLAGS)"
-
+
+ set -e; \
+ for V in $(PYVERS); do \
+ cd python-$$V && $(MAKE) CFLAGS="$(CFLAGS)" && cd ..; \
+ done
+
/usr/bin/docbook-to-man debian/orbit-python-config.sgml >
orbit-python-config.1
-
+
touch build-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp
-
+
# Add here commands to clean up after the build process.
-$(MAKE) distclean
-test -r /usr/share/misc/config.sub && \
cp -f /usr/share/misc/config.sub config.sub
-test -r /usr/share/misc/config.guess && \
cp -f /usr/share/misc/config.guess config.guess
-
- rm -rf python-2.3
- rm -rf python-2.4
-
+
+ -rm -rf $(PYVERS:%=python-%)
+
dh_clean
-install: build
+install: $(PYVERS:%=install-%)
+ # Move some stuff from python-orbit to the -dev package
+ mkdir -p debian/python-orbit-dev/usr/bin
+ mkdir -p debian/python-orbit-dev/usr/include
+ mv debian/python-orbit/usr/bin/* debian/python-orbit-dev/usr/bin
+ mv debian/python-orbit/usr/include/* debian/python-orbit-dev/usr/include
+ rm -rf debian/python-orbit/usr/bin
+ rm -rf debian/python-orbit/usr/include
+
+install-%: build
dh_testdir
dh_testroot
- dh_clean -k
dh_installdirs
- # Install for Python 2.3
- cd python-2.3 && $(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM)"\
- prefix=$(CURDIR)/debian/python2.3-orbit/usr
-
- # Install for Python 2.4
- cd python-2.4 && $(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM)"\
- prefix=$(CURDIR)/debian/python2.4-orbit/usr
-
- # ?? Install the development files from the 2.1 version (official as of
2001-12-07)
- # Move some stuff from python2.3-orbit to the -dev package
- mv debian/python2.3-orbit/usr/bin/* \
- debian/python-orbit-dev/usr/bin
- mv debian/python2.3-orbit/usr/include/* \
- debian/python-orbit-dev/usr/include
-
- # Remove stuff that go into the -dev package
- rm -rf debian/python2.3-orbit/usr/bin
- rm -rf debian/python2.3-orbit/usr/include
- rm -rf debian/python2.4-orbit/usr/bin
- rm -rf debian/python2.4-orbit/usr/include
+ cd python-$* && $(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM)"\
+ prefix=$(CURDIR)/debian/python-orbit/usr && cd ..
# Build architecture-independent files here.
@@ -109,7 +92,7 @@
# dh_installpam -i
# dh_installinit -i
#dh_installcron -i
- dh_installman -i --package=python-orbit-dev orbit-python-config.1
+ dh_installman -ppython-orbit-dev orbit-python-config.1
#dh_installinfo -i
# dh_undocumented -i
dh_installchangelogs -i ChangeLog
@@ -152,6 +135,8 @@
# dh_makeshlibs -a
dh_installdeb -a
# dh_perl -a
+ dh_pycentral -a
+ dh_python -a
dh_shlibdeps -a
dh_gencontrol -a
dh_md5sums -a
reverted:
--- python-orbit-0.3.1/debian/python2.3-orbit.examples
+++ python-orbit-0.3.1.orig/debian/python2.3-orbit.examples
@@ -1 +0,0 @@
-examples/*
diff -u python-orbit-0.3.1/debian/compat python-orbit-0.3.1/debian/compat
--- python-orbit-0.3.1/debian/compat
+++ python-orbit-0.3.1/debian/compat
@@ -1 +1 @@
-4
+5
reverted:
--- python-orbit-0.3.1/debian/python2.2-orbit.examples
+++ python-orbit-0.3.1.orig/debian/python2.2-orbit.examples
@@ -1 +0,0 @@
-examples/*
reverted:
--- python-orbit-0.3.1/debian/python2.1-orbit.examples
+++ python-orbit-0.3.1.orig/debian/python2.1-orbit.examples
@@ -1 +0,0 @@
-examples/*
reverted:
--- python-orbit-0.3.1/debian/python2.1-orbit.docs
+++ python-orbit-0.3.1.orig/debian/python2.1-orbit.docs
@@ -1,4 +0,0 @@
-AUTHORS
-README
-TODO
-debian/README.Debian
reverted:
--- python-orbit-0.3.1/debian/python2.2-orbit.docs
+++ python-orbit-0.3.1.orig/debian/python2.2-orbit.docs
@@ -1,4 +0,0 @@
-AUTHORS
-README
-TODO
-debian/README.Debian
diff -u python-orbit-0.3.1/orbit-python-config.1
python-orbit-0.3.1/orbit-python-config.1
--- python-orbit-0.3.1/orbit-python-config.1
+++ python-orbit-0.3.1/orbit-python-config.1
@@ -1,63 +1,10 @@
-.\" $Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/cmd/docbook-to-man.sh,v
1.1.1.1 1998/11/13 21:31:59 db3l Exp $
-.\"
-.\" transcript compatibility for postscript use.
-.\"
-.\" synopsis: .P! <file.ps>
-.\"
-.de P!
-.fl
-\!!1 setgray
-.fl
-\\&.\"
-.fl
-\!!0 setgray
-.fl \" force out current output buffer
-\!!save /psv exch def currentpoint translate 0 0 moveto
-\!!/showpage{}def
-.fl \" prolog
-.sy sed -e 's/^/!/' \\$1\" bring in postscript file
-\!!psv restore
-.
-.de pF
-.ie \\*(f1 .ds f1 \\n(.f
-.el .ie \\*(f2 .ds f2 \\n(.f
-.el .ie \\*(f3 .ds f3 \\n(.f
-.el .ie \\*(f4 .ds f4 \\n(.f
-.el .tm ? font overflow
-.ft \\$1
-..
-.de fP
-.ie !\\*(f4 \{\
-. ft \\*(f4
-. ds f4\"
-' br \}
-.el .ie !\\*(f3 \{\
-. ft \\*(f3
-. ds f3\"
-' br \}
-.el .ie !\\*(f2 \{\
-. ft \\*(f2
-. ds f2\"
-' br \}
-.el .ie !\\*(f1 \{\
-. ft \\*(f1
-. ds f1\"
-' br \}
-.el .tm ? font underflow
-..
-.ds f1\"
-.ds f2\"
-.ds f3\"
-.ds f4\"
-'\" t
-.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
.TH "ORBit-Python" "1"
.SH "NAME"
cvssh \(em Gives configuration options for ORBit-Python
.SH "SYNOPSIS"
.PP
-\fBcvssh\fR [\fB--prefix \fP] [\fB--version\fP] [\fB--help\fP]
+\fBcvssh\fR [\fB\-\-prefix \fP] [\fB\-\-version\fP] [\fB\-\-help\fP]
.SH "DESCRIPTION"
.PP
This manual page documents briefly the
@@ -76,15 +23,15 @@
.SH "OPTIONS"
.PP
This program follows the usual GNU command line syntax, with
-long options starting with two dashes (`-'). A summary of
+long options starting with two dashes (`\-'). A summary of
options is included below.
-.IP "\fB--prefix\fP " 10
+.IP "\fB\-\-prefix\fP " 10
Shows the ORBit-Python prefix.
-.IP "\fB--version\fP " 10
+.IP "\fB\-\-version\fP " 10
Shows the ORBit-Python version.
-.IP "\fB--help\fP " 10
+.IP "\fB\-\-help\fP " 10
Displays a short help.
.SH "SEE ALSO"
.PP
@@ -108 +55 @@
-.\" created by instant / docbook-to-man, Mon 12 Apr 2004, 21:07
+.\" created by instant / docbook-to-man, Sat 17 Jun 2006, 13:43
only in patch2:
unchanged:
--- python-orbit-0.3.1.orig/debian/python-orbit.examples
+++ python-orbit-0.3.1/debian/python-orbit.examples
@@ -0,0 +1 @@
+examples/*
