Author: fs
Date: Mon Dec 3 10:28:08 2007
New Revision: 9868
Log:
Fix Depends: fields in control file
Add gfs-source package
Redo maintainer scripts
Fix debconf template
Fix FSF address in copyright
Added:
dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postinst
dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postrm
dists/trunk/redhat-cluster/redhat-cluster/debian/gnbdexports.conf
- copied unchanged from r9861,
/dists/trunk/redhat-cluster/redhat-cluster/debian/gnbd-server.config
dists/trunk/redhat-cluster/redhat-cluster/debian/gnbdimports.conf
- copied unchanged from r9861,
/dists/trunk/redhat-cluster/redhat-cluster/debian/gnbd-client.config
dists/trunk/redhat-cluster/redhat-cluster/debian/libcman2.postinst
dists/trunk/redhat-cluster/redhat-cluster/debian/libcman2.postrm
dists/trunk/redhat-cluster/redhat-cluster/debian/libdlm2.postinst
dists/trunk/redhat-cluster/redhat-cluster/debian/libdlm2.postrm
Removed:
dists/trunk/redhat-cluster/redhat-cluster/debian/gnbd-client.config
dists/trunk/redhat-cluster/redhat-cluster/debian/gnbd-server.config
Modified:
dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst
dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates
dists/trunk/redhat-cluster/redhat-cluster/debian/control
dists/trunk/redhat-cluster/redhat-cluster/debian/copyright
dists/trunk/redhat-cluster/redhat-cluster/debian/po/templates.pot
dists/trunk/redhat-cluster/redhat-cluster/debian/rules
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/TODO (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/TODO Mon Dec 3
10:28:08 2007
@@ -1,3 +1,58 @@
Merge cman.init changes from upstream to handle xen.
Review *.init.
check scsi_reserve stuff
+
+broken init scripts
+
+E: gfs2-tools: init.d-script-does-not-implement-required-option
/etc/init.d/gfs2-tools force-reload
+E: gfs-tools: init.d-script-does-not-implement-required-option
/etc/init.d/gfs-tools force-reload
+W: rgmanager: init.d-script-missing-lsb-section /etc/init.d/rgmanager
+W: gnbd-server: init.d-script-missing-lsb-section /etc/init.d/gnbd-server
+W: gnbd-client: init.d-script-missing-lsb-section /etc/init.d/gnbd-client
+W: gfs2-tools: init.d-script-missing-lsb-section /etc/init.d/gfs2-tools
+W: gfs-tools: init.d-script-missing-lsb-section /etc/init.d/gfs-tools
+W: cman: init.d-script-missing-lsb-section /etc/init.d/cman
+
+overrides?
+
+E: cman: shlib-with-executable-bit usr/lib/openais/lcrso/service_cman.lcrso
0755
+W: rgmanager: executable-not-elf-or-script ./usr/share/cluster/ocf-shellfuncs
+
+
+upstream
+
+W: libdlm-dev: manpage-has-bad-whatis-entry usr/share/man/man3/libdlm.3.gz
+W: gnbd-server: manpage-has-bad-whatis-entry usr/share/man/man8/gnbd.8.gz
+W: gfs2-tools: manpage-has-bad-whatis-entry usr/share/man/man8/gfs2.8.gz
+W: gfs-tools: manpage-has-bad-whatis-entry usr/share/man/man8/gfs.8.gz
+W: cman: manpage-has-bad-whatis-entry usr/share/man/man5/cman.5.gz
+W: cman: manpage-has-bad-whatis-entry usr/share/man/man5/qdisk.5.gz
+W: cman: manpage-has-bad-whatis-entry usr/share/man/man8/fence.8.gz
+
+
+missing manpages
+
+W: rgmanager: binary-without-manpage usr/sbin/clunfslock
+W: rgmanager: binary-without-manpage usr/sbin/rg_test
+W: gnbd-server: binary-without-manpage usr/sbin/gnbd_clusterd
+W: gnbd-server: binary-without-manpage usr/sbin/gnbd_get_uid
+W: gnbd-client: binary-without-manpage usr/sbin/gnbd_monitor
+W: gnbd-client: binary-without-manpage usr/sbin/gnbd_recvd
+W: gfs2-tools: binary-without-manpage usr/sbin/gfs2_edit
+W: gfs2-tools: binary-without-manpage usr/sbin/gfs2_umount
+W: gfs2-tools: binary-without-manpage usr/sbin/umount.gfs2
+W: gfs-tools: binary-without-manpage usr/sbin/gfs_debug
+W: gfs-tools: binary-without-manpage usr/sbin/gfs_edit
+W: gfs-tools: binary-without-manpage sbin/mount.gfs
+W: gfs-tools: binary-without-manpage sbin/umount.gfs
+W: cman: binary-without-manpage usr/sbin/fence_baytech
+W: cman: binary-without-manpage usr/sbin/fence_cpint
+W: cman: binary-without-manpage usr/sbin/fence_ibmblade
+W: cman: binary-without-manpage usr/sbin/fence_rackswitch
+W: cman: binary-without-manpage usr/sbin/fence_rps10
+W: cman: binary-without-manpage usr/sbin/fence_rsb
+W: cman: binary-without-manpage usr/sbin/fence_scsi
+W: cman: binary-without-manpage usr/sbin/fence_scsi_test
+W: cman: binary-without-manpage usr/sbin/fence_vmware
+W: cman: binary-without-manpage usr/sbin/fence_xcat
+W: cman: binary-without-manpage usr/sbin/fence_zvm
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/changelog (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/changelog Mon Dec 3
10:28:08 2007
@@ -2,5 +2,9 @@
* First Debian release of the redhat cluster suite v2, based on the
packaging by Fabio M. Di Nitto <[EMAIL PROTECTED]>
+ * Update copyright file.
+ * Fix maintainer scripts, add missing ones.
+ * Fix debconf template.
+ * Add gfs-source package containing the gfs1 kernel module
- -- Frederik Schüler <[EMAIL PROTECTED]> Sun, 02 Dec 2007 17:14:52 +0100
+ -- Frederik Schüler <[EMAIL PROTECTED]> Mon, 03 Dec 2007 11:23:01 +0100
Added: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postinst
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postinst Mon Dec
3 10:28:08 2007
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+set -e
+
+case $1 in
+ configure)
+ . /usr/share/debconf/confmodule
+ db_get cman/upgrade-from-old
+ if [ "$RET" != "true" ] ; then
+ exit 1
+ fi
+ ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" 1>&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postrm
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postrm Mon Dec
3 10:28:08 2007
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ purge)
+ if [ -e /usr/share/debconf/confmodule ] ; then
+ . /usr/share/debconf/confmodule
+ db_purge
+ fi
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+
+esac
+
+
+#DEBHELPER#
+
+exit 0
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst Mon Dec
3 10:28:08 2007
@@ -14,4 +14,6 @@
fi
fi
+#DEBHELPER#
+
exit 0
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates Mon Dec
3 10:28:08 2007
@@ -1,13 +1,13 @@
Template: cman/upgrade-from-old
Type: boolean
Default: false
-_Description: Cluster Manager Upgrade
+_Description: Really upgrade Cluster Manager?
An older version of cman installed on the system.
.
The version that is going to be installed is *NOT* compatible with the old
one and will break the cluster horribly if not upgraded properly.
.
- Check https://wiki.ubuntu.com/UpgradingClusterProcedure for the latest
+ Check https://wiki.debian.org/UpgradingClusterProcedure for the latest
instructions on how to proceed.
.
- Continue with the upgrade?
+ Select OK if you wish to continue with the upgrade.
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/control
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/control (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/control Mon Dec 3
10:28:08 2007
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian Kernel Team <[EMAIL PROTECTED]>
Uploaders: Bastian Blank <[EMAIL PROTECTED]>, Frederik Schüler <[EMAIL
PROTECTED]>
-Standards-Version: 3.7.2.2
-Build-Depends: dpatch, debhelper (>= 4.2.28), libxml2-dev, libncurses5-dev,
libopenais-dev (>= 0.82-1), libvolume-id-dev (>= 0.105-4), linux-libc-dev (>=
2.6.22-6), libvirt-dev (>= 0.3.0) [i386], libnss3-dev [i386], libnspr4-dev
[i386]
+Standards-Version: 3.7.3.0
+Build-Depends: dpatch, debhelper (>= 4.2.28), libxml2-dev, libncurses5-dev,
libopenais-dev (>= 0.82-2), libvolume-id-dev (>= 0.105-4), linux-libc-dev (>=
2.6.22-6), libvirt-dev (>= 0.3.0) [i386], libnss3-dev [i386], libnspr4-dev
[i386], bzip2
Build-Conflicts: libccs-dev, libcman-dev (<= 2.0), libdlm-dev (<= 2.0),
libcman2, libdlm2
Package: redhat-cluster-suite
@@ -20,7 +20,7 @@
Architecture: any
Section: admin
Pre-Depends: debconf | debconf-2.0
-Depends: ${shlibs:Depends}, ${misc:Depends}, openais (>= 0.82-0ubuntu1),
gfs-modules
+Depends: ${shlibs:Depends}, python, openais (>= 0.82-2), gfs-modules
Conflicts: magma, libmagma1, libmagma-dev, ccs, fence, libiddev-dev,
fence-gnbd, gulm, libgulm1, libgulm-dev, magma-plugins
Replaces: ccs, fence, fence-gnbd
Description: cluster manager
@@ -36,7 +36,7 @@
Package: libcman2
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
Description: cluster manager - libraries
cman provides a general purpose, openais based, cluster manager.
.
@@ -45,7 +45,7 @@
Package: libcman-dev
Section: libdevel
Architecture: any
-Depends: libcman2 (= ${Source-Version})
+Depends: libcman2 (= ${binary:Version})
Description: cluster manager - development files
cman provides a general purpose, openais based, cluster manager.
.
@@ -54,7 +54,7 @@
Package: libdlm2
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
Description: distributed lock manager - library
DLM is a symmetric general-purpose distributed lock manager. It is
used for example by GFS and the distributed volume manager.
@@ -65,7 +65,7 @@
Package: libdlm-dev
Section: libdevel
Architecture: any
-Depends: libdlm2 (= ${Source-Version})
+Depends: libdlm2 (= ${binary:Version})
Description: distributed lock manager - development files
DLM is a symmetric general-purpose distributed lock manager. It is
used for example by GFS and the distributed volume manager.
@@ -75,7 +75,7 @@
Package: gfs-tools
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, psmisc, gfs-modules, gfs2-tools
+Depends: ${shlibs:Depends}, psmisc, gfs-modules, gfs2-tools
Section: admin
Description: global file system tools
The Global File System allows a cluster of machines to concurrently access
@@ -92,7 +92,7 @@
Package: gfs2-tools
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, psmisc, gfs-modules
+Depends: ${shlibs:Depends}, psmisc, gfs-modules
Section: admin
Description: global file system 2 tools (EXPERIMENTAL)
The Global File System 2 allows a cluster of machines to concurrently access
@@ -108,8 +108,8 @@
Package: gnbd-client
Section: admin
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gfs-modules
-Recommends: fence-gnbd (= ${Source-Version})
+Depends: ${shlibs:Depends}, gfs-modules
+Recommends: fence-gnbd (= ${binary:Version})
Description: global network block device - client tools
GNBD allows to usage block devices over the network. It is a modified
version of the linux network block device for the use within a cluster
@@ -120,8 +120,8 @@
Package: gnbd-server
Section: admin
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gfs-modules
-Recommends: fence-gnbd (= ${Source-Version})
+Depends: ${shlibs:Depends}, gfs-modules
+Recommends: fence-gnbd (= ${binary:Version})
Description: global network block device - server tools
GNBD allows to usage block devices over the network. It is a modified
version of the linux network block device for the use within a cluster
@@ -131,8 +131,15 @@
Package: rgmanager
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, cman (= ${Source-Version}),
iproute, iputils-arping, iputils-ping, nfs-kernel-server, nfs-common
+Depends: ${shlibs:Depends}, cman (= ${binary:Version}), iproute,
iputils-arping, iputils-ping, nfs-kernel-server, nfs-common
Conflicts: nfs-user-server
Description: clustered resource group manager
Resource Group Manager provides high availability of critical server
applications in the event of planned or unplanned system downtime.
+
+Package: gfs-source
+Architecture: any
+Depends: bzip2
+Description: Global File System v1 - kernel module source
+ This package contains the source necessary for compiling the
+ Global File System version 1 kernel modules against the linux tree.
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/copyright
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/copyright (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/copyright Mon Dec 3
10:28:08 2007
@@ -1,11 +1,12 @@
-This is the Ubuntu / Debian GNU/Linux prepackaged version of the
-RedHat Cluster Suite.
+This is the Debian GNU/Linux prepackaged version of the
+RedHat Cluster Suite version 2.
-Mainly packaged by Fabio M. Di Nitto <[EMAIL PROTECTED]>, a lot
-of people have been contributing to this package in several different
-areas/bits. In non-particular order:
+A lot of people have been contributing to this package in several
+different areas/bits. In non-particular order:
-- Frederik Shueler <[EMAIL PROTECTED]>
+- Fabio M. Di Nitto <[EMAIL PROTECTED]>
+ Most of the Packaging for Ubuntu
+- Frederik Schüler <[EMAIL PROTECTED]>
several patches and testing.
- Bastian Blank <[EMAIL PROTECTED]>
for all his packages, init scripts, build rules.
@@ -15,21 +16,21 @@
Upstream: http://sources.redhat.com/cluster/
-Based on RHEL4U1 CVS branch.
+Based on a CVS snapshot from the Ubuntu packages archive.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 dated June, 1991.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
-On Ubuntu / Debian GNU/Linux systems, the complete text of the GNU
-General Public License can be found in `/usr/share/common-licenses/GPL'.
Added: dists/trunk/redhat-cluster/redhat-cluster/debian/libcman2.postinst
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/libcman2.postinst Mon Dec
3 10:28:08 2007
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ]; then
+ ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0
Added: dists/trunk/redhat-cluster/redhat-cluster/debian/libcman2.postrm
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/libcman2.postrm Mon Dec
3 10:28:08 2007
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "remove" ]; then
+ ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0
Added: dists/trunk/redhat-cluster/redhat-cluster/debian/libdlm2.postinst
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/libdlm2.postinst Mon Dec
3 10:28:08 2007
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ]; then
+ ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0
Added: dists/trunk/redhat-cluster/redhat-cluster/debian/libdlm2.postrm
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/libdlm2.postrm Mon Dec
3 10:28:08 2007
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "remove" ]; then
+ ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/po/templates.pot
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/po/templates.pot
(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/po/templates.pot Mon Dec
3 10:28:08 2007
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-07-14 17:15+0200\n"
+"Report-Msgid-Bugs-To: Source: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2007-12-03 02:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -19,7 +19,7 @@
#. Type: boolean
#. Description
#: ../cman.templates:1001
-msgid "Cluster Manager Upgrade"
+msgid "Really upgrade Cluster Manager?"
msgstr ""
#. Type: boolean
@@ -40,12 +40,12 @@
#. Description
#: ../cman.templates:1001
msgid ""
-"Check https://wiki.ubuntu.com/UpgradingClusterProcedure for the latest "
+"Check https://wiki.debian.org/UpgradingClusterProcedure for the latest "
"instructions on how to proceed."
msgstr ""
#. Type: boolean
#. Description
#: ../cman.templates:1001
-msgid "Continue with the upgrade?"
+msgid "Select OK if you wish to continue with the upgrade."
msgstr ""
Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/rules
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/rules (original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/rules Mon Dec 3
10:28:08 2007
@@ -48,18 +48,23 @@
dh_testdir
dh_testroot
dh_clean -k
-
+
$(MAKE) install DESTDIR=$(BUILDROOT)/debian/tmp/
-
+
# manual craft
install -d -m 0755 debian/tmp/etc/cluster
- install -m 0640 debian/gnbd-server.config
debian/tmp/etc/cluster/gnbdexports.conf
- install -m 0640 debian/gnbd-client.config
debian/tmp/etc/cluster/gnbdimports.conf
-
+ install -m 0640 debian/gnbdexports.conf
debian/tmp/etc/cluster/gnbdexports.conf
+ install -m 0640 debian/gnbdimports.conf
debian/tmp/etc/cluster/gnbdimports.conf
+
mv debian/tmp/etc/udev/rules.d/51-dlm.rules
debian/tmp/etc/udev/rules.d/45-dlm.rules
-
+
dh_install --sourcedir=debian/tmp --list-missing
-
+
+ mkdir -p debian/gfs-source/usr/src/modules/gfs
+ cp -a gfs-kernel/src/gfs/* debian/gfs-source/usr/src/modules/gfs/
+ cd debian/gfs-source/usr/src/ ; tar cjf gfs.tar.bz2 modules/gfs/
+ rm -rf debian/gfs-source/usr/src/modules
+
dh_installdirs
dh_link
dh_installdocs
@@ -95,14 +100,14 @@
dh_md5sums -i
dh_builddeb -i
-binary: binary-arch binary-indep
+binary: binary-arch binary-indep
clean: unpatch
dh_testdir
dh_testroot
dh_clean
- -$(MAKE) distclean
+ [ ! -f make/defines.mk ] || $(MAKE) distclean
rm -rf *-stamp
rm -rf debian/patched
_______________________________________________
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
