aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-03-20 02:48:56 +0000
committerNathan Scott <nathans@sgi.com>2006-03-20 02:48:56 +0000
commit8f4fdb47b48f0c00c8d41eef4cfdd4b535b72c15 (patch)
treec9f764a7edef1279f0d6334b4acbc235ea7a3735
parentafde60bbad0515dc20ab3c05b946bb0fc19f911b (diff)
downloaddmapi-dev-8f4fdb47b48f0c00c8d41eef4cfdd4b535b72c15.tar.gz
Some Debian packaging issues resolved in dmapi package.
Merge of master-melb:xfs-cmds:25508a by kenmcd.
-rw-r--r--VERSION2
-rw-r--r--debian/changelog7
-rw-r--r--debian/control8
-rw-r--r--doc/CHANGES4
-rw-r--r--m4/package_globals.m42
5 files changed, 17 insertions, 6 deletions
diff --git a/VERSION b/VERSION
index 699c925..4b539ed 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
#
PKG_MAJOR=2
PKG_MINOR=2
-PKG_REVISION=3
+PKG_REVISION=4
PKG_BUILD=1
diff --git a/debian/changelog b/debian/changelog
index 004b33a..f6c244d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dmapi (2.2.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Fix build dependencies and use -O2 now (closes: #357788)
+
+ -- Nathan Scott <nathans@debian.org> Mon, 21 Nov 2005 17:48:53 +1100
+
dmapi (2.2.3-1) unstable; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 2bc1083..f5ba471 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: dmapi
Section: admin
Priority: optional
Maintainer: Nathan Scott <nathans@debian.org>
-Build-Depends: xfslibs-dev (>= 2.0.0), autoconf, debmake, libtool
+Build-Depends: xfslibs-dev (>= 2.7.13), autoconf, debmake, libtool
Standards-Version: 3.5.9
Package: libdm0
@@ -11,7 +11,7 @@ Priority: optional
Depends: ${shlibs:Depends}
Provides: dmapi
Replaces: dmapi
-Recommends: xfsdump (>= 2.0.0)
+Recommends: xfsdump (>= 2.2.34)
Architecture: any
Description: Data Management API runtime environment
Files required by system software using the Data Management API
@@ -23,10 +23,10 @@ Description: Data Management API runtime environment
Package: libdm0-dev
Section: libdevel
Priority: extra
-Depends: libc6-dev, libdm0, xfslibs-dev (>= 2.0.0)
+Depends: libc6-dev, libdm0, xfslibs-dev (>= 2.7.13)
Provides: dmapi-dev
Replaces: dmapi-dev
-Conflicts: xfslibs-dev (<< 2.0.0)
+Conflicts: xfslibs-dev (<< 2.7.13)
Architecture: any
Description: Data Management API static libraries and headers
libdm0-dev contains the libraries and header files needed to
diff --git a/doc/CHANGES b/doc/CHANGES
index fc7601a..84cbb78 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+dmapi-2.2.4 (21 November 2005)
+ - Use -O2 for builds, not -O1.
+ - Fix Debian build packaging dependency.
+
dmapi-2.2.3 (21 November 2005)
- Make use of getdents64 instead of plain getdents.
- Remove remaining uses of Linux kernel types to resolve
diff --git a/m4/package_globals.m4 b/m4/package_globals.m4
index c28e1a1..665afc8 100644
--- a/m4/package_globals.m4
+++ b/m4/package_globals.m4
@@ -19,7 +19,7 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
debug_build="$DEBUG"
AC_SUBST(debug_build)
- OPTIMIZER=${OPTIMIZER:-'-g'} dnl -O2
+ OPTIMIZER=${OPTIMIZER:-'-g -O2'}
opt_build="$OPTIMIZER"
AC_SUBST(opt_build)