[adios] 10/10: Fix Breaks/Replaces for file moves
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 7 12:20:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository adios.
commit c7da19d1dc2521771d5ad303c12a76d6c73f498a
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Jul 1 17:08:16 2015 +0100
Fix Breaks/Replaces for file moves
---
debian/changelog | 9 +-
debian/control | 8 +-
debian/libadios-bin.install | 1 -
debian/patches/multiarch_safe.patch | 168 ++++++++++++++++++++----------------
debian/python-adios.install | 1 -
debian/python3-adios.install | 1 +
6 files changed, 109 insertions(+), 79 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 405cb31..b28185b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-adios (1.8.0-3) UNRELEASED; urgency=medium
+adios (1.8.0-2) unstable; urgency=medium
* Ensure CFLAGS are included in build
- * Add Breaks/Replaces/Provides to handle move of /etc/skel.py
+ * Add Breaks/Replaces/Provides to handle move of /etc/skel.py
+ Closes: #789663.
* Put Vcs-Git: reference in canonical anonscm.debian.org form
+ * Make examples multiarch safe by fixing @host@, @build@ in Makefiles
+ to call dpkg-architecture at runtime. Closes: #789464
- -- Alastair McKinstry <mckinstry at debian.org> Thu, 25 Jun 2015 18:46:21 +0100
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 01 Jul 2015 17:07:14 +0100
adios (1.8.0-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 4c60a92..3119949 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Package: libadios-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
Recommends: libadios-bin
Description: ADIOS Adaptable IO system for simulations
The Adaptable IO System (ADIOS) provides a simple, flexible way for scientists
@@ -46,10 +46,12 @@ Description: ADIOS Adaptable IO system for simulations - binaries
This package provides tools for use with ADIOS.
Package: python-adios
-Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python3-adios
Section: python
Architecture: any
Multi-Arch: same
+Breaks: libadios-bin ( << 1.8.0-2), libadios-dev ( << 1.8.0-2)
+Replaces: libadios-bin ( << 1.8.0-2), libadios-dev ( << 1.8.0-2)
Provides: ${python:Provides}
Description: Python interace to the ADIOS IO system
This is a Python2 interface to ADIOS.
@@ -68,6 +70,8 @@ Section: python
Architecture: any
Multi-Arch: same
Provides: ${python:Provides}
+Breaks: libadios-bin ( << 1.8.0-2), libadios-dev ( << 1.8.0-2), python-adios ( << 1.8.0-2)
+Replaces: libadios-bin ( << 1.8.0-2), libadios-dev ( << 1.8.0-2)
Description: Python3 interace to the ADIOS IO system
This is a Python3 interface to ADIOS.
.
diff --git a/debian/libadios-bin.install b/debian/libadios-bin.install
index f0bb3c3..554de35 100644
--- a/debian/libadios-bin.install
+++ b/debian/libadios-bin.install
@@ -13,6 +13,5 @@ usr/bin/skel
usr/bin/skel_cat
usr/bin/skel_extract
usr/bin/skeldump
-usr/bin/type_mapper.py /usr/share/pyshared
usr/etc/skel /etc/adios
debian/bash_completion.d/* /usr/share/bash-completion/completions
diff --git a/debian/patches/multiarch_safe.patch b/debian/patches/multiarch_safe.patch
index 35f4b76..e2cb51b 100644
--- a/debian/patches/multiarch_safe.patch
+++ b/debian/patches/multiarch_safe.patch
@@ -5,9 +5,10 @@ Description: Make example files multi-arch safe by extracting @host@, @build@
Last-Updated: 2015-07-02
Forwarded: not-needed
-diff -urN examples.orig/C/arrays/Makefile.in examples/C/arrays/Makefile.in
---- examples.orig/C/arrays/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/arrays/Makefile.in 2015-07-01 16:12:02.074948284 +0100
+Index: adios-1.8.0/examples/C/arrays/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/arrays/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/arrays/Makefile.in 2015-07-01 16:12:02.074948284 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -37,9 +38,10 @@ diff -urN examples.orig/C/arrays/Makefile.in examples/C/arrays/Makefile.in
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/attributes/Makefile.in examples/C/attributes/Makefile.in
---- examples.orig/C/attributes/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/attributes/Makefile.in 2015-07-01 16:12:02.102949089 +0100
+Index: adios-1.8.0/examples/C/attributes/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/attributes/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/attributes/Makefile.in 2015-07-01 16:12:02.102949089 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -69,9 +71,10 @@ diff -urN examples.orig/C/attributes/Makefile.in examples/C/attributes/Makefile.
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/flexpath_arrays/global_range_select/Makefile.in examples/C/flexpath_arrays/global_range_select/Makefile.in
---- examples.orig/C/flexpath_arrays/global_range_select/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/flexpath_arrays/global_range_select/Makefile.in 2015-07-01 16:12:02.178951273 +0100
+Index: adios-1.8.0/examples/C/flexpath_arrays/global_range_select/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/flexpath_arrays/global_range_select/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/flexpath_arrays/global_range_select/Makefile.in 2015-07-01 16:12:02.178951273 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -101,9 +104,10 @@ diff -urN examples.orig/C/flexpath_arrays/global_range_select/Makefile.in exampl
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/flexpath_arrays/Makefile.in examples/C/flexpath_arrays/Makefile.in
---- examples.orig/C/flexpath_arrays/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/flexpath_arrays/Makefile.in 2015-07-01 16:12:02.166950928 +0100
+Index: adios-1.8.0/examples/C/flexpath_arrays/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/flexpath_arrays/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/flexpath_arrays/Makefile.in 2015-07-01 16:12:02.166950928 +0100
@@ -31,8 +31,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -133,9 +137,10 @@ diff -urN examples.orig/C/flexpath_arrays/Makefile.in examples/C/flexpath_arrays
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/flexpath_arrays/process_select/Makefile.in examples/C/flexpath_arrays/process_select/Makefile.in
---- examples.orig/C/flexpath_arrays/process_select/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/flexpath_arrays/process_select/Makefile.in 2015-07-01 16:12:02.170951043 +0100
+Index: adios-1.8.0/examples/C/flexpath_arrays/process_select/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/flexpath_arrays/process_select/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/flexpath_arrays/process_select/Makefile.in 2015-07-01 16:12:02.170951043 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -165,9 +170,10 @@ diff -urN examples.orig/C/flexpath_arrays/process_select/Makefile.in examples/C/
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/global-array/Makefile.in examples/C/global-array/Makefile.in
---- examples.orig/C/global-array/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/global-array/Makefile.in 2015-07-01 16:12:02.142950238 +0100
+Index: adios-1.8.0/examples/C/global-array/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/global-array/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/global-array/Makefile.in 2015-07-01 16:12:02.142950238 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -197,9 +203,10 @@ diff -urN examples.orig/C/global-array/Makefile.in examples/C/global-array/Makef
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/global-array-time/Makefile.in examples/C/global-array-time/Makefile.in
---- examples.orig/C/global-array-time/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/global-array-time/Makefile.in 2015-07-01 16:12:02.118949549 +0100
+Index: adios-1.8.0/examples/C/global-array-time/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/global-array-time/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/global-array-time/Makefile.in 2015-07-01 16:12:02.118949549 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -229,9 +236,10 @@ diff -urN examples.orig/C/global-array-time/Makefile.in examples/C/global-array-
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/icee_arrays/array/Makefile.in examples/C/icee_arrays/array/Makefile.in
---- examples.orig/C/icee_arrays/array/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/icee_arrays/array/Makefile.in 2015-07-01 16:12:02.138950123 +0100
+Index: adios-1.8.0/examples/C/icee_arrays/array/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/icee_arrays/array/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/icee_arrays/array/Makefile.in 2015-07-01 16:12:02.138950123 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -261,9 +269,10 @@ diff -urN examples.orig/C/icee_arrays/array/Makefile.in examples/C/icee_arrays/a
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/icee_arrays/Makefile.in examples/C/icee_arrays/Makefile.in
---- examples.orig/C/icee_arrays/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/icee_arrays/Makefile.in 2015-07-01 16:12:02.130949893 +0100
+Index: adios-1.8.0/examples/C/icee_arrays/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/icee_arrays/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/icee_arrays/Makefile.in 2015-07-01 16:12:02.130949893 +0100
@@ -31,8 +31,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -293,9 +302,10 @@ diff -urN examples.orig/C/icee_arrays/Makefile.in examples/C/icee_arrays/Makefil
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/Makefile.in examples/C/Makefile.in
---- examples.orig/C/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/Makefile.in 2015-07-01 16:12:02.066948054 +0100
+Index: adios-1.8.0/examples/C/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/Makefile.in 2015-07-01 16:12:02.066948054 +0100
@@ -31,8 +31,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -325,9 +335,10 @@ diff -urN examples.orig/C/Makefile.in examples/C/Makefile.in
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/manual/Makefile.in examples/C/manual/Makefile.in
---- examples.orig/C/manual/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/manual/Makefile.in 2015-07-01 16:12:02.114949434 +0100
+Index: adios-1.8.0/examples/C/manual/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/manual/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/manual/Makefile.in 2015-07-01 16:12:02.114949434 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -357,9 +368,10 @@ diff -urN examples.orig/C/manual/Makefile.in examples/C/manual/Makefile.in
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/query/Makefile.in examples/C/query/Makefile.in
---- examples.orig/C/query/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/query/Makefile.in 2015-07-01 16:12:02.150950468 +0100
+Index: adios-1.8.0/examples/C/query/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/query/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/query/Makefile.in 2015-07-01 16:12:02.150950468 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -389,9 +401,10 @@ diff -urN examples.orig/C/query/Makefile.in examples/C/query/Makefile.in
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/read_all/Makefile.in examples/C/read_all/Makefile.in
---- examples.orig/C/read_all/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/read_all/Makefile.in 2015-07-01 16:12:02.094948859 +0100
+Index: adios-1.8.0/examples/C/read_all/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/read_all/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/read_all/Makefile.in 2015-07-01 16:12:02.094948859 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -421,9 +434,10 @@ diff -urN examples.orig/C/read_all/Makefile.in examples/C/read_all/Makefile.in
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/scalars/Makefile.in examples/C/scalars/Makefile.in
---- examples.orig/C/scalars/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/scalars/Makefile.in 2015-07-01 16:12:02.122949664 +0100
+Index: adios-1.8.0/examples/C/scalars/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/scalars/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/scalars/Makefile.in 2015-07-01 16:12:02.122949664 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -453,9 +467,10 @@ diff -urN examples.orig/C/scalars/Makefile.in examples/C/scalars/Makefile.in
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/schema/Makefile.in examples/C/schema/Makefile.in
---- examples.orig/C/schema/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/schema/Makefile.in 2015-07-01 16:12:02.082948514 +0100
+Index: adios-1.8.0/examples/C/schema/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/schema/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/schema/Makefile.in 2015-07-01 16:12:02.082948514 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -485,9 +500,10 @@ diff -urN examples.orig/C/schema/Makefile.in examples/C/schema/Makefile.in
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/stat/Makefile.in examples/C/stat/Makefile.in
---- examples.orig/C/stat/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/stat/Makefile.in 2015-07-01 16:12:02.086948629 +0100
+Index: adios-1.8.0/examples/C/stat/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/stat/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/stat/Makefile.in 2015-07-01 16:12:02.086948629 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -517,9 +533,10 @@ diff -urN examples.orig/C/stat/Makefile.in examples/C/stat/Makefile.in
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/C/transforms/Makefile.in examples/C/transforms/Makefile.in
---- examples.orig/C/transforms/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/C/transforms/Makefile.in 2015-07-01 16:12:02.158950698 +0100
+Index: adios-1.8.0/examples/C/transforms/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/C/transforms/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/C/transforms/Makefile.in 2015-07-01 16:12:02.158950698 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -549,9 +566,10 @@ diff -urN examples.orig/C/transforms/Makefile.in examples/C/transforms/Makefile.
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/Fortran/arrays/Makefile.in examples/Fortran/arrays/Makefile.in
---- examples.orig/Fortran/arrays/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/Fortran/arrays/Makefile.in 2015-07-01 16:12:02.190951618 +0100
+Index: adios-1.8.0/examples/Fortran/arrays/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/Fortran/arrays/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/Fortran/arrays/Makefile.in 2015-07-01 16:12:02.190951618 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -581,9 +599,10 @@ diff -urN examples.orig/Fortran/arrays/Makefile.in examples/Fortran/arrays/Makef
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/Fortran/global-array/Makefile.in examples/Fortran/global-array/Makefile.in
---- examples.orig/Fortran/global-array/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/Fortran/global-array/Makefile.in 2015-07-01 16:12:02.218952422 +0100
+Index: adios-1.8.0/examples/Fortran/global-array/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/Fortran/global-array/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/Fortran/global-array/Makefile.in 2015-07-01 16:12:02.218952422 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -613,9 +632,10 @@ diff -urN examples.orig/Fortran/global-array/Makefile.in examples/Fortran/global
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/Fortran/global-array-time/Makefile.in examples/Fortran/global-array-time/Makefile.in
---- examples.orig/Fortran/global-array-time/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/Fortran/global-array-time/Makefile.in 2015-07-01 16:12:02.206952077 +0100
+Index: adios-1.8.0/examples/Fortran/global-array-time/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/Fortran/global-array-time/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/Fortran/global-array-time/Makefile.in 2015-07-01 16:12:02.206952077 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -645,9 +665,10 @@ diff -urN examples.orig/Fortran/global-array-time/Makefile.in examples/Fortran/g
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/Fortran/Makefile.in examples/Fortran/Makefile.in
---- examples.orig/Fortran/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/Fortran/Makefile.in 2015-07-01 16:12:02.186951503 +0100
+Index: adios-1.8.0/examples/Fortran/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/Fortran/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/Fortran/Makefile.in 2015-07-01 16:12:02.186951503 +0100
@@ -31,8 +31,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -677,9 +698,10 @@ diff -urN examples.orig/Fortran/Makefile.in examples/Fortran/Makefile.in
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/Fortran/scalars/Makefile.in examples/Fortran/scalars/Makefile.in
---- examples.orig/Fortran/scalars/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/Fortran/scalars/Makefile.in 2015-07-01 16:12:02.210952192 +0100
+Index: adios-1.8.0/examples/Fortran/scalars/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/Fortran/scalars/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/Fortran/scalars/Makefile.in 2015-07-01 16:12:02.210952192 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -709,9 +731,10 @@ diff -urN examples.orig/Fortran/scalars/Makefile.in examples/Fortran/scalars/Mak
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/Fortran/schema/Makefile.in examples/Fortran/schema/Makefile.in
---- examples.orig/Fortran/schema/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/Fortran/schema/Makefile.in 2015-07-01 16:12:02.198951848 +0100
+Index: adios-1.8.0/examples/Fortran/schema/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/Fortran/schema/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/Fortran/schema/Makefile.in 2015-07-01 16:12:02.198951848 +0100
@@ -32,8 +32,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
@@ -741,9 +764,10 @@ diff -urN examples.orig/Fortran/schema/Makefile.in examples/Fortran/schema/Makef
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
-diff -urN examples.orig/Makefile.in examples/Makefile.in
---- examples.orig/Makefile.in 2015-06-22 16:37:15.000000000 +0100
-+++ examples/Makefile.in 2015-07-01 16:12:02.226952652 +0100
+Index: adios-1.8.0/examples/Makefile.in
+===================================================================
+--- adios-1.8.0.orig/examples/Makefile.in 2015-06-22 16:37:15.000000000 +0100
++++ adios-1.8.0/examples/Makefile.in 2015-07-01 16:12:02.226952652 +0100
@@ -31,8 +31,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
diff --git a/debian/python-adios.install b/debian/python-adios.install
index 819e364..b2cc136 100644
--- a/debian/python-adios.install
+++ b/debian/python-adios.install
@@ -1,2 +1 @@
usr/lib/python2*
-usr/lib/*/python/* /usr/share/pyshared/adios
diff --git a/debian/python3-adios.install b/debian/python3-adios.install
index 4606faa..3fc51b6 100644
--- a/debian/python3-adios.install
+++ b/debian/python3-adios.install
@@ -1 +1,2 @@
usr/lib/python3*
+usr/lib/*/python/* /usr/share/pyshared/adios
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git
More information about the debian-science-commits
mailing list