Debian packaging update to close out an old DMAPI package-naming request. Only affects Debian.

5 files changed, 43 insertions, 21 deletions

diff --git a/debian/Makefile b/debian/Makefile
index bc7745f..f19b669 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000-2001 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
 # 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of version 2 of the GNU General Public License as
@@ -34,7 +34,8 @@ TOPDIR = ..
 include $(TOPDIR)/include/builddefs
 
 LSRCFILES = changelog control copyright rules
-DEV_DOC_DIR = $(PKG_DOC_DIR)/../$(PKG_NAME)-dev
+DEV_DOC_DIR = $(PKG_DOC_DIR)/../libdm0-dev
+LIB_DOC_DIR = $(PKG_DOC_DIR)/../libdm0
 
 default:
 
@@ -43,7 +44,9 @@ include $(BUILDRULES)
 install: default
 ifeq ($(PKG_DISTRIBUTION), debian)
 	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
-	$(INSTALL) -m 644 changelog $(PKG_DOC_DIR)/changelog.Debian
+	$(INSTALL) -m 755 -d $(LIB_DOC_DIR)
+	$(INSTALL) -m 644 copyright $(LIB_DOC_DIR)
+	$(INSTALL) -m 644 changelog $(LIB_DOC_DIR)/changelog.Debian
 endif
 
 install-dev: default
diff --git a/debian/changelog b/debian/changelog
index 0b77d0a..10f3080 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dmapi (2.1.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Renamed packages to follow policy guidelines (closes: #141753)
+
+ -- Nathan Scott <nathans@debian.org>  Sat, 18 Oct 2003 09:38:40 +1000
+
 dmapi (2.0.8-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 79cddd9..c0e9562 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,12 @@ Maintainer: Nathan Scott <nathans@debian.org>
 Build-Depends: xfslibs-dev (>= 2.0.0), autoconf, debmake, libtool
 Standards-Version: 3.5.9
 
-Package: dmapi
+Package: libdm0
+Section: libs
+Priority: optional
 Depends: ${shlibs:Depends}
+Provides: dmapi
+Replaces: dmapi
 Recommends: xfsdump (>= 2.0.0)
 Architecture: any
 Description: Data Management API runtime environment
@@ -16,14 +20,15 @@ Description: Data Management API runtime environment
  (XDSM) API dated February 1997.  This interface is implemented
  by the libdm library.
 
-Package: dmapi-dev
+Package: libdm0-dev
 Section: devel
 Priority: extra
-Depends: libc6-dev, dmapi (>= 2.0.4), xfslibs-dev (>= 2.0.0)
-Conflicts: dmapi (<< 2.0.4), xfslibs-dev (<< 2.0.0)
+Depends: libc6-dev, libdm0, xfslibs-dev (>= 2.0.0)
+Provides: dmapi-dev
+Replaces: dmapi-dev
+Conflicts: xfslibs-dev (<< 2.0.0)
 Architecture: any
 Description: Data Management API static libraries and headers
- dmapi-dev contains the libraries and header files needed to
+ libdm0-dev contains the libraries and header files needed to
  develop programs which make use of the Data Management API
- (DMAPI).  You must install the xfslibs-dev package with
- dmapi-dev.
+ (DMAPI).
diff --git a/debian/rules b/debian/rules
index e12e3f9..7308450 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,13 @@
 #!/usr/bin/make -f
 
 package = dmapi
-develop = $(package)-dev
+develop = libdm0-dev
+library = libdm0
 
-dirtmp = debian/tmp
 dirdev = debian/$(develop)
-pkgtmp = DIST_ROOT=`pwd`/$(dirtmp); export DIST_ROOT;
+dirlib = debian/tmp
 pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT;
+pkglib = DIST_ROOT=`pwd`/$(dirlib); export DIST_ROOT;
 stdenv = @GZIP=-q; export GZIP;
 
 options = DEBUG="-DNDEBUG"; OPTIMIZER="-O1 -g"; DISTRIBUTION="debian"; \
@@ -31,7 +32,7 @@ clean:
 	$(checkdir)
 	-rm -f built .census
 	$(MAKE) distclean
-	-rm -rf $(dirtmp) $(dirdev) debian/*substvars debian/files*
+	-rm -rf $(dirtmp) $(dirdev) $(dirtmp) debian/*substvars debian/files*
 
 binary-indep:
 
@@ -43,18 +44,18 @@ binary-indep:
 binary-arch: checkroot built
 	@echo "== dpkg-buildpackage: binary-arch" 1>&2
 	$(checkdir)
-	-rm -rf $(dirtmp) $(dirdev)
-	$(pkgtmp) $(MAKE) -C . install
+	-rm -rf $(dirtmp) $(dirdev) $(dirlib)
 	$(pkgdev) $(MAKE) -C . install-dev
-	$(pkgtmp) $(MAKE) -C build src-manifest
+	$(pkglib) $(MAKE) -C . install
+	$(pkglib) $(MAKE) -C build src-manifest
 	@echo "== dpkg-buildpackage: debstd" 1>&2
 	$(stdenv) debstd -m | grep -v 'Dangling symlink'
-	dpkg-gencontrol -isp -p$(package) -P$(dirtmp)
 	dpkg-gencontrol -isp -p$(develop) -P$(dirdev)
-	chown -R root.root $(dirtmp) $(dirdev)
-	chmod -R go=rX $(dirtmp) $(dirdev)
-	dpkg --build $(dirtmp) .. 
+	dpkg-gencontrol -isp -p$(library) -P$(dirlib)
+	chown -R root.root $(dirtmp) $(dirdev) $(dirlib)
+	chmod -R go=rX $(dirtmp) $(dirdev) $(dirlib)
 	dpkg --build $(dirdev) ..
+	dpkg --build $(dirlib) .. 
 
 binary: binary-indep binary-arch
 
diff --git a/doc/CHANGES b/doc/CHANGES
index 158ea8a..0a24c0a 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,9 @@
+dmapi-2.1.0 (18 October 2003)
+	- libdm now attempts to find the dmapi device in /dev, if that
+	  fails then it falls back to the old location in /proc.
+	- Rework Debian package names to more closely conform to the
+	  packaging policy requirements.
+
 dmapi-2.0.8 (26 April 2003)
 	- Rework configure.in to make use of shared macros.