Use versioned apkg filenames.

diff --git a/autopackage/dcuilib.apspec.in b/autopackage/dcuilib.apspec.in
index 5eae382..da8653b 100644 (file)
--- a/autopackage/dcuilib.apspec.in
+++ b/autopackage/dcuilib.apspec.in
@@ -13,7 +13,7 @@ SoftwareVersion: @VERSION@
 Repository: http://www.dolda2000.com/~fredrik/doldaconnect/ap/doldaconnect-uilib.xml
 AutopackageTarget: 1.2
 InterfaceVersion: 1.1
-PackageFileName: doldaconnect-uilib.package
+PackageFileName: doldaconnect-uilib-@VERSION@.package
 
 [Description]
 The Dolda Connect interface library is used by programs for talking

diff --git a/autopackage/dolcon.apspec.in b/autopackage/dolcon.apspec.in
index 03bdbf6..ef45655 100644 (file)
--- a/autopackage/dolcon.apspec.in
+++ b/autopackage/dolcon.apspec.in
@@ -12,7 +12,7 @@ License: GNU General Public License, Version 2 or later
 SoftwareVersion: @VERSION@
 AutopackageTarget: 1.2
 Repository: http://www.dolda2000.com/~fredrik/doldaconnect/ap/doldaconnect-gtk.xml
-PackageFileName: doldaconnect-gtk.package
+PackageFileName: doldaconnect-gtk-@VERSION@.package
 
 # Only uncomment InterfaceVersion if your package exposes interfaces to other software,
 # for instance if it includes DSOs or python/perl modules. See the developer guide for more info,

diff --git a/autopackage/doldacond.apspec.in b/autopackage/doldacond.apspec.in
index 383c741..5644e0f 100644 (file)
--- a/autopackage/doldacond.apspec.in
+++ b/autopackage/doldacond.apspec.in
@@ -12,7 +12,7 @@ License: GNU General Public License, Version 2 or later
 SoftwareVersion: @VERSION@
 AutopackageTarget: 1.2
 Repository: http://www.dolda2000.com/~fredrik/doldaconnect/ap/doldaconnect-daemon.xml
-PackageFileName: doldaconnect-daemon.package
+PackageFileName: doldaconnect-daemon-@VERSION@.package
 
 # Only uncomment InterfaceVersion if your package exposes interfaces to other software,
 # for instance if it includes DSOs or python/perl modules. See the developer guide for more info,

diff --git a/autopackage/guishell.apspec.in b/autopackage/guishell.apspec.in
index 3479b14..1d0b058 100644 (file)
--- a/autopackage/guishell.apspec.in
+++ b/autopackage/guishell.apspec.in
@@ -12,7 +12,7 @@ License: GNU General Public License, Version 2 or later
 SoftwareVersion: @VERSION@
 Repository: http://www.dolda2000.com/~fredrik/doldaconnect/ap/doldaconnect-guishell.xml
 AutopackageTarget: 1.2
-PackageFileName: doldaconnect-guishell.package
+PackageFileName: doldaconnect-guishell-@VERSION@.package
 
 [BuildPrepare]
 prepareBuild --enable-dolconf --enable-guishell --disable-gtk2ui --disable-daemon

diff --git a/autopackage/makeall b/autopackage/makeall
index a6b51cd..c2edd91 100755 (executable)
--- a/autopackage/makeall
+++ b/autopackage/makeall
@@ -9,7 +9,8 @@ cd doldaconnect
 ./bootstrap
 ./configure
 
-packages="dcuilib dolcon doldacond guishell"
+packages="`cat autopackage/build`"
+version="`sed -n 's/^.* VERSION "\([^"]*\)".*$/\1/p' config.h`"
 
 for pkg in $packages; do
     sfile="autopackage/$pkg.apspec"
@@ -20,7 +21,7 @@ for pkg in $packages; do
     fi
     make clean
     PACKAGEFILENAME="$pname.package" makepackage "$sfile"
-    mv "$pname.package" "$pname.package.meta" "$pname.xml" "$tempdir"
+    mv "$pname-$version.package" "$pname-$version.package.meta" "$pname.xml" "$tempdir"
 done
 
 rm -rf "$tempdir/doldaconnect"