[DRBD-cvs] svn commit by phil - r2137 - trunk/debian - Imported Cyril Bouthors' excellent work on the debain p

drbd-cvs at lists.linbit.com drbd-cvs at lists.linbit.com
Thu Apr 6 18:16:08 CEST 2006


Author: phil
Date: 2006-04-06 18:16:07 +0200 (Thu, 06 Apr 2006)
New Revision: 2137

Added:
   trunk/debian/drbd8-module-_KVERS_.postinst.modules.in
   trunk/debian/drbd8-module-source.dirs
   trunk/debian/drbd8-utils.dirs
   trunk/debian/drbd8-utils.postinst
   trunk/debian/drbd8-utils.postrm
   trunk/debian/drbd8-utils.prerm
   trunk/debian/modass.drbd8-module-source
Removed:
   trunk/debian/drbd0.7-module-_KVERS_.postinst.modules.in
   trunk/debian/drbd0.7-module-source.dirs
   trunk/debian/drbd0.7-utils.dirs
   trunk/debian/drbd0.7-utils.docs
   trunk/debian/drbd0.7-utils.postinst
   trunk/debian/drbd0.7-utils.postrm
   trunk/debian/drbd0.7-utils.prerm
   trunk/debian/modass.drbd0.7-module-source
Modified:
   trunk/debian/control
   trunk/debian/control.modules.in
   trunk/debian/rules
Log:
Imported Cyril Bouthors' excellent work on the debain package into
my DRBD repository.


Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2006-04-06 14:51:31 UTC (rev 2136)
+++ trunk/debian/control	2006-04-06 16:16:07 UTC (rev 2137)
@@ -1,16 +1,16 @@
-Source: drbd
+Source: drbd8
 Section: admin
 Priority: extra
 Maintainer: Cyril Bouthors <cyril at bouthors.org>
 Uploaders: David Krovich <dkrovich at csee.wvu.edu>, Philipp Hug <debian at hug.cx>
 Build-Depends: debhelper (>= 4), debconf-utils, sp, docbook-utils, bison, flex, dpatch
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2.1
 
-Package: drbd0.7-utils
+Package: drbd8-utils
 Architecture: any
 Section: admin
-Depends: debconf
-Conflicts: drbd-utils, drbd
+Depends: debconf | debconf-2.0, ${shlibs:Depends}
+Conflicts: drbd-utils
 Provides: drbd-utils
 Replaces: drbd-utils, drbd
 Suggests: heartbeat
@@ -27,14 +27,14 @@
  .
  Homepage: http://www.drbd.org
 
-Package: drbd0.7-module-source
+Package: drbd8-module-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
-Recommends:  dpkg-dev, kernel-package, debhelper (>= 4), debconf-utils
+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
  clusters by providing a virtual shared device which keeps disks in

Modified: trunk/debian/control.modules.in
===================================================================
--- trunk/debian/control.modules.in	2006-04-06 14:51:31 UTC (rev 2136)
+++ trunk/debian/control.modules.in	2006-04-06 16:16:07 UTC (rev 2137)
@@ -3,12 +3,12 @@
 Priority: extra
 Maintainer: David Krovich <dkrovich at csee.wvu.edu>
 Uploaders: Philipp Hug <debian at hug.cx>
-Build-Depends: debhelper (>= 4), drbd0.7-source
+Build-Depends: debhelper (>= 4), drbd8-source
 Standards-Version: 3.6.1
 
-Package: drbd0.7-module-_KVERS_
+Package: drbd8-module-_KVERS_
 Architecture: any
-Depends: drbd0.7-utils
+Depends: drbd8-utils
 Conflicts: drbd-module-_KVERS_
 Provides: drbd-module-_KVERS_
 Replaces: drbd-module-_KVERS_
@@ -17,13 +17,14 @@
 Description: RAID 1 over tcp/ip for Linux kernel module
  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). 
+ 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 drbd kernel module for the following kernel
- version: _KVERS_
- If you want to build drbd against your another kernel, install the
+ This package contains the DRBD kernel module for the kernel version
+ _KVERS_
+ .
+ If you want to build DRBD against your another kernel, install the
  drbd-source package and use module-assistant to create a new
  module package.
  .

