From 0bc45e75923b93f0cca95fb81ac1c23e89b7051c Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Mon, 9 May 2005 16:20:10 +0000
Subject: [PATCH] autopackage sources updated to match -2 of 0.6.1 package [and
 hopefully the upcoming 0.7]

---
 .../@glade.gnome.org/libglade/skeleton.1      | 13 ++++++++++
 autopackage/@gnome.org/pygtk/skeleton.1       | 24 ++++++++++++++++++
 autopackage/@gtk.org/gtk/skeleton.1           | 25 +++++++++++++++++++
 autopackage/default.apspec                    |  6 ++---
 4 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 autopackage/@glade.gnome.org/libglade/skeleton.1
 create mode 100644 autopackage/@gnome.org/pygtk/skeleton.1
 create mode 100644 autopackage/@gtk.org/gtk/skeleton.1

diff --git a/autopackage/@glade.gnome.org/libglade/skeleton.1 b/autopackage/@glade.gnome.org/libglade/skeleton.1
new file mode 100644
index 000000000..198517138
--- /dev/null
+++ b/autopackage/@glade.gnome.org/libglade/skeleton.1
@@ -0,0 +1,13 @@
+[Meta]
+RootName: @glade.gnome.org/libglade
+DisplayName: Glade user interface loader library
+ShortName: libglade
+Skeleton-Author: Mike Hearn <mike@theoretic.com>
+Skeleton-Version: 1
+
+[Notes]
+This skeleton only detects libglade1 and 2, which are assigned interface numbers 1 and 2 respectively
+
+[Test]
+testForLib libglade.so.0 && INTERFACE_VERSIONS="1"
+testForLib libglade-2.0.so.0 && INTERFACE_VERSIONS="2 $INTERFACE_VERSIONS"
diff --git a/autopackage/@gnome.org/pygtk/skeleton.1 b/autopackage/@gnome.org/pygtk/skeleton.1
new file mode 100644
index 000000000..9effcb742
--- /dev/null
+++ b/autopackage/@gnome.org/pygtk/skeleton.1
@@ -0,0 +1,24 @@
+# -*- shell-script-mode -*-
+
+[Meta]
+RootName: @gnome.org/pygtk
+DisplayName: Python bindings for GTK+
+ShortName: pygtk
+Skeleton-Author: Tom Cato Amundsen <tca@gnu.org>
+Skeleton-Version: 1
+
+[Notes]
+Matchces GTK2 interface versioning
+
+[Test]
+INTERFACE_VERSIONS=`python - <<EOF
+try:
+    import pygtk
+    pygtk.require("2.0")
+    import gtk
+    print "%i.%i" % (gtk.pygtk_version[0], gtk.pygtk_version[1])
+except:
+    pass
+EOF
+`
+SOFTWARE_VERSIONS="$INTERFACE_VERSIONS"
diff --git a/autopackage/@gtk.org/gtk/skeleton.1 b/autopackage/@gtk.org/gtk/skeleton.1
new file mode 100644
index 000000000..5e0626380
--- /dev/null
+++ b/autopackage/@gtk.org/gtk/skeleton.1
@@ -0,0 +1,25 @@
+# -*- shell-script-mode -*-
+
+[Meta]
+RootName: @gtk.org/gtk
+DisplayName: GTK+ user interface toolkit
+ShortName: gtk+
+Skeleton-Author: Hongli Lai <h.lai@chello.nl>
+Skeleton-Version: 1
+
+[Notes] 
+Interface versions correspond to GTK released versions, as GTK version
+numbering sensibly tracks the interfaces, ie GTK2.2 has an interface
+version of 2.2, not 2.1 as would be the normal rules.
+
+Earliest detected version is GTK 1.2
+
+[Test]
+testForLib libgtk-1.2.so.0 && INTERFACE_VERSIONS=" 1.2"
+gtk2versions=`testForLib -v libgtk-x11-2.0.so.0`
+for v in $gtk2versions; do
+    minor=$( IFS=.; v=( $v ); echo ${v[1]} )
+    minor=$[ $minor / 100 ]
+    INTERFACE_VERSIONS="2.$minor $INTERFACE_VERSIONS"
+done
+SOFTWARE_VERSIONS="$INTERFACE_VERSIONS" # this time......
diff --git a/autopackage/default.apspec b/autopackage/default.apspec
index 3f6f4e64c..e8284ce47 100644
--- a/autopackage/default.apspec
+++ b/autopackage/default.apspec
@@ -11,7 +11,7 @@ URL: http://www.gajim.org/
 License: GNU General Public License, Version 2
 SoftwareVersion: 0.6.1
 AutopackageTarget: 1.0
-PackageVersion: 1
+PackageVersion: 2
 
 # 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,
@@ -52,7 +52,7 @@ EOF
 
 require @python.org/python 2.3
 require @gtk.org/gtk 2.4
-require @pygtk.org/pygtk 2.4
+require @gnome.org/pygtk 2.4
 require @glade.gnome.org/libglade 2
 
 
@@ -64,8 +64,8 @@ copyFiles  share/gajim "$PREFIX/share/"
 installIcon share/gajim/gajim.xpm
 installDesktop "Network/Instant Messaging" gajim.desktop
 installMan 1 gajim.1
+safeSed bin/gajim "s!PREFIX!$PREFIX!g"
 installExe bin/*
-safeSed "$PREFIX/bin/gajim" "s!PREFIX!$PREFIX!g"
 chmod +x "$PREFIX/bin/gajim"
 
 [Uninstall]