Your message dated Sun, 04 Nov 2007 13:02:02 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#448876: fixed in drbd8 2:8.0.7-1
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: drbd8
Version: 2:8.0.4-1
Severity: whishist
Hello,
find attached the Diff for my NMU.
Best regards
Frederik Schüer
--
ENOSIG
diff -ruN drbd8-8.0.4/debian/changelog drbd8-8.0.6/debian/changelog
--- drbd8-8.0.4/debian/changelog 2007-09-07 14:19:47.000000000 +0200
+++ drbd8-8.0.6/debian/changelog 2007-11-01 15:14:05.000000000 +0100
@@ -1,3 +1,18 @@
+drbd8 (2:8.0.6-0.1) unstable; urgency=low
+
+ * Non-Maintainer upload with permission of Philipp Hug.
+ * New upstream release (Closes: #438167)
+ * Switch to debhelper 5.
+ * Rename kernel module package from drbd8-module-source to
+ drbd8-source.
+ * Compress the module source tarball with bzip2.
+ * Provide modules/drbd8 to allow parallel installation with
+ drbd0.7-module-source, and remove obsolete Conflict header.
+ * Provide own Makefiles in the module tarball for automated building
+ within linux-modules-extra-2.6 (closes: #431771)
+
+ -- Frederik Schüler <[EMAIL PROTECTED]> Thu, 01 Nov 2007 15:13:29 +0100
+
drbd8 (2:8.0.4-1) unstable; urgency=low
* New upstream release (Closes: #432104)
diff -ruN drbd8-8.0.4/debian/compat drbd8-8.0.6/debian/compat
--- drbd8-8.0.4/debian/compat 2007-09-07 14:19:47.000000000 +0200
+++ drbd8-8.0.6/debian/compat 2007-09-07 14:24:05.000000000 +0200
@@ -1 +1 @@
-4
+5
diff -ruN drbd8-8.0.4/debian/control drbd8-8.0.6/debian/control
--- drbd8-8.0.4/debian/control 2007-09-07 14:19:47.000000000 +0200
+++ drbd8-8.0.6/debian/control 2007-11-01 15:16:31.000000000 +0100
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Cyril Bouthors <[EMAIL PROTECTED]>
Uploaders: Philipp Hug <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4), debconf-utils, sp, docbook-utils, bison, flex, dpatch
+Build-Depends: debhelper (>= 5), debconf-utils, sp, docbook-utils, bison, flex, dpatch, bzip2
Standards-Version: 3.7.2
Package: drbd8-utils
@@ -27,13 +27,11 @@
.
Homepage: http://www.drbd.org
-Package: drbd8-module-source
+Package: drbd8-source
Architecture: all
Section: admin
-Depends: module-assistant, debhelper (>= 4), dpatch
-Conflicts: drbd-module-source, drbd-source
-Provides: drbd-module-source
-Replaces: drbd-module-source, drbd-source
+Depends: module-assistant, debhelper (>= 5), dpatch, bzip2
+Provides: drbd-module-source, drbd-source
Recommends: dpkg-dev, kernel-package, debconf-utils
Description: RAID 1 over tcp/ip for Linux module source
Drbd is a block device which is designed to build high availability
diff -ruN drbd8-8.0.4/debian/control.modules.in drbd8-8.0.6/debian/control.modules.in
--- drbd8-8.0.4/debian/control.modules.in 2007-09-07 14:19:47.000000000 +0200
+++ drbd8-8.0.6/debian/control.modules.in 2007-11-01 15:17:52.000000000 +0100
@@ -2,15 +2,15 @@
Section: misc
Priority: extra
Maintainer: Philipp Hug <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4), drbd8-source
+Build-Depends: debhelper (>= 4), drbd8-source, bzip2
Standards-Version: 3.6.1
-Package: drbd8-module-_KVERS_
+Package: drbd8-_KVERS_
Architecture: any
Depends: drbd8-utils
-Conflicts: drbd-module-_KVERS_
-Provides: drbd-module-_KVERS_
-Replaces: drbd-module-_KVERS_
+Conflicts: drbd-_KVERS_
+Provides: drbd-_KVERS_
+Replaces: drbd-_KVERS_
Section: misc
Recommends: kernel-image-_KVERS_
Description: RAID 1 over tcp/ip for Linux kernel module
diff -ruN drbd8-8.0.4/debian/drbd8-module-source.README.Debian drbd8-8.0.6/debian/drbd8-module-source.README.Debian
--- drbd8-8.0.4/debian/drbd8-module-source.README.Debian 2007-09-07 14:19:47.000000000 +0200
+++ drbd8-8.0.6/debian/drbd8-module-source.README.Debian 1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-drbd for Debian
----------------
-
-The Debian drbd-source package can be used in several ways,
-
- - Using module-assistant(1) commands provided by the module-assistant Debian
- package:
-
- # module-assistant auto-install drbd8
-
- - Using the make-kpkg(1) command provided by the kernel-package Debian
- package. See the "modules_image" section of the make-kpkg(1) man page.
-
- - Unpacking /usr/src/drbd*.tar.bz2 and installing the module on your own.
-
- -- Philipp Hug <[EMAIL PROTECTED]> Thu, 21 Jun 2007 18:08:00 +0000
-
diff -ruN drbd8-8.0.4/debian/drbd8-module-source.dirs drbd8-8.0.6/debian/drbd8-module-source.dirs
--- drbd8-8.0.4/debian/drbd8-module-source.dirs 2007-09-07 14:19:47.000000000 +0200
+++ drbd8-8.0.6/debian/drbd8-module-source.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-usr/src/modules/drbd/debian
-usr/src/modules/drbd/drbd
-usr/share/modass/overrides
diff -ruN drbd8-8.0.4/debian/drbd8-source.Makefile drbd8-8.0.6/debian/drbd8-source.Makefile
--- drbd8-8.0.4/debian/drbd8-source.Makefile 1970-01-01 01:00:00.000000000 +0100
+++ drbd8-8.0.6/debian/drbd8-source.Makefile 2007-09-17 17:39:37.000000000 +0200
@@ -0,0 +1 @@
+obj-m = drbd/
diff -ruN drbd8-8.0.4/debian/drbd8-source.README.Debian drbd8-8.0.6/debian/drbd8-source.README.Debian
--- drbd8-8.0.4/debian/drbd8-source.README.Debian 1970-01-01 01:00:00.000000000 +0100
+++ drbd8-8.0.6/debian/drbd8-source.README.Debian 2007-09-07 14:19:47.000000000 +0200
@@ -0,0 +1,17 @@
+drbd for Debian
+---------------
+
+The Debian drbd-source package can be used in several ways,
+
+ - Using module-assistant(1) commands provided by the module-assistant Debian
+ package:
+
+ # module-assistant auto-install drbd8
+
+ - Using the make-kpkg(1) command provided by the kernel-package Debian
+ package. See the "modules_image" section of the make-kpkg(1) man page.
+
+ - Unpacking /usr/src/drbd*.tar.bz2 and installing the module on your own.
+
+ -- Philipp Hug <[EMAIL PROTECTED]> Thu, 21 Jun 2007 18:08:00 +0000
+
diff -ruN drbd8-8.0.4/debian/drbd8-source.dirs drbd8-8.0.6/debian/drbd8-source.dirs
--- drbd8-8.0.4/debian/drbd8-source.dirs 1970-01-01 01:00:00.000000000 +0100
+++ drbd8-8.0.6/debian/drbd8-source.dirs 2007-09-17 17:35:13.000000000 +0200
@@ -0,0 +1,3 @@
+usr/src/modules/drbd8/debian
+usr/src/modules/drbd8/drbd
+usr/share/modass/overrides
diff -ruN drbd8-8.0.4/debian/drbd8-source.drbd-Makefile drbd8-8.0.6/debian/drbd8-source.drbd-Makefile
--- drbd8-8.0.4/debian/drbd8-source.drbd-Makefile 1970-01-01 01:00:00.000000000 +0100
+++ drbd8-8.0.6/debian/drbd8-source.drbd-Makefile 2007-09-17 17:39:47.000000000 +0200
@@ -0,0 +1,14 @@
+#CFLAGS_drbd_sizeof_sanity_check.o = -Wpadded # -Werror
+
+CFLAGS += -I$(src)
+
+obj-m := drbd.o
+
+drbd-objs := drbd_buildtag.o drbd_bitmap.o drbd_proc.o \
+ drbd_worker.o drbd_receiver.o drbd_req.o drbd_actlog.o \
+ lru_cache.o drbd_main.o drbd_strings.o drbd_nl.o
+
+ifndef CONFIG_CONNECTOR
+ drbd-objs += connector.o cn_queue.o
+endif
+
diff -ruN drbd8-8.0.4/debian/modass.drbd8-module-source drbd8-8.0.6/debian/modass.drbd8-module-source
--- drbd8-8.0.4/debian/modass.drbd8-module-source 2007-09-07 14:19:47.000000000 +0200
+++ drbd8-8.0.6/debian/modass.drbd8-module-source 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# (c) Eduard Bloch <[EMAIL PROTECTED]>, 2003
-# generic maintainer script for module-assistant controled packages
-# to be sourced or copied as example code
-
-# autodetecting values. They may be overriden by the caller.
-
-MA_DIR=${MA_DIR:-/usr/share/modass}
-
-TARBALL=/usr/src/drbd8.tar.gz
-BUILDDIR=${MODULE_LOC:-/usr/src/modules}/drbd
-
-. $MA_DIR/packages/generic.sh
-
-$1 "$@"
diff -ruN drbd8-8.0.4/debian/modass.drbd8-source drbd8-8.0.6/debian/modass.drbd8-source
--- drbd8-8.0.4/debian/modass.drbd8-source 1970-01-01 01:00:00.000000000 +0100
+++ drbd8-8.0.6/debian/modass.drbd8-source 2007-09-17 17:10:49.000000000 +0200
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# (c) Eduard Bloch <[EMAIL PROTECTED]>, 2003
+# generic maintainer script for module-assistant controled packages
+# to be sourced or copied as example code
+
+# autodetecting values. They may be overriden by the caller.
+
+MA_DIR=${MA_DIR:-/usr/share/modass}
+
+TARBALL=/usr/src/drbd8.tar.bz2
+BUILDDIR=${MODULE_LOC:-/usr/src/modules}/drbd8
+
+. $MA_DIR/packages/generic.sh
+
+$1 "$@"
diff -ruN drbd8-8.0.4/debian/rules drbd8-8.0.6/debian/rules
--- drbd8-8.0.4/debian/rules 2007-09-07 14:19:47.000000000 +0200
+++ drbd8-8.0.6/debian/rules 2007-09-17 21:06:31.000000000 +0200
@@ -14,7 +14,7 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
-PACKAGE=drbd8-module
+PACKAGE=drbd8
MA_DIR ?= /usr/share/modass
-include $(MA_DIR)/include/generic.make
-include $(MA_DIR)/include/common-rules.make
@@ -45,7 +45,7 @@
kdist_clean: unpatch
dh_clean
- -$(MAKE) -C drbd clean
+ -$(MAKE) -C $(KSRC) M=$(CURDIR)/drbd/ clean
# prep-deb-files rewrites the debian/ files as needed. See RATIONALE for
# details
@@ -58,8 +58,10 @@
dh_testdir
dh_testroot
dh_clean -k
- $(MAKE) -C drbd KERNEL_SOURCES=$(KSRC) MODVERSIONS=detect KERNEL=linux-$(KVERS) KDIR=$(KSRC) KBUILD_PARAMS=$(KBUILD_PARAMS)
- install -m644 -b -D drbd/drbd.$(KO)o $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/drivers/block/drbd.$(KO)o
+ make -C $(KSRC) M=$(CURDIR)/drbd/ modules
+ install -m644 -b -D drbd/drbd.$(KO)o $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/extra/drbd.$(KO)o
+ # this is broken, dunno why:
+ #make -C $(KSRC) M=$(CURDIR)/drbd/ modules_install INSTALL_MOD_PATH=$(CURDIR)/debian/$(PKGNAME) INSTALL_MOD_DIR=extra/
dh_installdocs
dh_installchangelogs
dh_compress
@@ -91,7 +93,7 @@
rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
# remove these files from upstream tgz
rm -f debian/drbd8.*
- rm -f debian/drbd8-source.dirs
+ #rm -f debian/drbd8-source.dirs
rm -f debian/kernel-patch-wup.kpatches debian/kernel-patch-wup.README.Debian debian/kernel-export-wup.patch
-$(MAKE) -C user clean
-$(MAKE) -C scripts clean
@@ -106,19 +108,22 @@
dh_testroot
dh_clean -k -i
dh_installdirs -i
- cp -a drbd/* debian/$(PACKAGE)-source/usr/src/modules/drbd/drbd
- cp Makefile debian/$(PACKAGE)-source/usr/src/modules/drbd
- cp drbd/linux/drbd_config.h debian/$(PACKAGE)-source/usr/src/modules/drbd
- mkdir debian/$(PACKAGE)-source/usr/src/modules/drbd/scripts/
+ cp -a drbd/* debian/$(PACKAGE)-source/usr/src/modules/drbd8/drbd/
+ rm debian/$(PACKAGE)-source/usr/src/modules/drbd8/drbd/Makefile \
+ debian/$(PACKAGE)-source/usr/src/modules/drbd8/drbd/Makefile-2.6
+ cp debian/drbd8-source.Makefile debian/$(PACKAGE)-source/usr/src/modules/drbd8/Makefile
+ cp debian/drbd8-source.drbd-Makefile debian/$(PACKAGE)-source/usr/src/modules/drbd8/drbd/Makefile
+ cp drbd/linux/drbd_config.h debian/$(PACKAGE)-source/usr/src/modules/drbd8
# cp -a scripts/adjust_drbd_config_h.sh debian/$(PACKAGE)-source/usr/src/modules/drbd/scripts/
-
+
# install debian/ files
- cd debian ; cp changelog control compat *.modules.in rules copyright $(PACKAGE)-source/usr/src/modules/drbd/debian
-
+ mkdir -p debian/$(PACKAGE)-source/usr/src/modules/drbd8/debian/
+ cd debian ; cp changelog control compat *.modules.in rules copyright $(PACKAGE)-source/usr/src/modules/drbd8/debian
+
# tar the stuff
- cd debian/$(PACKAGE)-source/usr/src/ ; tar pzfvc drbd8.tar.gz modules ; rm -rf modules
-
- install -m 755 $(CURDIR)/debian/modass.drbd8-module-source $(CURDIR)/debian/$(PACKAGE)-source/usr/share/modass/overrides/drbd8-module-source
+ cd debian/$(PACKAGE)-source/usr/src/ ; tar cjpvf drbd8.tar.bz2 modules ; rm -rf modules
+
+ install -m 755 $(CURDIR)/debian/modass.drbd8-source $(CURDIR)/debian/$(PACKAGE)-source/usr/share/modass/overrides/drbd8-source
dh_install -i
install-arch:
signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---
Source: drbd8
Source-Version: 2:8.0.7-1
We believe that the bug you reported is fixed in the latest version of
drbd8, which is due to be installed in the Debian FTP archive:
drbd8-source_8.0.7-1_all.deb
to pool/main/d/drbd8/drbd8-source_8.0.7-1_all.deb
drbd8-utils_8.0.7-1_amd64.deb
to pool/main/d/drbd8/drbd8-utils_8.0.7-1_amd64.deb
drbd8_8.0.7-1.diff.gz
to pool/main/d/drbd8/drbd8_8.0.7-1.diff.gz
drbd8_8.0.7-1.dsc
to pool/main/d/drbd8/drbd8_8.0.7-1.dsc
drbd8_8.0.7.orig.tar.gz
to pool/main/d/drbd8/drbd8_8.0.7.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Philipp Hug <[EMAIL PROTECTED]> (supplier of updated drbd8 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Sun, 04 Nov 2007 13:46:53 +0100
Source: drbd8
Binary: drbd8-utils drbd8-source
Architecture: source amd64 all
Version: 2:8.0.7-1
Distribution: unstable
Urgency: low
Maintainer: Cyril Bouthors <[EMAIL PROTECTED]>
Changed-By: Philipp Hug <[EMAIL PROTECTED]>
Description:
drbd8-source - RAID 1 over tcp/ip for Linux module source
drbd8-utils - RAID 1 over tcp/ip for Linux utilities
Closes: 448876 449241
Changes:
drbd8 (2:8.0.7-1) unstable; urgency=low
.
* New upstream release (Closes: #449241)
* Integrated NMU changes (Closes: #448876)
Files:
fe1e5fc2136795ebf0b4aeb528ef0c1a 675 admin extra drbd8_8.0.7-1.dsc
923bd04a0ab76ef899d119d4561d078a 492060 admin extra drbd8_8.0.7.orig.tar.gz
35aebbf39f67b1cafa37371d2e60d359 11991 admin extra drbd8_8.0.7-1.diff.gz
615b82941c352b1a20404a0d8334c9ce 135606 admin extra
drbd8-utils_8.0.7-1_amd64.deb
ff4f3bae26058605b8846093cf631f16 138046 admin extra
drbd8-source_8.0.7-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFHLcCQaZN+myf86ycRAos6AJ9bAwf6UJ3NdVbHl+jD8qy27pPcUgCgk+Oj
I9Db3OL4N9JnMqZTp396afE=
=61gB
-----END PGP SIGNATURE-----
--- End Message ---
