Bug#767645: unblock: starpu/1.1.3+dfsg-3 and starpu-contrib/1.1.3+dfsg-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
unblock starpu/1.1.3+dfsg-3
unblock starpu-contrib/1.1.3+dfsg-3
Hello,
I would like to upload the attached changes: when I added libsocl
to main/starpu, I forgot to add the conflict with the version from
contrib/starpu-contrib, libsocl-contrib (since they ship exactly the
same library, with different support).
This fixes Bug#767557.
Samuel
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.17.0 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
--- debian/changelog (.../unstable/debian) (révision 13479)
+++ debian/changelog (.../jessie/debian) (copie de travail)
@@ -1,3 +1,11 @@
+starpu (1.1.3+dfsg-3) UNRELEASED; urgency=medium
+
+ * control: Make libsocl-1.1-1 and libsocl-contrib-1.1-1 conflict/provide each
+ other (Closes: Bug#767557).
+ * Bump Standards-Version to 3.9.6 (no changes).
+
+ -- Samuel Thibault <sthibault@debian.org> Fri, 19 Sep 2014 17:51:54 +0200
+
starpu (1.1.3+dfsg-2) unstable; urgency=medium
* control: Make libstarpu-1.1-7 Replace libstarpu-1.1-6: the soname bump
--- debian/rules (.../unstable/debian) (révision 13479)
+++ debian/rules (.../jessie/debian) (copie de travail)
@@ -65,6 +65,7 @@
sed -i 's/Package: libsocl-contrib/Package: libsocl/' debian/control
sed -i '/Depends/s/ libstarpu-contrib/ libstarpu/g' debian/control
sed -i 's/Conflicts: libstarpu/Conflicts: libstarpu-contrib/' debian/control
+ sed -i 's/Conflicts: libsocl/Conflicts: libsocl-contrib/' debian/control
sed -i 's/Conflicts: starpu/Conflicts: starpu-contrib/' debian/control
sed -i 's/^Provides:/#Provides:/' debian/control
sed -i 's/^Architecture: amd64 i386/Architecture: any/' debian/control
@@ -87,6 +88,7 @@
sed -i 's/Package: libsocl/Package: libsocl-contrib/' debian/control
sed -i '/Depends/s/ libstarpu/ libstarpu-contrib/g' debian/control
sed -i 's/Conflicts: libstarpu-contrib/Conflicts: libstarpu/' debian/control
+ sed -i 's/Conflicts: libsocl-contrib/Conflicts: libsocl/' debian/control
sed -i 's/Conflicts: starpu-contrib/Conflicts: starpu/' debian/control
sed -i 's/^#Provides:/Provides:/' debian/control
sed -i 's/^ gcc-$(GCC_VERSION), g++-$(GCC_VERSION), gfortran-$(GCC_VERSION), gcc-$(GCC_VERSION)-plugin-dev,/# gcc-$(GCC_VERSION), g++-$(GCC_VERSION), gfortran-$(GCC_VERSION), gcc-$(GCC_VERSION)-plugin-dev,/' debian/control
--- debian/control (.../unstable/debian) (révision 13479)
+++ debian/control (.../jessie/debian) (copie de travail)
@@ -23,7 +23,7 @@
help2man,
# nvidia-cuda-toolkit,
#Build-Conflicts: gcc-4.9, g++-4.9, hardening-wrapper
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Section: libs
Homepage: http://starpu.gforge.inria.fr/
Vcs-Svn: svn://scm.gforge.inria.fr/svn/starpu/debian/unstable
@@ -153,6 +153,8 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libsocl-contrib-1.1-1
+#Provides: libsocl-1.1-1
Description: Task scheduler for heterogeneous multicore machines
StarPU is a runtime system that offers support for heterogeneous
multicore machines. While many efforts are devoted to design efficient
--- debian/changelog 2014-09-15 00:03:16.000000000 +0200
+++ debian/changelog 2014-11-01 17:12:10.481340400 +0100
@@ -1,3 +1,11 @@
+starpu-contrib (1.1.3+dfsg-3) UNRELEASED; urgency=medium
+
+ * control: Make libsocl-1.1-1 and libsocl-contrib-1.1-1 conflict/provide each
+ other (Closes: Bug#767557).
+ * Bump Standards-Version to 3.9.6 (no changes).
+
+ -- Samuel Thibault <sthibault@debian.org> Fri, 19 Sep 2014 17:51:54 +0200
+
starpu-contrib (1.1.3+dfsg-2) unstable; urgency=medium
* control: Make libstarpu-1.1-7 Replace libstarpu-1.1-6: the soname bump
--- debian/rules 2014-06-19 16:11:25.000000000 +0200
+++ debian/rules 2014-11-01 17:04:41.533058704 +0100
@@ -65,6 +65,7 @@
sed -i 's/Package: libsocl-contrib/Package: libsocl/' debian/control
sed -i '/Depends/s/ libstarpu-contrib/ libstarpu/g' debian/control
sed -i 's/Conflicts: libstarpu/Conflicts: libstarpu-contrib/' debian/control
+ sed -i 's/Conflicts: libsocl/Conflicts: libsocl-contrib/' debian/control
sed -i 's/Conflicts: starpu/Conflicts: starpu-contrib/' debian/control
sed -i 's/^Provides:/#Provides:/' debian/control
sed -i 's/^Architecture: amd64 i386/Architecture: any/' debian/control
@@ -87,6 +88,7 @@
sed -i 's/Package: libsocl/Package: libsocl-contrib/' debian/control
sed -i '/Depends/s/ libstarpu/ libstarpu-contrib/g' debian/control
sed -i 's/Conflicts: libstarpu-contrib/Conflicts: libstarpu/' debian/control
+ sed -i 's/Conflicts: libsocl-contrib/Conflicts: libsocl/' debian/control
sed -i 's/Conflicts: starpu-contrib/Conflicts: starpu/' debian/control
sed -i 's/^#Provides:/Provides:/' debian/control
sed -i 's/^ gcc-$(GCC_VERSION), g++-$(GCC_VERSION), gfortran-$(GCC_VERSION), gcc-$(GCC_VERSION)-plugin-dev,/# gcc-$(GCC_VERSION), g++-$(GCC_VERSION), gfortran-$(GCC_VERSION), gcc-$(GCC_VERSION)-plugin-dev,/' debian/control
--- debian/control 2014-09-15 00:03:16.000000000 +0200
+++ debian/control 2014-11-01 17:08:54.746451293 +0100
@@ -23,7 +23,7 @@
help2man,
nvidia-cuda-toolkit,
#Build-Conflicts: gcc-4.9, g++-4.9, hardening-wrapper
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Section: contrib/libs
Homepage: http://starpu.gforge.inria.fr/
Vcs-Svn: svn://scm.gforge.inria.fr/svn/starpu/debian/unstable
@@ -153,6 +153,8 @@
Section: contrib/libs
Architecture: amd64 i386
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libsocl-1.1-1
+Provides: libsocl-1.1-1
Description: Task scheduler for heterogeneous multicore machines
StarPU is a runtime system that offers support for heterogeneous
multicore machines. While many efforts are devoted to design efficient
Reply to: