From: short <>
Date: Sun, 21 Sep 2003 15:34:06 +0000 (+0000)
Subject: Fixed proper versioning.
X-Git-Tag: ntfsprogs_200309071734_captive1~1
X-Git-Url: http://git.jankratochvil.net/?p=ntfsprogs.git;a=commitdiff_plain;h=40111e322fcee4d24dd2fba5d38ba26c781e21ba

Fixed proper versioning.
---

diff --git a/Makefile.am b/Makefile.am
index 315ae44..5fe9c61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,12 +6,15 @@ EXTRA_DIST = AUTHORS CREDITS COPYING TODO.include TODO.libntfs ChangeLog \
 		TODO.ntfsprogs getgccver \
 		debian/ntfsprogs.docs \
 		debian/ntfsprogs.files \
-		debian/changelog \
+		debian/changelog.in \
 		debian/control \
 		debian/copyright \
 		debian/rules \
 		debian/ntfsprogs-dev.files
 
+# Needed for dpkg-buildpackage(1):
+EXTRA_DIST+=debian/changelog
+
 AUTOMAKE_OPTIONS = gnu
 
 dist-hook: ntfsprogs.spec
diff --git a/autogen.pl b/autogen.pl
index 4f1edbd..8097fa5 100755
--- a/autogen.pl
+++ b/autogen.pl
@@ -48,6 +48,7 @@ AutoGen->run(
 				./ntfsprogs/ntfsundelete
 				./ntfsprogs/ntfscluster
 				./ntfsprogs/*.8
+				./debian/changelog
 				)],
 		"ChangeLog"=>"ChangeLog.captive",
 		);
diff --git a/configure.ac b/configure.ac
index e5659b3..eea07d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,13 @@
 AC_PREREQ(2.57)
-AC_INIT(ntfsprogs, 200309071734, linux-ntfs-dev@lists.sourceforge.net)
+AC_INIT(TODO.libntfs)
 AC_CANONICAL_TARGET([])
 AC_CONFIG_SRCDIR([config.h.in])
 AM_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE
+VERSION_BASE=200309071734
+VERSION_EXT=captive1
+AC_SUBST(VERSION_BASE)
+AC_SUBST(VERSION_EXT)
+AM_INIT_AUTOMAKE(ntfsprogs,$VERSION_BASE$VERSION_EXT)
 
 # This is required to get past a stupid configure bug when making the rpm.
 # Basically it is broken to specify the host as a command line argument to
@@ -149,5 +153,6 @@ AC_CONFIG_FILES([
 	ntfsprogs/ntfsundelete.8
 	ntfsprogs/ntfscluster.8
 	ntfsprogs.spec
+	debian/changelog
 ])
 AC_OUTPUT
diff --git a/debian/changelog b/debian/changelog.in
similarity index 71%
rename from debian/changelog
rename to debian/changelog.in
index 3d5fe7e..70cf178 100644
--- a/debian/changelog
+++ b/debian/changelog.in
@@ -1,3 +1,3 @@
-ntfsprogs (200307311516) unstable; urgency=low
+ntfsprogs (@VERSION_BASE@) unstable; urgency=low
   * See package ChangeLog entries.
  -- Jan Kratochvil <pgp-44FC7632@jankratochvil.net>  Tue, 09 Sep 2003 08:22:48 +0200
diff --git a/ntfsprogs.spec.in b/ntfsprogs.spec.in
index a96df7f..5abbc29 100644
--- a/ntfsprogs.spec.in
+++ b/ntfsprogs.spec.in
@@ -1,6 +1,6 @@
 %define	name	@PACKAGE@
-%define	ver	@VERSION@
-%define	rel	1captivecvs
+%define	ver	@VERSION_BASE@
+%define	rel	1@VERSION_EXT@
 %define	prefix	/usr
 %define bindir	/usr/bin
 %define sbindir /usr/sbin