Change to the package name for the ACL and attr development packages.

Change the devel .rpm and .deb package names so that they use a lib prefix.
Several packaging changes related to this to ensure upgrades work correctly
and dependency information isn't lost.

7 files changed, 29 insertions, 14 deletions

diff --git a/VERSION b/VERSION
index a5f1067..c82d8cc 100644
--- a/VERSION
+++ b/VERSION
@@ -2,6 +2,6 @@
 # This file is used by configure to get version information
 #
 PKG_MAJOR=2
-PKG_MINOR=0
-PKG_REVISION=12
+PKG_MINOR=1
+PKG_REVISION=0
 PKG_BUILD=0
diff --git a/build/rpm/attr.spec.in b/build/rpm/attr.spec.in
index bc79e97..11fb68b 100644
--- a/build/rpm/attr.spec.in
+++ b/build/rpm/attr.spec.in
@@ -28,25 +28,26 @@ Prereq: /sbin/ldconfig
 This package contains the libattr.so dynamic library which contains
 the extended attribute system calls and library functions.
 
-%package -n attr-devel
+%package -n libattr-devel
 Summary: Extended attribute static libraries and headers.
 Group: Development/Libraries
 Requires: libattr
+Obsoletes: attr-devel
 
-%description -n attr-devel
+%description -n libattr-devel
 This package contains the libraries and header files needed to
 develop programs which make use of extended attributes.
 For Linux programs, the documented system call API is the
 recommended interface, but an SGI IRIX compatibility interface
 is also provided.
 
-Currently only ext2, ext3 and XFS support extended attributes.
+Currently only ext2, ext3, JFS and XFS support extended attributes.
 The SGI IRIX compatibility API built above the Linux system calls is
 used by programs such as xfsdump(8), xfsrestore(8) and xfs_fsr(8).
 
-You should install attr-devel if you want to develop programs
-which make use of extended attributes.  If you install attr-devel,
-you'll also want to install attr.
+You should install libattr-devel if you want to develop programs
+which make use of extended attributes.  If you install libattr-devel
+then you'll also want to install attr.
 
 %prep
 if [ -f .census ] ; then
@@ -102,6 +103,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f files.rpm
 
-%files -n attr-devel -f filesdevel.rpm
+%files -n libattr-devel -f filesdevel.rpm
 
 %files -n libattr -f fileslib.rpm
diff --git a/debian/Makefile b/debian/Makefile
index a5bd352..2004eaa 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -34,7 +34,7 @@ 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)/../lib$(PKG_NAME)1-dev
 LIB_DOC_DIR = $(PKG_DOC_DIR)/../lib$(PKG_NAME)1
 
 default:
diff --git a/debian/changelog b/debian/changelog
index 776e2e5..61382a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+attr (2.1.0-1) unstable; urgency=low
+
+  * New upstream release, changing dev package name (closes: #141755)
+
+ -- Nathan Scott <nathans@debian.org>  Sat, 19 Oct 2002 08:40:38 +1000
+
 attr (2.0.12-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 50be659..cad832e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,11 +15,13 @@ Description: Utilities for manipulating filesystem extended attributes
  An attr(1) command is also provided which is largely compatible
  with the SGI IRIX tool of the same name.
 
-Package: attr-dev
+Package: libattr1-dev
 Section: devel
 Priority: extra
 Depends: libc6-dev, attr (>= 2.0.0)
-Conflicts: attr (<< 2.0.0)
+Provides: attr-dev
+Replaces: attr-dev
+Conflicts: attr-dev, attr (<< 2.0.0)
 Architecture: any
 Description: Extended attribute static libraries and headers
  attr-dev contains the libraries and header files needed to develop
@@ -27,7 +29,7 @@ Description: Extended attribute static libraries and headers
  the documented system call API is the recommended interface, but an
  SGI IRIX compatibility interface is also provided.
  .
- Currently only ext2, ext3 and XFS support extended attributes.
+ Currently only ext2, ext3, JFS and XFS support extended attributes.
  The SGI IRIX compatibility API built above the Linux system calls is
  used by programs such as xfsdump(8), xfsrestore(8) and xfs_fsr(8).
 
diff --git a/debian/rules b/debian/rules
index 1078c4e..1c39bae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 package = attr
-develop = $(package)-dev
+develop = lib$(package)1-dev
 library = lib$(package)1
 
 dirtmp = debian/tmp
diff --git a/doc/CHANGES b/doc/CHANGES
index 405f576..52e7673 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,9 @@
+attr-2.1.0 (19 October 2002)
+	- Change the devel .rpm and .deb package names so that they
+	  now use a lib prefix.
+	- Several packaging changes related to this to ensure upgrades
+	  work and depenency information isn't lost.
+
 attr-2.0.12 (07 October 2002)
 	- Fix: the m68k architecture is identified by __mc68000__
 	  rather than by __m68k__.