* Path fixes

* Debian packaging fixes

git-svn-id: http://lassie.dyndns-server.com/svn/gargoyle-gtk@239 ddfedd41-794f-dd11-ae45-00112f111e67

diff --git a/COPYING b/COPYING
index 42b31761245dc97735db31a2eb9a3fb639cab58c..eb40986d6c1f08057d8ce1b83c5b56e5d9786634 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 2008, Philip Chimento and Marijn van Vliet.
+Copyright (C) 2010, Philip Chimento and Marijn van Vliet.

 All rights reserved.
 
 Chimara is free software copyrighted by Philip Chimento and Marijn van Vliet.
 All rights reserved.
 
 Chimara is free software copyrighted by Philip Chimento and Marijn van Vliet.

diff --git a/configure.ac b/configure.ac
index 18e630a32b9f5662bbed6a78493f6a01405047dc..81677ccaf92e1936506ca3e593179a373bbdea2f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 # Initialize Autoconf 
 # Args: (human-readable package name, package version, bug report address, 
 # tarballname)
 # Initialize Autoconf 
 # Args: (human-readable package name, package version, bug report address, 
 # tarballname)

-AC_INIT([chimara], [0.1])
+AC_INIT([chimara], [0.9])

 # Sanity check to make sure we are running Autoconf from the right directory
 AC_CONFIG_SRCDIR(libchimara/chimara-glk.c)
 # Put m4 macros in their own directory
 # Sanity check to make sure we are running Autoconf from the right directory
 AC_CONFIG_SRCDIR(libchimara/chimara-glk.c)
 # Put m4 macros in their own directory


@@ -25,6 +25,8 @@ LT_VERSION_INFO="$CHIMARA_CURRENT:$CHIMARA_REVISION:$CHIMARA_AGE"
 AC_SUBST(LT_VERSION_INFO)
 
 ### REQUIREMENTS ##############################################################
 AC_SUBST(LT_VERSION_INFO)
 
 ### REQUIREMENTS ##############################################################

+# Recommended GTK version: at least 2.12
+# Recommended Glib version: at least 2.16

 GTK_REQUIRED_VERSION=2.6
 GLIB_REQUIRED_VERSION=2.6
 GTK_DOC_REQUIRED_VERSION=1.9
 GTK_REQUIRED_VERSION=2.6
 GLIB_REQUIRED_VERSION=2.6
 GTK_DOC_REQUIRED_VERSION=1.9

diff --git a/debian/changelog b/debian/changelog
index f4c67af6b2bbce384377f7faf70e2d8f7a9ee3e3..07521dc7b9b6102b985f5f2b153a990f1591b605 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
-chimara (0.1-1) unstable; urgency=low
+chimara (0.9-1) unstable; urgency=low

 
 

