Add raw1394_get_local_id, _irm_id, _nodecount refentry.

git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@73 53a565d1-3bb7-0310-b661-cf11e63c67ab

6 files changed, 108 insertions, 115 deletions

diff --git a/debian/changelog b/debian/changelog
index 06f676e..11b02f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libraw1394 (0.9.0-3) unstable; urgency=low
+
+  * Move to debhelper V3.
+  * Add debconf support.
+
+ -- Andreas Bombe <aeb@debian.org>  Thu, 28 Jun 2001 14:01:37 +0200
+
 libraw1394 (0.9.0-2) unstable; urgency=low
 
   * Fix postinst of shared library package so that it does not fail over
diff --git a/debian/control b/debian/control
index e6721e2..94dd66b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: libraw1394
 Section: libs
 Priority: optional
 Maintainer: Andreas Bombe <aeb@debian.org>
-Standards-Version: 3.5.4.0
-Build-Depends: debhelper
+Standards-Version: 3.5.6.0
+Build-Depends: debhelper (>= 3.0.0)
 
 Package: libraw1394-dev
 Architecture: any
@@ -23,7 +23,7 @@ Description: library for direct access to IEEE 1394 bus - development files
 Package: libraw1394-5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}${makedev-depend}
+Depends: debconf, makedev (>= 2.3.1-49), ${shlibs:Depends}
 Description: library for direct access to IEEE 1394 bus (aka FireWire)
  libraw1394 is the only supported interface to the kernel side raw1394
  of the Linux IEEE-1394 subsystem, which provides direct access to the
diff --git a/debian/libraw1394-potato.postinst.in b/debian/libraw1394-potato.postinst.in
deleted file mode 100644
index db512d7..0000000
--- a/debian/libraw1394-potato.postinst.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "configure" ]; then
-	ldconfig
-
-	if [ ! -c /dev/raw1394 ]; then
-		cat <<EOF
-
-Required /dev/raw1394 device file not found.  Without it, libraw1394
-is quite useless as it can not talk to the kernel driver.
-
-EOF
-		read -p "Should I create it for you? [Y/n] " REPLY || REPLY=no
-
-		case "$REPLY" in
-		y|yes|"")
-			mknod -m600 /dev/raw1394 c 171 0
-			chown root.root /dev/raw1394
-			cat <<EOF
-
-/dev/raw1394 created.
-
-It is owned by root with read/write permissions for root.  You may
-want to fix the group/permission to something appropriate for you.
-Note however that anyone who can open raw1394 can access all devices
-on all connected 1394 buses unrestricted, including harddisks and
-other probably sensitive devices.
-
-EOF
-			;;
-		*)
-			cat <<EOF
-
-/dev/raw1394 not created.  You can create it at a later time using
-/dev/MAKEDEV if you have a version that already knows raw1394 or you
-can create it manually with the command:
-
-    mknod -m600 /dev/raw1394 c 171 0
-
-EOF
-			;;
-		esac
-	fi
-fi
-
-#DEBHELPER#
diff --git a/debian/libraw1394.postinst.in b/debian/libraw1394.postinst.in
index d779f3e..d74fc34 100644
--- a/debian/libraw1394.postinst.in
+++ b/debian/libraw1394.postinst.in
@@ -1,44 +1,16 @@
 #!/bin/sh -e
 
-if [ "$1" = "configure" ]; then
-	ldconfig
-
-	if [ ! -c /dev/raw1394 ]; then
-		cat <<EOF
-
-Required /dev/raw1394 device file not found.  Without it, libraw1394
-is quite useless as it can not talk to the kernel driver.
-
-EOF
-		read -p "Should I create it for you? [Y/n] " REPLY || REPLY=no
-
-		case "$REPLY" in
-		y|yes|"")
-			if (cd /dev && ./MAKEDEV raw1394); then
-			    cat <<EOF
+. /usr/share/debconf/confmodule
+db_version 2.0
 
-Device file created.  You may want to fix the group/permission to
-something appropriate for you.  Note however that anyone who can open
-raw1394 can access all devices on all connected 1394 buses
-unrestricted, including harddisks and other probably sensitive
-devices.
-
-EOF
-			fi
-			;;
-		*)
-			cat <<EOF
-
-/dev/raw1394 not created.  You can create it at a later time manually
-with the commands:
-
-    cd /dev; ./MAKEDEV raw1394
+if [ "$1" = "configure" ]; then
+    db_get libraw1394/dev/create_node
 
-EOF
-			;;
-		esac
-	fi
+    if [ "$RET" = "true" ]; then
+	echo -n "Creating device node /dev/raw1394... "
+	cd /dev && ./MAKEDEV raw1394
+	echo "done."
+    fi
 fi
 
-
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index eec72ec..7fd378c 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,34 @@
 #!/usr/bin/make -f
 
-export DH_COMPAT=1
-
-potato-build	= no
+export DH_COMPAT=3
 
 majorname	= $(shell grep library_names src/libraw1394.la | cut -d"'" -f 2 | cut -d" " -f 2)
 fullversionname	= $(shell grep library_names src/libraw1394.la | cut -d"'" -f 2 | cut -d" " -f 1)
-major 		= $(shell echo $(majorname) | cut -d"." -f 3)
 
