[kernel] r10526 - in dists/trunk/redhat-cluster/redhat-cluster/debian: . patches

Tue Feb 12 21:58:59 UTC 2008

Author: fs
Date: Tue Feb 12 21:58:58 2008
New Revision: 10526

Log:
New upstream CVS snapshot.
Merge changes from Ubuntu:
- debian/copyright: add copyright info and shut up lintian a bit.
- link mount.gfs man page to mount.gfs2.
- debian/rules: fix order of dh_ to get library dh snippets in place.
- debian/TODO list.
- drop unrequired maintainer scripts.
- debian/control: fix libdlm-dev depends.



Added:
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/
   dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
Removed:
   dists/trunk/redhat-cluster/redhat-cluster/debian/libcman2.postinst
   dists/trunk/redhat-cluster/redhat-cluster/debian/libdlm2.postinst
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/TODO
   dists/trunk/redhat-cluster/redhat-cluster/debian/changelog
   dists/trunk/redhat-cluster/redhat-cluster/debian/control
   dists/trunk/redhat-cluster/redhat-cluster/debian/copyright
   dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.links
   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	Tue Feb 12 21:58:58 2008
@@ -1,3 +1,7 @@
+Merge cman.init changes from upstream to handle xen.
+Review *.init. 
+check scsi_reserve stuff
+
 Open packaging issues
 --------------------
 
@@ -22,7 +26,6 @@
 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

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	Tue Feb 12 21:58:58 2008
@@ -1,3 +1,16 @@
+redhat-cluster (2.20080212-1) unstable; urgency=low
+
+  * New upstream CVS snapshot.
+  * Merge changes from Ubuntu:
+    - debian/copyright: add copyright info and shut up lintian a bit.
+    - link mount.gfs man page to mount.gfs2.
+    - debian/rules: fix order of dh_ to get library dh snippets in place.
+    - debian/TODO list.
+    - drop unrequired maintainer scripts.
+    - debian/control: fix libdlm-dev depends.
+
+ -- Frederik Schüler <fs at debian.org>  Tue, 12 Feb 2008 22:46:46 +0100
+
 redhat-cluster (2.20080208-2) unstable; urgency=low
 
   * Update linux-libc-dev build dependency to version 2.6.24-1, this should

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	Tue Feb 12 21:58:58 2008
@@ -4,7 +4,7 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>
 Standards-Version: 3.7.3.0
-Build-Depends: debhelper (>= 4.2.28), libxml2-dev, libncurses5-dev, libopenais-dev (>= 0.82-2), libvolume-id-dev (>=  0.105-4), linux-libc-dev (>= 2.6.24-1), libvirt-dev (>= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], libnspr4-dev [amd64 i386], bzip2, libslang2-dev
+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.24-1), libvirt-dev (>= 0.3.0) [amd64 i386], libnss3-dev [amd64 i386], libnspr4-dev [amd64 i386], bzip2, libslang2-dev
 Build-Conflicts: libccs-dev, libcman-dev (<= 2.0), libdlm-dev (<= 2.0), libcman2, libdlm2
 
 Package: redhat-cluster-suite
@@ -65,7 +65,7 @@
 Package: libdlm-dev
 Section: libdevel
 Architecture: any
-Depends: libdlm2 (= ${binary:Version})
+Depends: ${shlibs: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.

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	Tue Feb 12 21:58:58 2008
@@ -18,6 +18,26 @@
 
 Based on a CVS snapshot from the Ubuntu packages archive.
 
+Upstream carries tons of copyrights from several sources. Each specific 
+source file has its own copyright header with very detailed information. 
+Here is a quick summary of all company/people:
+
+Copyright (C) 2006 Alexander Krauth
+Copyright (C) 1995-1997 Olaf Kirch <okir at monad.swb.de>
+Copyright (C) 1997-2004 Sistina Software, Inc.
+Copyright (C) 2003-2008 Red Hat, Inc.
+Copyright (C) 2000-2003 Silicon Graphics, Inc.
+Copyright (C) 2000 Alan Robertson <alanr at unix.sh>
+Copyright (C) 2000 Bryan Call <bc at fodder.org>
+Copyright (C) 2004 SUSE LINUX AG, Lars Marowsky-Bree
+Copyright (C) 2005 American Power Conversion, Inc.
+Copyright (C) Crosswalk 2006-2007
+Copyright (C) Lon Hohberger, 2004
+Copyright (C) Mission Critical Linux, Inc. 2000
+Copyright (C) 2001-2003 The OpenGFS2 Project
+Copyright (C) 2001-2003 The OpenGFS Project
+Copyright (C) 2004 ben.m.cahill at intel.com
+
 Most parts are licensed under the GNU GPL version 2:
 
    This package is free software; you can redistribute it and/or modify

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.links
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.links	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/gfs-tools.links	Tue Feb 12 21:58:58 2008
@@ -4,3 +4,4 @@
 sbin/umount.gfs2 sbin/umount.gfs
 usr/share/man/man8/gfs_fsck.8.gz usr/share/man/man8/fsck.gfs.8.gz
 usr/share/man/man8/gfs_mkfs.8.gz usr/share/man/man8/mkfs.gfs.8.gz
+usr/share/man/man8/mount.gfs2.8.gz usr/share/man/man8/mount.gfs.8.gz

Added: dists/trunk/redhat-cluster/redhat-cluster/debian/patches/00list
==============================================================================

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	Tue Feb 12 21:58:58 2008
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
+include /usr/share/dpatch/dpatch.make
+
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 xen_arches = amd64 i386
@@ -15,7 +17,7 @@
 SOMAJOR=2
 SOMINOR=0
 
-configure: configure-stamp
+configure: patch configure-stamp
 configure-stamp:
 	dh_testdir
 	
@@ -112,9 +114,9 @@
 endif
 	dh_compress -a
 	dh_fixperms -a
-	dh_installdeb -a
 	dh_makeshlibs -a
 	dh_shlibdeps -a -ldebian/tmp/usr/lib -l/usr/lib/openais
+	dh_installdeb -a
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
@@ -131,12 +133,12 @@
 
 binary: binary-arch binary-indep 
 
-clean: 
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	dh_clean
-
+	
 	 [ ! -f make/defines.mk ] || $(MAKE) distclean
-
+	
 	rm -rf *-stamp
-
+	rm -rf debian/patched

