diff -u drbd8-8.3.1/debian/changelog drbd8-8.3.1/debian/changelog --- drbd8-8.3.1/debian/changelog +++ drbd8-8.3.1/debian/changelog @@ -1,3 +1,13 @@ +drbd8 (2:8.3.1-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - Update maintainer according to spec. + - Drop the kernel modules since it is apart of linux-ubuntu-modules. + * debian/patches/ubuntu-cn-idx.dpatch: + - change CN_IDX_DRBD to 0x6 in drbd/linux/drbd.h + + -- Ante Karamatic Thu, 07 May 2009 19:13:08 +0100 + drbd8 (2:8.3.1-2) unstable; urgency=medium * Added a new patch from Michael Prokop to fix build with kernel 2.6.28 and @@ -44,6 +54,20 @@ -- Martin Loschwitz Wed, 11 Mar 2009 16:45:00 +0100 +drbd8 (2:8.3.0-1ubuntu1) jaunty; urgency=low + + * Closes (LP: #320831) + * Modify init script's default runlevels (LP: #282876): + - start by default on 2, 3, 4 and 5 + - stop by default on 0, 1 and 6 + * Merge from debian unstable, remaining changes: + - Update maintainer according to spec. + - Made the lsb init script a bit more compliant. + - Drop the kernel modules since it is apart of linux-ubuntu-modules. + - Change CN_IDX_DRBD to 0x6 in drbd/linux/drbd.h + + -- Ante Karamatic Wed, 24 Dec 2008 08:54:58 +0100 + drbd8 (2:8.3.0-1) unstable; urgency=low * New upstream release. @@ -99,6 +123,16 @@ -- Norbert Tretkowski Thu, 09 Oct 2008 16:26:00 +0200 +drbd8 (2:8.2.6-2ubuntu1) intrepid; urgency=low + + * Merge from debian experimental, remaining changes: + - Update maintainer according to spec. + - Made the lsb init script a bit more compliant. + - Drop the kernel modules since it is apart of linux-ubuntu-modules. + * Change CN_IDX_DRBD to 0x6 in drbd/linux/drbd.h + + -- Ante Karamatic Sat, 04 Oct 2008 11:33:52 +0200 + drbd8 (2:8.2.6-2) experimental; urgency=low * Fix build on Linux 2.6.26. @@ -154,6 +188,15 @@ -- Norbert Tretkowski Mon, 04 Aug 2008 17:56:03 +0200 +drbd8 (2:8.0.12-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Update maintainer according to spec. + - Made the lsb init script a bit more compliant. + - Drop the kernel modules since it is apart of linux-ubuntu-modules. + + -- Chuck Short Thu, 19 Jun 2008 09:23:29 -0500 + drbd8 (2:8.0.12-1) unstable; urgency=low * New upstream release. @@ -168,6 +211,25 @@ -- Philipp Hug Wed, 13 Feb 2008 19:12:53 +0100 +drbd8 (2:8.0.11-0ubuntu3) hardy; urgency=low + + * Made the init script LSB compliant. + + -- Chuck Short Fri, 15 Feb 2008 13:23:29 -0500 + +drbd8 (2:8.0.11-0ubuntu2) hardy; urgency=low + + * Fix FTBFS. + + -- Chuck Short Thu, 14 Feb 2008 11:11:05 -0500 + +drbd8 (2:8.0.11-0ubuntu1) hardy; urgency=low + + * New upstream version. + * Dropped kernel source since it is in linux-ubuntu-modules. + + -- Chuck Short Wed, 13 Feb 2008 09:41:06 -0500 + drbd8 (2:8.0.10-1) unstable; urgency=low * New upstream release diff -u drbd8-8.3.1/debian/control drbd8-8.3.1/debian/control --- drbd8-8.3.1/debian/control +++ drbd8-8.3.1/debian/control @@ -1,9 +1,10 @@ Source: drbd8 Section: admin Priority: extra -Maintainer: Debian DRBD Maintainers +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian DRBD Maintainers Uploaders: Norbert Tretkowski , Martin Loschwitz , Philipp Hug -Build-Depends: debhelper (>= 5), debconf-utils, sp, docbook-utils, bison, flex, dpatch, bzip2, dpatch +Build-Depends: debhelper (>= 5), debconf-utils, sp, docbook-utils, bison, flex, dpatch, bzip2 Standards-Version: 3.8.1 Homepage: http://www.drbd.org/ Vcs-Browser: http://svn.debian.org/wsvn/debian-ha/drbd8/ @@ -30,15 +31,2 @@ - -Package: drbd8-source -Architecture: all -Section: admin -Depends: module-assistant, debhelper (>= 5), dpatch, bzip2 -Provides: drbd-module-source, drbd-source, drbd8-module-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 - 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 source code for the drbd kernel module. + Homepage: http://www.drbd.org diff -u drbd8-8.3.1/debian/rules drbd8-8.3.1/debian/rules --- drbd8-8.3.1/debian/rules +++ drbd8-8.3.1/debian/rules @@ -15,7 +15,6 @@ export DH_OPTIONS PACKAGE=drbd8 -MA_DIR ?= /usr/share/modass -include $(MA_DIR)/include/generic.make -include $(MA_DIR)/include/common-rules.make @@ -30,12 +29,6 @@ INSTALL_PROGRAM += -s endif -# module-assistant stuff -MAJOR=$(shell echo $(KVERS) | sed -e 's/\(...\).*/\1/') -ifeq ($(MAJOR),2.6) -KO=k -endif - ifeq ($(DEB_BUILD_ARCH),i386) ifeq ($(KPKG_ARCH),amd64) KBUILD_PARAMS := "CROSS_COMPILE=amd64-linux- ARCH=x86_64" @@ -58,10 +51,7 @@ dh_testdir dh_testroot dh_clean -k - 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/ + #make -C $(KSRC) M=$(CURDIR)/drbd/ modules dh_installdocs dh_installchangelogs dh_compress @@ -103,30 +93,7 @@ $(MAKE) -C drbd clean dh_clean -install: install-arch install-indep -install-indep: - dh_testdir - dh_testroot - dh_clean -k -i - dh_installdirs -i - 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/drbd8/scripts/ - -# install debian/ files - 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 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: install-arch install-arch: dh_testdir dh_testroot @@ -170,7 +137,7 @@ dh_md5sums dh_builddeb # Build architecture independant packages using the common target. -binary-indep: build-indep install-indep +binary-indep: build-indep $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common # Build architecture dependant packages using the common target. reverted: --- drbd8-8.3.1/debian/modass.drbd8-source +++ drbd8-8.3.1.orig/debian/modass.drbd8-source @@ -1,16 +0,0 @@ -#!/bin/sh -# -# (c) Eduard Bloch , 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 "$@" reverted: --- drbd8-8.3.1/debian/drbd8-source.drbd-Makefile +++ drbd8-8.3.1.orig/debian/drbd8-source.drbd-Makefile @@ -1,14 +0,0 @@ -#CFLAGS_drbd_sizeof_sanity_check.o = -Wpadded # -Werror - -EXTRA_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 - reverted: --- drbd8-8.3.1/debian/drbd8-source.Makefile +++ drbd8-8.3.1.orig/debian/drbd8-source.Makefile @@ -1 +0,0 @@ -obj-m = drbd/ reverted: --- drbd8-8.3.1/debian/control.modules.in +++ drbd8-8.3.1.orig/debian/control.modules.in @@ -1,30 +0,0 @@ -Source: drbd8 -Section: misc -Priority: extra -Maintainer: Philipp Hug -Build-Depends: debhelper (>= 4), drbd8-source, bzip2 -Standards-Version: 3.6.1 - -Package: drbd8-_KVERS_ -Architecture: any -Depends: drbd8-utils -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 - 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 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. - . - Homepage: http://www.drbd.org reverted: --- drbd8-8.3.1/debian/drbd8-source.dirs +++ drbd8-8.3.1.orig/debian/drbd8-source.dirs @@ -1,4 +0,0 @@ -usr/src/modules/drbd8/debian -usr/src/modules/drbd8/drbd -usr/src/modules/drbd8/scripts/ -usr/share/modass/overrides reverted: --- drbd8-8.3.1/debian/drbd8-module-_KVERS_.postinst.modules.in +++ drbd8-8.3.1.orig/debian/drbd8-module-_KVERS_.postinst.modules.in @@ -1,14 +0,0 @@ -#!/bin/sh -set -e - -SYSTEMMAP=/boot/System.map-_KVERS_ - -if [ -f $SYSTEMMAP ] -then - depmod -ae -F $SYSTEMMAP _KVERS_ -elif [ "`uname -r`" = "_KVERS_" ] -then - depmod -a & -fi - -#DEBHELPER# reverted: --- drbd8-8.3.1/debian/drbd8-source.README.Debian +++ drbd8-8.3.1.orig/debian/drbd8-source.README.Debian @@ -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 Thu, 21 Jun 2007 18:08:00 +0000 - only in patch2: unchanged: --- drbd8-8.3.1.orig/debian/patches/ubuntu-cn-idx.dpatch +++ drbd8-8.3.1/debian/patches/ubuntu-cn-idx.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ubuntu-cn-idx.dpatch by Ante Karamatic +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad drbd8-8.3.1-2ubuntu1~/drbd/linux/drbd.h drbd8-8.3.1-2ubuntu1/drbd/linux/drbd.h +--- drbd8-8.3.1-2ubuntu1~/drbd/linux/drbd.h 2009-05-08 13:32:38.000000000 +0200 ++++ drbd8-8.3.1-2ubuntu1/drbd/linux/drbd.h 2009-05-08 13:33:28.000000000 +0200 +@@ -351,7 +351,7 @@ + /* The following line should be moved over to linux/connector.h + * when the time comes */ + #ifndef CN_IDX_DRBD +-# define CN_IDX_DRBD 0x4 ++# define CN_IDX_DRBD 0x6 + /* Ubuntu "intrepid ibex" release defined CN_IDX_DRBD as 0x6 */ + #endif + #define CN_VAL_DRBD 0x1