Deleted: trunk/debian/drbd0.7-module-_KVERS_.postinst.modules.in
===================================================================
--- trunk/debian/drbd0.7-module-_KVERS_.postinst.modules.in	2006-04-06 14:51:31 UTC (rev 2136)
+++ trunk/debian/drbd0.7-module-_KVERS_.postinst.modules.in	2006-04-06 16:16:07 UTC (rev 2137)
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "`uname -r`" = _KVERS_ ] ; then
-   depmod -a &
-fi
-
-#DEBHELPER#

Deleted: trunk/debian/drbd0.7-module-source.dirs
===================================================================
--- trunk/debian/drbd0.7-module-source.dirs	2006-04-06 14:51:31 UTC (rev 2136)
+++ trunk/debian/drbd0.7-module-source.dirs	2006-04-06 16:16:07 UTC (rev 2137)
@@ -1,3 +0,0 @@
-usr/src/modules/drbd/debian
-usr/src/modules/drbd/drbd
-usr/share/modass/overrides

Deleted: trunk/debian/drbd0.7-utils.dirs
===================================================================
--- trunk/debian/drbd0.7-utils.dirs	2006-04-06 14:51:31 UTC (rev 2136)
+++ trunk/debian/drbd0.7-utils.dirs	2006-04-06 16:16:07 UTC (rev 2137)
@@ -1,3 +0,0 @@
-etc
-etc/init.d
-etc/ha.d/resource.d

Deleted: trunk/debian/drbd0.7-utils.docs
===================================================================
--- trunk/debian/drbd0.7-utils.docs	2006-04-06 14:51:31 UTC (rev 2136)
+++ trunk/debian/drbd0.7-utils.docs	2006-04-06 16:16:07 UTC (rev 2137)
@@ -1,2 +0,0 @@
-upgrade_0.6.x_to_0.7.0.txt
-upgrade_0.7.0_to_0.7.1.txt

Deleted: trunk/debian/drbd0.7-utils.postinst
===================================================================
--- trunk/debian/drbd0.7-utils.postinst	2006-04-06 14:51:31 UTC (rev 2136)
+++ trunk/debian/drbd0.7-utils.postinst	2006-04-06 16:16:07 UTC (rev 2137)
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-if [ -x "/etc/init.d/drbd" ]; then
-	update-rc.d drbd defaults 70 8 >/dev/null
-fi
-
-# Make sure /dev/nb[0-7] devices exist
-# cd /dev; for a in `seq 0 7`; do MAKEDEV nb$a; done
-
-for i in `seq 0 15` ; do 
-    test -b /dev/drbd$i || mknod -m 0660 /dev/drbd$i b 147 $i; 
-done
-
-#DEBHELPER#

Deleted: trunk/debian/drbd0.7-utils.postrm
===================================================================
--- trunk/debian/drbd0.7-utils.postrm	2006-04-06 14:51:31 UTC (rev 2136)
+++ trunk/debian/drbd0.7-utils.postrm	2006-04-06 16:16:07 UTC (rev 2137)
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "purge" ] ; then
-	update-rc.d drbd remove >/dev/null
-fi
-#DEBHELPER#

Deleted: trunk/debian/drbd0.7-utils.prerm
===================================================================
--- trunk/debian/drbd0.7-utils.prerm	2006-04-06 14:51:31 UTC (rev 2136)
+++ trunk/debian/drbd0.7-utils.prerm	2006-04-06 16:16:07 UTC (rev 2137)
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# This script silently ignores the initscript return code if we remove
-# or deconfigure the package or carefully pay attention to it if we
-# upgrade the package.
-
-# Cyril Bouthors <cyril at bouthors.org>
-# Wed Feb 16 21:01:11 CET 2005
-
-set -e
-
-if [ -x "/etc/init.d/drbd" ]
-then
-    case "$1" in
-	remove|deconfigure)
-	    /etc/init.d/drbd stop || true
-	    ;;
-
-	upgrade|failed-upgrade)
-	    /etc/init.d/drbd stop
-	    ;;
-
-	*)
-	    echo "prerm called with unknown argument \`$1'" >&2
-	    exit 0
-	    ;;
-    esac
-fi
-
-#DEBHELPER#

Copied: trunk/debian/drbd8-module-_KVERS_.postinst.modules.in (from rev 2136, trunk/debian/drbd0.7-module-_KVERS_.postinst.modules.in)

Copied: trunk/debian/drbd8-module-source.dirs (from rev 2136, trunk/debian/drbd0.7-module-source.dirs)

