[DRBD-cvs] debian by phil; Merged most of David Krovich's work on t...
drbd-user@lists.linbit.com
drbd-user@lists.linbit.com
Fri, 6 Feb 2004 10:18:04 +0100 (CET)
DRBD CVS committal
Author : phil
Project : drbd
Module : debian
Dir : drbd/debian
Modified Files:
changelog control control.modules copyright rules
Log Message:
Merged most of David Krovich's work on the debian build system
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/debian/changelog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- changelog 12 Dec 2003 14:39:48 -0000 1.13
+++ changelog 6 Feb 2004 09:17:59 -0000 1.14
@@ -1,3 +1,43 @@
+drbd (0.6.10-3) unstable; urgency=low
+ * Added back the drbd.postinst, drbd.postrm, and drbd.prerm scripts until
+ I figure out why they aren't being handled by dh_installinit.
+ * As of drbd-0.6.9, The drbd module no longer builds against just the
+ kernel-headers package and now needs a full kernel-source tree.
+
+ -- David Krovich <dkrovich@csee.wvu.edu> Mon, 26 Jan 2004 00:32:49 -0500
+
+drbd (0.6.10-2) unstable; urgency=low
+
+ * noel: fixed lintian warning:
+ W: drbd: package-contains-CVS-dir usr/share/doc/drbd/HOWTO/CVS/
+ W: drbd: script-in-etc-init.d-not-registered-via-update-rc.d /etc/init.d/drbd
+
+ * Lintian/Linda fixes.
+
+ * Tweaked the drbd-0.6.10.orig.tar.gz to not have a debian/ directory in it.
+ * Stopped tweaking the copyright notice on drbd_fs.c and drbd_receiver.c.
+ I'm not sure how that got there in the first place.
+ * Removed mystery report_to_html.pl.debdiff file.
+ * Put the datadisk in the correct location. (Closes: Bug#221544)
+
+ * Removed drbd.postinst, drbd.postrm, and drbd.prerm as they are
+ being generated by dh_installinit during the build process and do not
+ need to part of the source package.
+ * removed dependancy on automake and autoconf
+ * Changed control.modules to require debhelper >= 4.
+ * Stop settting $KSRC in the rules file.
+
+ * Removed conffiles, files, kernel-patch-wup.substvars as they are
+ unneccessary.
+ * Tightened the build dependancy on debhelper. >=4
+ * Updated Debian packages up to newest upstream version. (Closes: Bug#197906)
+ * Updated Package descriptions. (Closes: Bug#209462)
+ * Verified support for devfs. (Closes: Bug#203552)
+ * I'd like to become a Debian Developer and take over maintenance for
+ this package. I'm working with Debian Devolpers on making this happen.
+
+ -- David Krovich <dkrovich@csee.wvu.edu> Tue, 20 Jan 2004 01:36:58 -0500
+
drbd (0.6.10-1) unstable; urgency=low
* With 0.6.9 there was a bug introduced which prevented the sending
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/debian/control,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- control 25 Nov 2002 13:37:47 -0000 1.4
+++ control 6 Feb 2004 09:17:59 -0000 1.5
@@ -1,30 +1,51 @@
Source: drbd
Section: misc
Priority: extra
-Maintainer: Jan Niehusmann <jan@debian.org>
-Build-Depends: debhelper (>= 2), debconf-utils, dh-kpatches (>=0.99.3), sp, docbook-utils
-Standards-Version: 3.5.2
+Maintainer: David Krovich <dkrovich@csee.wvu.edu>
+Build-Depends: debhelper (>= 4), debconf-utils, dh-kpatches (>=0.99.3), sp, docbook-utils
+Standards-Version: 3.5.10
Package: drbd-source
Architecture: all
Section: misc
-Recommends: dpkg-dev, kernel-package, debhelper (>= 2), debconf-utils
-Description: RAID 1 over tcp/ip for Linux module source.
- This package provides the source code for the drbd module.
- The kernel source is required to compile this module.
+Recommends: dpkg-dev, kernel-package, debhelper (>= 4), debconf-utils
+Description: RAID 1 over tcp/ip for Linux module source
+ Drbd is a block device which is designed to build high availability
+ clusters by providing a virtual shared device which keeps disks in nodes
+ synchronised using TCP/IP. This simulates RAID 1 but avoiding the
+ use of uncommon hardware (shared SCSI buses or Fibre Channel).
+ It is currently limited to fail-over HA clusters.
+ .
+ This package contains the programs that will control the
+ drbd kernel module provided in drbd-source. You will need a clustering
+ service (such as heartbeat) to fully implement it.
+ .
+ Homepage: http://www.drbd.org
Package: drbd
Architecture: any
Section: misc
Depends: debconf, ${misc:Depends}
Suggests: heartbeat
-Description: RAID 1 over tcp/ip for Linux utilities.
- This package contains the files needed to control the drbd kernel module.
+Description: RAID 1 over tcp/ip for Linux utilities
+ Drbd is a block device which is designed to build high availability
+ clusters by providing a virtual shared device which keeps disks in nodes
+ synchronised using TCP/IP. This simulates RAID 1 but avoiding the
+ use of uncommon hardware (shared SCSI buses or Fibre Channel).
+ It is currently limited to fail-over HA clusters.
+ .
+ This package contains the programs that will control the
+ drbd kernel module provided in drbd-source. You will need a clustering
+ service (such as heartbeat) to fully implement it.
+ .
+ Homepage: http://www.drbd.org
Package: kernel-patch-wup
Architecture: all
Section: misc
Depends: ${kpatch:Depends}, ${misc:Depends}
-Description: Export wake_up_process kernel patch.
+Description: Export wake_up_process kernel patch
This patches the kernel so that modules can call the
- wake_up_process kernel call.
+ wake_up_process kernel call. Not needed for 2.4.x kernels.
+
+
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/debian/control.modules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- control.modules 25 Nov 2002 13:37:47 -0000 1.2
+++ control.modules 6 Feb 2004 09:17:59 -0000 1.3
@@ -1,14 +1,37 @@
Source: drbd
Section: ha
Priority: extra
-Maintainer: Jan Niehusmann <jan@gondor.com>
-Build-Depends: debhelper (>= 2), autoconf, automake, kernel-headers, cpio, debconf-utils
-Description: RAID 1 over tcp/ip for Linux.
- Drbd adds raid 1 over tcp/ip to a linux system.
+Maintainer: David Krovich <dkrovich@csee.wvu.edu>
+Build-Depends: debhelper (>= 4), kernel-source, cpio, debconf-utils
+Description: RAID 1 over tcp/ip for Linux
+ Drbd is a block device which is designed to build high availability
+ clusters by providing a virtual shared device which keeps disks in nodes
+ synchronised using TCP/IP. This simulates RAID 1 but avoiding the
+ use of uncommon hardware (shared SCSI buses or Fibre Channel).
+ It is currently limited to fail-over HA clusters.
+ .
+ This package contains the programs that will control the
+ drbd kernel module provided in drbd-source. You will need a clustering
+ service (such as heartbeat) to fully implement it.
+ .
+ Homepage: http://www.drbd.org
Package: drbd-module-#KVERS#
Architecture: any
-Recommends: dpkg-dev, kernel-package, debhelper (>= 2), debconf-utils, drbd
+Recommends: dpkg-dev, kernel-package, debhelper (>= 4), debconf-utils, drbd
Description: RAID 1 over tcp/ip for Linux kernel module.
This package provides the kernel module for linux kernel #KVERS#
- You have to install the drbd package to be able to use it.
+ You have to install the drbd package to be able to use it
+ .
+ Drbd is a block device which is designed to build high availability
+ clusters by providing a virtual shared device which keeps disks in nodes
+ synchronised using TCP/IP. This simulates RAID 1 but avoiding the
+ use of uncommon hardware (shared SCSI buses or Fibre Channel).
+ It is currently limited to fail-over HA clusters.
+ .
+ This package contains the programs that will control the
+ drbd kernel module provided in drbd-source. You will need a clustering
+ service (such as heartbeat) to fully implement it.
+ .
+ Homepage: http://www.drbd.org
+
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/debian/copyright,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- copyright 28 Nov 2003 08:32:52 -0000 1.3
+++ copyright 6 Feb 2004 09:17:59 -0000 1.4
@@ -1,3 +1,7 @@
+David Krovich <dkrovich@csee.wvu.edu> adopted the packages from Jan
+Niehusman <jan@debian.org> and updated them to sync back up with
+upstream.
+
Debianization of this package was started by Ard van Breemen <ard@telegraafnet.nl>.
Later, Jan Niehusmann <jan@debian.org> finished the packaging and made the
initial upload.
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/debian/rules,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- rules 9 Dec 2003 13:51:52 -0000 1.9
+++ rules 6 Feb 2004 09:17:59 -0000 1.10
@@ -19,7 +19,7 @@
REV=$(KDREV)
endif
VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
-KSRC:=/usr/src/linux
+#KSRC:=/usr/src/linux
PKGVERSION=$(EPOCH)$(VERSION)+$(REV)
MVARUSUBDIRS=$(shell grep ^SUBDIRS Makefile.vars | sed 's/ drbd / /g' | sed 's/ = /=/g'|cut -d '\#' -f1 )
@@ -54,15 +54,15 @@
binary-drbd: checkroot build
$(checkdir)
$(RM) -r debian/drbd
- dh_installdirs -pdrbd DEBIAN usr/sbin var/lib/drbd etc/ha.d/resource.d etc/init.d
+ dh_installdirs -pdrbd DEBIAN usr/sbin var/lib/drbd etc/heartbeat/resource.d etc/init.d
# Install changelog & copyright
dh_installman -pdrbd documentation/*.[1-9]
dh_installdocs -pdrbd -Xxgml -XMakefile README documentation/HOWTO
-# dh_installchangelogs -pdrbd ChangeLog
+ dh_installchangelogs -pdrbd ChangeLog
install -m755 user/drbdsetup debian/drbd/usr/sbin/
dh_compress -pdrbd
# We don't wan't the examples to be compressed :)
- install -m755 scripts/datadisk debian/drbd/etc/ha.d/resource.d/
+ install -m755 scripts/datadisk debian/drbd/etc/heartbeat/resource.d/
cat scripts/drbd.conf | sed -e 's/^/#/' >debian/drbd/etc/drbd.conf
cp scripts/drbd debian/drbd.init
dh_installinit -n -pdrbd -Pdebian/drbd -- defaults 19 21
@@ -104,6 +104,7 @@
dh_installchangelogs -pdrbd-source -Pdebian/src ChangeLog
dh_installdocs -pdrbd-source -Pdebian/src README
dh_compress -pdrbd-source -Pdebian/src
+ dh_installinit --update-rcd-params='start 70 2 3 4 5 . stop 08 0 1 6 .'
# Generate deb file
dh_gencontrol -pdrbd-source -Pdebian/src
# dpkg-deb --build debian/src ..