Bug#775151: unblock: code-saturne/3.3.2-3
On 2015-01-13 20:40, Gilles Filippini wrote: Niels Thykier a écrit le 13/01/2015 17:12 : Control: tags -1 moreinfo [...] Hi, Thanks for providing this patch. Unfortunately, I suspect is missing a versioned Breaks and Replace on code-saturne-data (from code-saturne-include). This is customary (and required) for moving files between two packages and it does not seem to be present in the debdiff you provided. Without this, we would simply trade one RC bug for another. You're right /o\ Fixed and uploaded as version 3.3.2-4. New debdiff against 3.3.2-2 attached. Thanks! _g. Unblocked, thanks. I took the liberty of closing #775259 as well. ~Niels -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#775151: unblock: code-saturne/3.3.2-3
Niels Thykier a écrit le 13/01/2015 17:12 :
Control: tags -1 moreinfo
On 2015-01-12 01:37, Gilles Filippini wrote:
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
Please unblock package code-saturne
Version 3.3.2-3 fixes RC bug #775107 which makes code-saturne mostly
unusable on all archs but one because an arch dependent file
(cs_config.py) was shipped with an arch=all package.
The fix moves cs_config.py to code-saturne-include which is arch=any.
Please find attache the debdiff against version 3.3.2-2.
unblock code-saturne/3.3.2-3
Thanks,
_g.
[...]
Hi,
Thanks for providing this patch.
Unfortunately, I suspect is missing a versioned Breaks and Replace
on code-saturne-data (from code-saturne-include). This is customary
(and required) for moving files between two packages and it does not
seem to be present in the debdiff you provided. Without this, we would
simply trade one RC bug for another.
You're right /o\
Fixed and uploaded as version 3.3.2-4.
New debdiff against 3.3.2-2 attached.
Thanks!
_g.
diff -Nru code-saturne-3.3.2/debian/changelog
code-saturne-3.3.2/debian/changelog
--- code-saturne-3.3.2/debian/changelog 2014-09-23 13:12:19.0 +0200
+++ code-saturne-3.3.2/debian/changelog 2015-01-13 19:28:31.0 +0100
@@ -1,3 +1,19 @@
+code-saturne (3.3.2-4) unstable; urgency=medium
+
+ * Team upload.
+ * debian/control: add missing Breaks / Replaces to fix the previous
+change (cf. Policy section 7.6.1).
+
+ -- Gilles Filippini p...@debian.org Tue, 13 Jan 2015 19:28:29 +0100
+
+code-saturne (3.3.2-3) unstable; urgency=medium
+
+ * Team upload.
+ * Move arch-dependant script cs_config.py from code-saturne-data to
+code-saturne-include (Closes: #775107).
+
+ -- Gilles Filippini p...@debian.org Sun, 11 Jan 2015 16:01:45 +0100
+
code-saturne (3.3.2-2) unstable; urgency=medium
* Team upload.
diff -Nru code-saturne-3.3.2/debian/code-saturne-include.install
code-saturne-3.3.2/debian/code-saturne-include.install
--- code-saturne-3.3.2/debian/code-saturne-include.install 2014-09-22
21:39:38.0 +0200
+++ code-saturne-3.3.2/debian/code-saturne-include.install 2015-01-11
15:14:41.0 +0100
@@ -1,2 +1,2 @@
debian/tmp/usr/include
-
+debian/tmp/usr/lib/python*/dist-packages/code_saturne/cs_config.py
diff -Nru code-saturne-3.3.2/debian/control code-saturne-3.3.2/debian/control
--- code-saturne-3.3.2/debian/control 2014-09-23 11:53:33.0 +0200
+++ code-saturne-3.3.2/debian/control 2015-01-13 19:40:28.0 +0100
@@ -99,6 +99,8 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libcgns-dev, libmedc-dev,
libhdf5-dev, zlib1g-dev, mpi-default-dev, libxml2-dev
+Replaces: code-saturne-data ( 3.3.2-3)
+Breaks: code-saturne-data ( 3.3.2-3)
Description: General purpose Computational Fluid Dynamics (CFD) software -
includes
The basic capabilities of Code_Saturne enable the handling of either
incompressible or expandable flows with or without heat transfer and
diff -Nru code-saturne-3.3.2/debian/rules code-saturne-3.3.2/debian/rules
--- code-saturne-3.3.2/debian/rules 2014-09-23 13:02:24.0 +0200
+++ code-saturne-3.3.2/debian/rules 2015-01-13 19:18:31.0 +0100
@@ -1,6 +1,10 @@
#!/usr/bin/make -f
# Copyright 2009 Sylvestre Ledru sylves...@debian.org
+# Exclude cs_config.py from package code-saturne-data
+# It should go into code-saturne-include
+binary-install/code-saturne-data:: DEB_DH_INSTALL_ARGS := -Xcs_config.py
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/autoreconf.mk
@@ -28,3 +32,6 @@
binary-install/code-saturne-data::
chmod +x debian/code-saturne-data/usr/share/code_saturne/runcase*
dh_python2 -pcode-saturne-data
+
+binary-install/code-saturne-include::
+ dh_python2 -pcode-saturne-include
signature.asc
Description: OpenPGP digital signature
Bug#775151: unblock: code-saturne/3.3.2-3
Control: tags -1 moreinfo On 2015-01-12 01:37, Gilles Filippini wrote: Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: unblock Please unblock package code-saturne Version 3.3.2-3 fixes RC bug #775107 which makes code-saturne mostly unusable on all archs but one because an arch dependent file (cs_config.py) was shipped with an arch=all package. The fix moves cs_config.py to code-saturne-include which is arch=any. Please find attache the debdiff against version 3.3.2-2. unblock code-saturne/3.3.2-3 Thanks, _g. [...] Hi, Thanks for providing this patch. Unfortunately, I suspect is missing a versioned Breaks and Replace on code-saturne-data (from code-saturne-include). This is customary (and required) for moving files between two packages and it does not seem to be present in the debdiff you provided. Without this, we would simply trade one RC bug for another. ~Niels -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#775151: unblock: code-saturne/3.3.2-3
Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: unblock -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Please unblock package code-saturne Version 3.3.2-3 fixes RC bug #775107 which makes code-saturne mostly unusable on all archs but one because an arch dependent file (cs_config.py) was shipped with an arch=all package. The fix moves cs_config.py to code-saturne-include which is arch=any. Please find attache the debdiff against version 3.3.2-2. unblock code-saturne/3.3.2-3 Thanks, _g. - -- System Information: Debian Release: 8.0 APT prefers testing-updates APT policy: (500, 'testing-updates'), (500, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQEcBAEBCAAGBQJUsxdmAAoJEO/obGx//s+DvQ8H/2zkJq8B6UL3G/yW+yPHr7F6 mlNHApygs5IIlj4M+43jjaUlKLHadOJkTaaZpUNjE2BIw79Kf7vyDfYBbmLiofpb OVhweZ9c9WYcL6YFTI1sMJiEFwv3xNO/EeqJNPEVxIGjSP9JsZ5l4l6/m8M10B3Q MJeRvqf7fEdQJ+vEkWormCjyEYpjAyU0PPpCPXpa/UV1l4O0st/B2KCQaZ1TinpA A7YHE7yga2kMfHEqaPz4tKp72KcrRSLA1N0TExWsPETE7Wmf7eZ+WFgkKxUWZEnW jrFwWjTR0/4uMP2J4vbpZHNYD8J/llpP/Km3Ch0M5avzCod+Se7lm17h+DAjQfU= =Y1Tp -END PGP SIGNATURE- diff -Nru code-saturne-3.3.2/debian/changelog code-saturne-3.3.2/debian/changelog --- code-saturne-3.3.2/debian/changelog 2014-09-23 13:12:19.0 +0200 +++ code-saturne-3.3.2/debian/changelog 2015-01-11 17:08:40.0 +0100 @@ -1,3 +1,11 @@ +code-saturne (3.3.2-3) unstable; urgency=medium + + * Team upload. + * Move arch-dependant script cs_config.py from code-saturne-data to +code-saturne-include (Closes: #775107). + + -- Gilles Filippini p...@debian.org Sun, 11 Jan 2015 16:01:45 +0100 + code-saturne (3.3.2-2) unstable; urgency=medium * Team upload. diff -Nru code-saturne-3.3.2/debian/code-saturne-include.install code-saturne-3.3.2/debian/code-saturne-include.install --- code-saturne-3.3.2/debian/code-saturne-include.install 2014-09-22 21:39:38.0 +0200 +++ code-saturne-3.3.2/debian/code-saturne-include.install 2015-01-11 17:08:40.0 +0100 @@ -1,2 +1,2 @@ debian/tmp/usr/include - +debian/tmp/usr/lib/python*/dist-packages/code_saturne/cs_config.py diff -Nru code-saturne-3.3.2/debian/rules code-saturne-3.3.2/debian/rules --- code-saturne-3.3.2/debian/rules 2014-09-23 13:02:24.0 +0200 +++ code-saturne-3.3.2/debian/rules 2015-01-11 17:08:40.0 +0100 @@ -1,6 +1,10 @@ #!/usr/bin/make -f # Copyright 2009 Sylvestre Ledru sylves...@debian.org +# Exclude cs_config.py from package code-saturne-data +# It should go into code-saturne-include +binary-install/code-saturne-data:: DEB_DH_INSTALL_ARGS := -Xcs_config.py + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/autoreconf.mk @@ -28,3 +32,6 @@ binary-install/code-saturne-data:: chmod +x debian/code-saturne-data/usr/share/code_saturne/runcase* dh_python2 -pcode-saturne-data + +binary-install/code-saturne-include:: + dh_python2 -pcode-saturne-include