+major 		= 5
 libraw		= libraw1394-$(major)
-source-version	= $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f 2)
 
-autoclean-files:
-	echo $@ >$@
+# maintainer files for the so package (of the name $(libraw))
+somaint		= postinst config templates
+
 
 build: build-stamp
 build-stamp:
 	dh_testdir
 
-	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	./configure --prefix=/usr --mandir=\$${prefix}/share/man
 	$(MAKE)
 
 	touch build-stamp
 
-clean: autoclean-files
+clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f build-stamp $(somaint:%=debian/$(libraw).%)
 
 	-$(MAKE) distclean
 
 	dh_clean
-	xargs <autoclean-files rm -f
 
 install: build
 	dh_testdir
@@ -44,38 +41,34 @@ install: build
 binary-indep: build install
 # Nothing to do here
 
-binary-arch: build install autoclean-files
+binary-arch: build install
 	dh_testdir
 	dh_testroot
 
+	for i in $(somaint); do					\
+		ln -sf libraw1394.$$i.in debian/$(libraw).$$i;	\
+	done
+
 	dh_movefiles -p$(libraw)		\
 		usr/lib/$(majorname)		\
 		usr/lib/$(fullversionname)
 
-	echo >>autoclean-files			\
-		debian/$(libraw).postinst	\
-		debian/$(libraw).substvars
-
-	if [ "$(potato-build)" = "yes" ]; then				\
-		cp debian/libraw1394-potato.postinst.in			\
-			debian/$(libraw).postinst;			\
-		echo "makedev-depend=" >>debian/$(libraw).substvars;	\
-	else								\
-		cp debian/libraw1394.postinst.in			\
-			debian/$(libraw).postinst;			\
-		echo "makedev-depend=, makedev (>= 2.3.1-49)"		\
-			>>debian/$(libraw).substvars;			\
-	fi
-
-	dh_installmanpages -plibraw1394-dev
+	dh_movefiles -plibraw1394-dev		\
+		usr/lib				\
+		usr/bin				\
+		usr/include/libraw1394		\
+		usr/share/aclocal/libraw1394.m4
+
+	dh_installman
 	dh_installdocs
 	dh_installchangelogs
+	dh_installdebconf
 	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -V
 	dh_installdeb
-	dh_shlibdeps -ldebian/$(libraw)/usr/lib
+	LD_PRELOAD='' dh_shlibdeps -v -ldebian/$(libraw)/usr/lib
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
diff --git a/doc/libraw1394.sgml b/doc/libraw1394.sgml
index 7c7033f..1f7e78e 100644
--- a/doc/libraw1394.sgml
+++ b/doc/libraw1394.sgml
@@ -893,6 +893,73 @@ struct <structname>raw1394_portinfo</structname> {
 	</para>
       </refsect1>
     </refentry>
+
+    <refentry>
+      <refmeta>
+	<refentrytitle>raw1394_get_(local_id|irm_id|nodecount)</refentrytitle>
+	<manvolnum>3</manvolnum>
+      </refmeta>
+
+      <refnamediv>
+	<refname>raw1394_get_local_id</refname>
+	<refname>raw1394_get_irm_id</refname>
+	<refname>raw1394_get_nodecount</refname>
+	<refpurpose>return basic information about the bus</refpurpose>
+      </refnamediv>
+
+      <refsynopsisdiv>
+	<funcsynopsis>
+	  <funcprototype>
+	    <funcdef>nodeid_t <function>raw1394_get_local_id</function></funcdef>
+	    <paramdef>raw1394handle_t <parameter>handle</parameter></paramdef>
+	  </funcprototype>
+	  <funcprototype>
+	    <funcdef>nodeid_t <function>raw1394_get_irm_id</function></funcdef>
+	    <paramdef>raw1394handle_t <parameter>handle</parameter></paramdef>
+	  </funcprototype>
+	  <funcprototype>
+	    <funcdef>int <function>raw1394_get_nodecount</function></funcdef>
+	    <paramdef>raw1394handle_t <parameter>handle</parameter></paramdef>
+	  </funcprototype>
+	</funcsynopsis>
+      </refsynopsisdiv>
+
+      <refsect1>
+	<title>Arguments</title>
+
+	<variablelist>
+	  <varlistentry>
+	    <term><parameter>handle</parameter></term>
+	    <listitem>
+	      <para>handle associated with a 1394 bus</para>
+	    </listitem>
+	  </varlistentry>
+	</variablelist>
+      </refsect1>
+
+      <refsect1>
+	<title>Description</title>
+
+	<para>
+	  These functions return information about the 1394 bus the handle is
+	  associated with.  The values that can be queried through these
+	  functions can change with every bus reset.
+	</para>
+      </refsect1>
+
+      <refsect1>
+	<title>Return Value</title>
+
+	<para>
+	  <function>raw1394_get_local_id()</function> returns the node ID of the
+	  local node (i.e. the hardware the driver is controlling directly).
+	  <function>raw1394_get_irm_id()</function> returns the node ID of the
+	  node that has become isochronous resource manager.
+	  <function>raw1394_get_nodecount</function> returns the number of nodes
+	  currently on the bus (including the local node).
+	</para>
+      </refsect1>
+    </refentry>
   </chapter>
 
 </book>