Copied: trunk/debian/drbd8-utils.dirs (from rev 2136, trunk/debian/drbd0.7-utils.dirs)

Copied: trunk/debian/drbd8-utils.postinst (from rev 2136, trunk/debian/drbd0.7-utils.postinst)

Copied: trunk/debian/drbd8-utils.postrm (from rev 2136, trunk/debian/drbd0.7-utils.postrm)

Copied: trunk/debian/drbd8-utils.prerm (from rev 2136, trunk/debian/drbd0.7-utils.prerm)

Deleted: trunk/debian/modass.drbd0.7-module-source
===================================================================
--- trunk/debian/modass.drbd0.7-module-source	2006-04-06 14:51:31 UTC (rev 2136)
+++ trunk/debian/modass.drbd0.7-module-source	2006-04-06 16:16:07 UTC (rev 2137)
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# (c) Eduard Bloch <blade at debian.org>, 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/drbd0.7.tar.gz
-BUILDDIR=${MODULE_LOC:-/usr/src/modules}/drbd
-
-. $MA_DIR/packages/generic.sh
-
-$1 "$@"

Copied: trunk/debian/modass.drbd8-module-source (from rev 2136, trunk/debian/modass.drbd0.7-module-source)
===================================================================
--- trunk/debian/modass.drbd0.7-module-source	2006-04-06 14:51:31 UTC (rev 2136)
+++ trunk/debian/modass.drbd8-module-source	2006-04-06 16:16:07 UTC (rev 2137)
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# (c) Eduard Bloch <blade at debian.org>, 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 "$@"

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-04-06 14:51:31 UTC (rev 2136)
+++ trunk/debian/rules	2006-04-06 16:16:07 UTC (rev 2137)
@@ -14,7 +14,7 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-PACKAGE=drbd0.7-module
+PACKAGE=drbd8-module
 MA_DIR ?= /usr/share/modass
 -include $(MA_DIR)/include/generic.make
 -include $(MA_DIR)/include/common-rules.make
@@ -83,8 +83,8 @@
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
 #	remove these files from upstream tgz
-	rm -f debian/drbd0.7.*
-	rm -f debian/drbd0.7-source.dirs
+	rm -f debian/drbd8.*
+	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
@@ -103,15 +103,15 @@
 	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 scripts/adjust_drbd_config_h.sh debian/$(PACKAGE)-source/usr/src/modules/drbd/scripts/
+#	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
 
 #	 tar the stuff
-	cd debian/$(PACKAGE)-source/usr/src/ ; tar pzfvc drbd0.7.tar.gz modules ; rm -rf modules
+	cd debian/$(PACKAGE)-source/usr/src/ ; tar pzfvc drbd8.tar.gz modules ; rm -rf modules
 
-	install -m 755 $(CURDIR)/debian/modass.drbd0.7-module-source $(CURDIR)/debian/$(PACKAGE)-source/usr/share/modass/overrides/drbd0.7-module-source
+	install -m 755 $(CURDIR)/debian/modass.drbd8-module-source $(CURDIR)/debian/$(PACKAGE)-source/usr/share/modass/overrides/drbd8-module-source
 	dh_install -i
 
 install-arch:
@@ -119,10 +119,10 @@
 	dh_testroot
 	dh_clean -k -s
 	dh_installdirs -s
-	$(MAKE) PREFIX=$(CURDIR)/debian/drbd0.7-utils/ -C user install
-	$(MAKE) PREFIX=$(CURDIR)/debian/drbd0.7-utils/ -C scripts install
-	$(MAKE) PREFIX=$(CURDIR)/debian/drbd0.7-utils/ -C benchmark install
-	$(MAKE) PREFIX=$(CURDIR)/debian/drbd0.7-utils/ -C documentation install
+	$(MAKE) PREFIX=$(CURDIR)/debian/drbd8-utils/ -C user install
+	$(MAKE) PREFIX=$(CURDIR)/debian/drbd8-utils/ -C scripts install
+	$(MAKE) PREFIX=$(CURDIR)/debian/drbd8-utils/ -C benchmark install
+	$(MAKE) PREFIX=$(CURDIR)/debian/drbd8-utils/ -C documentation install
 
 	dh_install -s
 # Must not depend on anything. This is to be called by



More information about the drbd-cvs mailing list