[Ocfs2-tools-commits] jlbec commits r947 - in trunk: . debian

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-06-14 20:39:02 -0500 (Tue, 14 Jun 2005)
New Revision: 947

Added:
   trunk/debian/ocfs2-tools.postinst
   trunk/debian/ocfs2-tools.prerm
   trunk/debian/ocfs2console.postinst
   trunk/debian/ocfs2console.prerm
Removed:
   trunk/debian/postinst
   trunk/debian/prerm
Modified:
   trunk/Makefile
   trunk/debian/control
   trunk/debian/ocfs2-tools.docs
Log:

o Fix debian/control formatting
o Remove COPYING from the docs list
o Proper per-package postinst/prerm
o Dist the files



Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-06-15 00:23:03 UTC (rev 946)
+++ trunk/Makefile	2005-06-15 01:39:02 UTC (rev 947)
@@ -38,6 +38,24 @@
 
 SUBDIRS += vendor
 
+DEBIAN_FILES =					\
+	debian/README.Debian			\
+	debian/changelog			\
+	debian/compat				\
+	debian/control				\
+	debian/ocfs2-tools.copyright		\
+	debian/ocfs2-tools.docs			\
+	debian/ocfs2-tools.files		\
+	debian/ocfs2-tools.manpages		\
+	debian/ocfs2-tools.prerm		\
+	debian/ocfs2-tools.postinst		\
+	debian/ocfs2console.copyright		\
+	debian/ocfs2console.files		\
+	debian/ocfs2console.manpages		\
+	debian/ocfs2console.prerm		\
+	debian/ocfs2console.postinst		\
+	debian/rules
+
 DIST_FILES = \
 	COPYING					\
 	CREDITS					\
@@ -60,7 +78,8 @@
 	mkinstalldirs				\
 	rpmarch.guess				\
 	documentation/users_guide.txt		\
-	documentation/samples/cluster.conf
+	documentation/samples/cluster.conf	\
+	$(DEBIAN_FILES)
 
 DIST_RULES = dist-subdircreate
 
@@ -68,6 +87,7 @@
 
 dist-subdircreate:
 	$(TOPDIR)/mkinstalldirs $(DIST_DIR)/documentation/samples
+	$(TOPDIR)/mkinstalldirs $(DIST_DIR)/debian
 
 dist-bye:
 	-rm -rf $(DIST_TOPDIR)

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2005-06-15 00:23:03 UTC (rev 946)
+++ trunk/debian/control	2005-06-15 01:39:02 UTC (rev 947)
@@ -11,7 +11,7 @@
 Section: admin
 Suggests: ocfs2console
 Conflicts:
-Description: Tools for managing the OCFS2 filesystem.
+Description: Tools for managing the OCFS2 filesystem
  Tools to manage the OCFS2 filesystem, including mkfs, tunefs, fsck,
  debugfs, and the utilities to control the O2CB clustering stack.
 
@@ -21,6 +21,6 @@
 Section: admin
 Conflicts:
 Description: The ocfs2console GUI
-  A GUI frontend for managing OCFS2 volumes on the system. One can mount
-  and unmount volumes, format, view overview information and individual
-  files, and view and modify the current cluster configuration.
+ A GUI frontend for managing OCFS2 volumes on the system. One can mount
+ and unmount volumes, format, view overview information and individual
+ files, and view and modify the current cluster configuration.

Modified: trunk/debian/ocfs2-tools.docs
===================================================================
--- trunk/debian/ocfs2-tools.docs	2005-06-15 00:23:03 UTC (rev 946)
+++ trunk/debian/ocfs2-tools.docs	2005-06-15 01:39:02 UTC (rev 947)
@@ -1,5 +1,4 @@
 README.O2CB
-COPYING
 CREDITS
 MAINTAINERS
 documentation/users_guide.txt

Copied: trunk/debian/ocfs2-tools.postinst (from rev 946, trunk/debian/postinst)

Copied: trunk/debian/ocfs2-tools.prerm (from rev 946, trunk/debian/prerm)

Added: trunk/debian/ocfs2console.postinst
===================================================================
--- trunk/debian/ocfs2console.postinst	2005-06-15 00:23:03 UTC (rev 946)
+++ trunk/debian/ocfs2console.postinst	2005-06-15 01:39:02 UTC (rev 947)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+#DEBHELPER#

Added: trunk/debian/ocfs2console.prerm
===================================================================
--- trunk/debian/ocfs2console.prerm	2005-06-15 00:23:03 UTC (rev 946)
+++ trunk/debian/ocfs2console.prerm	2005-06-15 01:39:02 UTC (rev 947)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+#DEBHELPER#

Deleted: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst	2005-06-15 00:23:03 UTC (rev 946)
+++ trunk/debian/postinst	2005-06-15 01:39:02 UTC (rev 947)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-#DEBHELPER#

Deleted: trunk/debian/prerm
===================================================================
--- trunk/debian/prerm	2005-06-15 00:23:03 UTC (rev 946)
+++ trunk/debian/prerm	2005-06-15 01:39:02 UTC (rev 947)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-#DEBHELPER#