-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
-  * TODO FIXME when actually doing release
+  * Initial release (Closes: #36) 

 
 

- -- Philip Chimento <philip.chimento@gmail.com>  Sat, 28 Nov 2009 00:57:21 +0100
+ -- Philip Chimento <philip.chimento@gmail.com>  Sun, 18 Apr 2009 17:03:21 +0100

 
 

diff --git a/debian/control b/debian/control
index 8070f2472a62036b52b205d64fc6061b21215277..ee893236bac0bde46e7cfe9ba5b942d05ed7558a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: cdbs,
                libglib2.0-dev, 
                libgtk2.0-dev
 Standards-Version: 3.7.3
                libglib2.0-dev, 
                libgtk2.0-dev
 Standards-Version: 3.7.3

-Homepage: <insert the upstream URL, if relevant>
+Homepage: http://lassie.student.utwente.nl/chimara

 
 Package: libchimara0
 Section: libs
 
 Package: libchimara0
 Section: libs


@@ -46,7 +46,7 @@ Description: Documentation for the Chimara Glk library
  .
  This package contains the Chimara reference manual.
 
  .
  This package contains the Chimara reference manual.
 

-Package: libchimara-player
+Package: chimara-player

 Section: games
 Architecture: any
 Depends: ${misc:Depends}
 Section: games
 Architecture: any
 Depends: ${misc:Depends}

diff --git a/debian/copyright b/debian/copyright
index 31b5d854bd5713af70bca02adcd145a2b72e640f..5ee1b1f8f40b374a139033ae9d436cd2122b5ff6 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Philip Chimento <philip.chimento@gmail.com> on
 Sat, 28 Nov 2009 00:57:21 +0100.
 
 This package was debianized by Philip Chimento <philip.chimento@gmail.com> on
 Sat, 28 Nov 2009 00:57:21 +0100.
 

-It was downloaded from <url://example.com>
+It was downloaded from <http://lassie.student.utwente.nl/chimara>

 
 Upstream Author(s):
 
 
 Upstream Author(s):
 


@@ -10,14 +10,41 @@ Upstream Author(s):
 
 Copyright:
 
 
 Copyright:
 

-    Copyright (C) 2009 <<whatever>>
+    Copyright (C) 2010 Marijn van Vliet and Philip Chimento

 
 License:
 
 
 License:
 

-    Yada yada TODO FIXME when actually doing release
-
-The Debian packaging is (C) 2009, Philip Chimento <philip.chimento@gmail.com> and
-is licensed under the same license as the main program.
+    Copyright (C) 2010, Philip Chimento and Marijn van Vliet.
+       All rights reserved.
+
+       Chimara is free software copyrighted by Philip Chimento and Marijn van Vliet.
+
+       Redistribution and use in source and binary forms, with or without modification,
+       are permitted provided that the following conditions are met:
+
+       1. Redistributions of source code must retain the above copyright notice, this
+          list of conditions and the following disclaimer.
+       2. Redistributions in binary form must reproduce the above copyright notice,
+          this list of conditions and the following disclaimer in the documentation 
+          and/or other materials provided with the distribution.
+       3. Neither of the names Philip Chimento or Marijn van Vliet, nor the name of any 
+          other contributor may be used to endorse or promote products derived from 
+          this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' 
+       AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+       IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+       DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+       ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+       (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+       LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
+       ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+       SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The Debian packaging is (C) 2010, Marijn van Vliet <w.m.vanvliet@student.utwente.nl>
+and Philip Chimento <philip.chimento@gmail.com> and is licensed under the same 
+license as the main program.

 
 # Please also look if there are files or directories which have a
 # different copyright/license attached and list them here.
 
 # Please also look if there are files or directories which have a
 # different copyright/license attached and list them here.

diff --git a/libchimara/Makefile.am b/libchimara/Makefile.am
index ff634e4639c4b006e3429372cac0b3011c1858d3..de74326ae8a2abe122002d55f4045a7a35ce863d 100644 (file)
--- a/libchimara/Makefile.am
+++ b/libchimara/Makefile.am
@@ -5,9 +5,9 @@ AM_CFLAGS = -Wall
 lib_LTLIBRARIES = libchimara.la
 
 if TARGET_ILIAD
 lib_LTLIBRARIES = libchimara.la
 
 if TARGET_ILIAD

-       plugindir = "../interpreters"
+pluginpath = "../interpreters"

 else
 else

-       plugindir = $(pkglibdir)
+pluginpath = $(pkglibdir)

 endif
 
 libchimara_la_SOURCES = \
 endif
 
 libchimara_la_SOURCES = \


@@ -32,7 +32,7 @@ libchimara_la_SOURCES = \
        init.c init.h \
        input.c input.h \
        magic.c magic.h \
        init.c init.h \
        input.c input.h \
        magic.c magic.h \

-       mouse.c \
+       mouse.c mouse.h \

        pager.c pager.h \
        resource.c resource.h \
        schannel.c \
        pager.c pager.h \
        resource.c resource.h \
        schannel.c \


@@ -44,7 +44,7 @@ libchimara_la_SOURCES = \
 libchimara_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Chimara\" \
        -DLOCALEDIR=\""$(datadir)/locale"\" \
 libchimara_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Chimara\" \
        -DLOCALEDIR=\""$(datadir)/locale"\" \

-       -DPLUGINDIR=\""$(plugindir)"\" \
+       -DPLUGINDIR=\""$(pluginpath)"\" \

        -DPLUGINSOURCEDIR=\""$(abs_builddir)/../interpreters"\" \
        -I$(top_srcdir)
 libchimara_la_CFLAGS = @CHIMARA_CFLAGS@ $(AM_CFLAGS)
        -DPLUGINSOURCEDIR=\""$(abs_builddir)/../interpreters"\" \
        -I$(top_srcdir)
 libchimara_la_CFLAGS = @CHIMARA_CFLAGS@ $(AM_CFLAGS)

diff --git a/player/main.c b/player/main.c
index c032849cb63446e3bda8bc9878acfc40d0996ea0..8d9bb255d2a94cf38ab53d06e8507e8fc9eb4596 100644 (file)
--- a/player/main.c
+++ b/player/main.c
@@ -71,9 +71,17 @@ create_window(void)
        GError *error = NULL;
 
        builder = gtk_builder_new();
        GError *error = NULL;
 
        builder = gtk_builder_new();

-       if( !gtk_builder_add_from_file(builder, PACKAGE_SRC_DIR "/chimara.ui", &error) ) {
-               error_dialog(NULL, error, "Error while building interface: ");  
-               return;
+       if( !gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "/chimara.ui", &error) ) {
+#ifdef DEBUG
+               g_error_free(error);
+               error = NULL;
+               if( !gtk_builder_add_from_file(builder, PACKAGE_SRC_DIR "/chimara.ui", &error) ) {
+#endif /* DEBUG */
+                       error_dialog(NULL, error, "Error while building interface: ");  
+                       return;
+#ifdef DEBUG
+               }
+#endif /* DEBUG */

        }
 
        window = GTK_WIDGET(load_object("chimara"));
        }
 
        window = GTK_WIDGET(load_object("chimara"));


@@ -119,9 +127,17 @@ create_window(void)
        gtk_recent_chooser_add_filter(recent, filter);
 
        uimanager = gtk_ui_manager_new();
        gtk_recent_chooser_add_filter(recent, filter);
 
        uimanager = gtk_ui_manager_new();

-       if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/chimara.menus", &error) ) {
-               error_dialog(NULL, error, "Error while building interface: ");
-               return;
+       if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_DATA_DIR "/chimara.menus", &error) ) {
+#ifdef DEBUG
+               g_error_free(error);
+               error = NULL;
+               if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/chimara.menus", &error) ) {
+#endif /* DEBUG */
+                       error_dialog(NULL, error, "Error while building interface: ");
+                       return;
+#ifdef DEBUG
+               }
+#endif /* DEBUG */

        }
        
        glk = chimara_if_new();
        }
        
        glk = chimara_if_new();