Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian....@packages.debian.org
Usertags: pu


Dear release team,

please pre-upload ack/deny my proposal for stretch-pu of ganeti-os-noop
(closing RC bug #895602).

In the .debdiff I cherry-picked in three more changes to debian/control.

  1. Update of Vcs-*: fields. (Mostly because of this issue [1].

  2. Priorty: optional (merely cosmetic, it allowed simple cherry-picking
  of the next commit.

  3. Maintainer: change due to Alioth mailing list death.

Thanks for your time.

Mike

[1] https://lists.debian.org/debian-www/2018/07/msg00023.html

-- System Information:
Debian Release: 9.5
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'stable-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-6-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru ganeti-os-noop-0.2/debian/changelog 
ganeti-os-noop-0.2/debian/changelog
--- ganeti-os-noop-0.2/debian/changelog 2016-04-11 22:31:50.000000000 +0200
+++ ganeti-os-noop-0.2/debian/changelog 2018-08-21 16:00:41.000000000 +0200
@@ -1,3 +1,17 @@
+ganeti-os-noop (0.2-1+deb9u1) stretch; urgency=medium
+
+  * debian/control:
+    + Update Vcs-*: fields. VCS repo has been migrated to salsa.debian.org.
+    + Priority extra -> optional.
+    + Update Maintainer: field to 'Debian Ganeti Team
+      <ganeti-os-n...@packages.debian.org>'
+  * debian/patches:
+    + Add 1001_fix-export-script-for-non-block-devices.patch. Fix size
+      detection for non-block devices. Thanks to Bastian Blank for
+      providing the patch. (Closes: #895602).
+
+ -- Mike Gabriel <sunwea...@debian.org>  Tue, 21 Aug 2018 16:00:41 +0200
+
 ganeti-os-noop (0.2-1) unstable; urgency=medium
 
   * Initial release. (Closes: #794482).
diff -Nru ganeti-os-noop-0.2/debian/control ganeti-os-noop-0.2/debian/control
--- ganeti-os-noop-0.2/debian/control   2016-04-12 09:02:37.000000000 +0200
+++ ganeti-os-noop-0.2/debian/control   2018-08-21 16:00:41.000000000 +0200
@@ -1,7 +1,7 @@
 Source: ganeti-os-noop
 Section: admin
-Priority: extra
-Maintainer: Debian Ganeti Team <pkg-ganeti-de...@lists.alioth.debian.org>
+Priority: optional
+Maintainer: Debian Ganeti Team <ganeti-os-n...@packages.debian.org>
 Uploaders:
  Apollon Oikonomopoulos <apoi...@gmail.com>,
  Mike Gabriel <sunwea...@debian.org>,
@@ -10,8 +10,8 @@
  debhelper (>= 9)
 Standards-Version: 3.9.7
 Homepage: https://github.com/grnet/ganeti-os-noop
-Vcs-Browser: https://anonscm.debian.org/git/pkg-ganeti/ganeti-os-noop.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-ganeti/ganeti-os-noop.git
+Vcs-Browser: https://salsa.debian.org/ganeti-team/ganeti-os-noop
+Vcs-Git: https://salsa.debian.org/ganeti-team/ganeti-os-noop
 
 Package: ganeti-os-noop
 Architecture: all
diff -Nru 
ganeti-os-noop-0.2/debian/patches/1001_fix-export-script-for-non-block-devices.patch
 
ganeti-os-noop-0.2/debian/patches/1001_fix-export-script-for-non-block-devices.patch
--- 
ganeti-os-noop-0.2/debian/patches/1001_fix-export-script-for-non-block-devices.patch
        1970-01-01 01:00:00.000000000 +0100
+++ 
ganeti-os-noop-0.2/debian/patches/1001_fix-export-script-for-non-block-devices.patch
        2018-08-21 16:00:22.000000000 +0200
@@ -0,0 +1,18 @@
+Description: Fix size detection for non-block devices
+Author: Bastian Blank <bastian.bl...@credativ.de>
+
+--- a/ganeti/os/noop/export
++++ b/ganeti/os/noop/export
+@@ -28,7 +28,11 @@
+ # https://bugs.launchpad.net/ubuntu/+source/dash/+bug/249620
+ 
+ if test -n "$EXP_SIZE_FD"; then
+-  blockdev --getsize64 "$EXPORT_DEVICE" >&"$EXP_SIZE_FD"
++  if [ -f "$EXPORT_DEVICE" ]; then
++    stat -c '%s' "$EXPORT_DEVICE" >&"$EXP_SIZE_FD"
++  else
++    blockdev --getsize64 "$EXPORT_DEVICE" >&"$EXP_SIZE_FD"
++  fi
+ fi
+ 
+ dd if="$EXPORT_DEVICE" bs=1048576
diff -Nru ganeti-os-noop-0.2/debian/patches/README 
ganeti-os-noop-0.2/debian/patches/README
--- ganeti-os-noop-0.2/debian/patches/README    1970-01-01 01:00:00.000000000 
+0100
+++ ganeti-os-noop-0.2/debian/patches/README    2018-08-21 16:00:22.000000000 
+0200
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff -Nru ganeti-os-noop-0.2/debian/patches/series 
ganeti-os-noop-0.2/debian/patches/series
--- ganeti-os-noop-0.2/debian/patches/series    1970-01-01 01:00:00.000000000 
+0100
+++ ganeti-os-noop-0.2/debian/patches/series    2018-08-21 16:00:22.000000000 
+0200
@@ -0,0 +1 @@
+1001_fix-export-script-for-non-block-devices.patch

Reply via email to