Debian acl/attr library packaging updates

6 files changed, 24 insertions, 9 deletions

diff --git a/VERSION b/VERSION
index 8dde1cb..3d294f9 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=4
-PKG_REVISION=3
+PKG_REVISION=4
 PKG_BUILD=0
diff --git a/debian/Makefile b/debian/Makefile
index 2004eaa..1e3e2d3 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000-2002 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
@@ -33,9 +33,10 @@
 TOPDIR = ..
 include $(TOPDIR)/include/builddefs
 
-LSRCFILES = changelog control copyright rules
-DEV_DOC_DIR = $(PKG_DOC_DIR)/../lib$(PKG_NAME)1-dev
-LIB_DOC_DIR = $(PKG_DOC_DIR)/../lib$(PKG_NAME)1
+LIBPKG = lib$(PKG_NAME)1
+LSRCFILES = changelog control copyright rules shlibs.$(LIBPKG)
+DEV_DOC_DIR = $(PKG_DOC_DIR)/../$(LIBPKG)-dev
+LIB_DOC_DIR = $(PKG_DOC_DIR)/../$(LIBPKG)
 
 default:
 
diff --git a/debian/changelog b/debian/changelog
index 339e26e..09bdd26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+attr (2.4.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Fix lib package dependencies, thanks to Steve Langasek (closes: #196046)
+
+ -- Nathan Scott <nathans@debian.org>  Wed, 04 Jun 2003 15:50:50 +1000
+
 attr (2.4.3-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 1c39bae..cc53c34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,10 +39,12 @@ clean:
 binary-indep:
 
 # Note1: dev pkg with .so symlinks to base pkg confuses debstd;
-# so the .so 'Dangling symlink' message is benign.
+#        so the .so 'Dangling symlink' message is benign, as is
+#        the message about not having executables/libraries.
 # Note2: absolute symlinks (required by policy) confuse debstd;
-# so we'll filter out symlink messages entirely now.
-# 
+#        so we'll filter out symlink messages entirely now.
+fixup_messages = egrep -v 'Dangling symlink|No executables or libraries'
+
 binary-arch: checkroot built
 	@echo "== dpkg-buildpackage: binary-arch" 1>&2
 	$(checkdir)
@@ -52,10 +54,11 @@ binary-arch: checkroot built
 	$(pkglib) $(MAKE) -C . install-lib
 	$(pkgtmp) $(MAKE) -C build src-manifest
 	@echo "== dpkg-buildpackage: debstd" 1>&2
-	$(stdenv) debstd -m | grep -v 'Dangling symlink'
+	$(stdenv) debstd -m | $(fixup_messages)
 	dpkg-gencontrol -isp -p$(package) -P$(dirtmp) -Tdebian/substvars
 	dpkg-gencontrol -isp -p$(develop) -P$(dirdev)
 	dpkg-gencontrol -isp -p$(library) -P$(dirlib) -Tdebian/$(library).substvars
+	cp debian/shlibs.$(library) $(dirlib)/DEBIAN/shlibs
 	chown -R root.root $(dirtmp) $(dirdev) $(dirlib)
 	chmod -R go=rX $(dirtmp) $(dirdev) $(dirlib)
 	dpkg --build $(dirtmp) .. 
diff --git a/debian/shlibs.libattr1 b/debian/shlibs.libattr1
new file mode 100644
index 0000000..5eb59c5
--- /dev/null
+++ b/debian/shlibs.libattr1
@@ -0,0 +1 @@
+libattr 1 libattr1 (>= 2.4.4-1)
diff --git a/doc/CHANGES b/doc/CHANGES
index e532837..6179016 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,6 @@
+attr-2.4.4 (04 Junel 2003)
+	- Some Debian-specific packaging updates.
+
 attr-2.4.3 (26 April 2003)
 	- Rework configure.in to make use of shared macros.