[Debian-ha-maintainers] Bug#659353: closed by Philipp Hug <debian at hug.cx> (fixed)

[Bastian Blank]

On Wed, Jun 27, 2012 at 03:50:26PM +0200, Philipp Hug wrote:
> Please submit a patch. I have to upload a new version anyway.

Attached.

Bastian

-- 
Only a fool fights in a burning house.
		-- Kank the Klingon, "Day of the Dove", stardate unknown
-------------- next part --------------
diff -Nru drbd8-8.3.13/debian/changelog drbd8-8.3.13/debian/changelog
--- drbd8-8.3.13/debian/changelog	2012-06-15 18:35:07.000000000 +0000
+++ drbd8-8.3.13/debian/changelog	2012-06-27 13:31:22.000000000 +0000
@@ -1,3 +1,12 @@
+drbd8 (2:8.3.13-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix name of udev rules file. (closes: #679266)
+  * Disable module version warning for sublevel missmatch.
+    (closes: #659353)
+
+ -- Bastian Blank <waldi at debian.org>  Wed, 27 Jun 2012 15:26:37 +0200
+
 drbd8 (2:8.3.13-1) unstable; urgency=low
 
   * Update to latest version for Linux 3.2.0
diff -Nru drbd8-8.3.13/debian/patches/disable-version-warning drbd8-8.3.13/debian/patches/disable-version-warning
--- drbd8-8.3.13/debian/patches/disable-version-warning	1970-01-01 00:00:00.000000000 +0000
+++ drbd8-8.3.13/debian/patches/disable-version-warning	2012-06-27 13:31:05.000000000 +0000
@@ -0,0 +1,16 @@
+Description: Disable module version warning for sublevel missmatch
+Author: Bastian Blank <waldi at debian.org>
+Bug-Debian: http://bugs.debian.org/659353
+
+---
+--- drbd8-8.3.13.orig/user/drbdadm_usage_cnt.c
++++ drbd8-8.3.13/user/drbdadm_usage_cnt.c
+@@ -264,7 +264,7 @@ void warn_on_version_mismatch(void)
+ 	else if (cmp & 0xff00)		/* userland is newer minor version */
+ 		msg = "please don't mix different DRBD series.";
+ 	else		/* userland is newer, but only differ in sublevel. */
+-		msg = "preferably kernel and userland versions should match.";
++		return;
+ 
+ 	fprintf(stderr, "DRBD module version: %u.%u.%u\n"
+ 			"   userland version: %u.%u.%u\n%s\n",
diff -Nru drbd8-8.3.13/debian/patches/series drbd8-8.3.13/debian/patches/series
--- drbd8-8.3.13/debian/patches/series	2012-06-15 18:37:35.000000000 +0000
+++ drbd8-8.3.13/debian/patches/series	2012-06-27 13:29:47.000000000 +0000
@@ -1,2 +1,4 @@
 0001-init-interactive-debian-613654.patch
 0002-dpkg-statoverride-instead-of-chgrp-chmod.patch
+udev-rules-name
+disable-version-warning
diff -Nru drbd8-8.3.13/debian/patches/udev-rules-name drbd8-8.3.13/debian/patches/udev-rules-name
--- drbd8-8.3.13/debian/patches/udev-rules-name	1970-01-01 00:00:00.000000000 +0000
+++ drbd8-8.3.13/debian/patches/udev-rules-name	2012-06-27 13:28:09.000000000 +0000
@@ -0,0 +1,16 @@
+Description: Fix name of udev rules file. (closes: #679266)
+Author: Bastian Blank <waldi at debian.org>
+Bug-Debian: http://bugs.debian.org/679266
+
+---
+--- drbd8-8.3.13.orig/scripts/Makefile.in
++++ drbd8-8.3.13/scripts/Makefile.in
+@@ -130,7 +130,7 @@ endif
+ install-udev:
+ ifeq ($(WITH_UDEV),yes)
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
+-	install -m 644 drbd.rules $(DESTDIR)$(sysconfdir)/udev/rules.d/65-drbd.rules$(UDEV_RULE_SUFFIX)
++	install -m 644 drbd.rules $(DESTDIR)$(sysconfdir)/udev/rules.d/65-drbd.rules
+ endif
+ 
+ install-bashcompletion: