[Debian-islamic-commits] [libitl-gobject] 06/09: Imported Upstream version 0.3
أحمد المحمودي (Ahmed El-Mahmoudy)
aelmahmoudy at users.sourceforge.net
Sat Oct 28 02:30:49 UTC 2017
This is an automated email from the git hooks/post-receive script.
aelmahmoudy-guest pushed a commit to branch master
in repository libitl-gobject.
commit d5fcc14c915ff76f511e2a97d952beec36d8e9d2
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date: Sat Oct 28 04:07:12 2017 +0200
Imported Upstream version 0.3
---
AUTHORS | 2 +-
ChangeLog | 37 ++++++++++++++++++
INSTALL | 19 ++++++----
Makefile.am | 44 ++--------------------
NEWS | 5 +++
configure.ac | 14 +++----
Makefile.am => src/Makefile.am | 3 --
.../itl-gobject-enums.c.in | 0
.../itl-gobject-enums.h.in | 0
itl-gobject.c => src/itl-gobject.c | 30 ++++++++++++++-
itl-gobject.h => src/itl-gobject.h | 10 +++--
11 files changed, 101 insertions(+), 63 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index d64b8e0..4ecdb80 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,2 @@
-أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
+أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
diff --git a/ChangeLog b/ChangeLog
index 10f8969..6ba4504 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2017-10-28 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
+
+ * configure.ac: Release 0.3
+
+2017-10-28 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
+
+ * Makefile.am: Removed code to create ChangeLog
+
+2017-10-27 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
+
+ * NEWS: Update NEWS file
+
+2017-10-27 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
+
+ * configure.ac: Update lib. version
+
+2017-10-27 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
+
+ * Makefile.am, configure.ac, itl-gobject-enums.c.in,
+ itl-gobject-enums.h.in, itl-gobject.c, itl-gobject.h,
+ src/Makefile.am, src/itl-gobject-enums.c.in,
+ src/itl-gobject-enums.h.in, src/itl-gobject.c, src/itl-gobject.h:
+ Move sources to src/
+
+2017-10-27 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
+
+ * configure.ac: Set bug report address
+
+2017-10-26 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
+
+ * itl-gobject.c, itl-gobject.h: Update to ITL 0.8.0
+
+2017-10-26 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
+
+ * AUTHORS, INSTALL, itl-gobject.c, itl-gobject.h: Update my email &
+ copyright years
+
2014-10-16 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
* ChangeLog: Release 0.2.1 Use git2cl to generate ChangeLog
diff --git a/INSTALL b/INSTALL
index 7d1c323..2099840 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -12,8 +12,8 @@ without warranty of any kind.
Basic Installation
==================
- Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
+ Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package. Some packages provide this
`INSTALL' file but do not implement all of the features documented
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+ HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved. Use GNU `make'
+instead.
+
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
@@ -304,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
+an Autoconf limitation. Until the limitation is lifted, you can use
+this workaround:
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
@@ -362,4 +368,3 @@ operates.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
-
diff --git a/Makefile.am b/Makefile.am
index 65ae2cb..005c8d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,46 +1,8 @@
+## The order of subdirs is important, don't change without a reason.
+SUBDIRS = src
-DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
-
-lib_LTLIBRARIES = libitl_gobject.la
-libitl_gobject_la_CFLAGS = $(GOBJECT_CFLAGS) -I/usr/include/itl -DITL_GOBJECT_COMPILATION
-libitl_gobject_la_LDFLAGS = -version-info $(LTVERSION)
-libitl_gobject_la_LIBADD= $(GOBJECT_LIBS) -litl
-libitl_gobject_la_SOURCES = itl-gobject.c itl-gobject-enums.c
-libitl_gobject_la_HEADERS = itl-gobject.h itl-gobject-enums.h
-libitl_gobject_ladir = $(includedir)/itl
-
-BUILT_SOURCES=itl-gobject-enums.c itl-gobject-enums.h
+EXTRA_DIST = autogen.sh
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = @PACKAGE at .pc
-CLEANFILES=itl-gobject-enums.c itl-gobject-enums.h
-
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS = Itl-1.0.gir
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-
-if HAVE_INTROSPECTION
-introspection_sources = $(libitl_gobject_la_SOURCES) $(libitl_gobject_la_HEADERS)
-
-Itl-1.0.gir: libitl_gobject.la
-Itl_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0
-Itl_1_0_gir_CFLAGS = $(INCLUDES) -I/usr/include/itl -DITL_GOBJECT_COMPILATION
-Itl_1_0_gir_LIBS = libitl_gobject.la
-Itl_1_0_gir_FILES = $(introspection_sources)
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(gir_DATA) $(typelib_DATA)
-endif
-
-itl-gobject-enums.c: itl-gobject.h itl-gobject-enums.c.in
- glib-mkenums --template $@.in itl-gobject.h > $@
-
-itl-gobject-enums.h: itl-gobject.h itl-gobject-enums.h.in
- glib-mkenums --template $@.in itl-gobject.h > $@
diff --git a/NEWS b/NEWS
index 35cc0ca..f322829 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+0.3
+===
+ * Update for ITL 0.8.0
+ * Enhance directory structure
+
0.2.1
=====
* Fix FTBFS when using clang instead of gcc.
diff --git a/configure.ac b/configure.ac
index 3bd3ddb..2bba141 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,13 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-define([CURRENT], [0])
-define([REV], [1])
-define([AGE], [0])
+define([CURRENT], [1])
+define([REV], [2])
+define([AGE], [1])
AC_PREREQ([2.68])
-AC_INIT([libitl-gobject], 0.2, [BUG-REPORT-ADDRESS])
-AM_INIT_AUTOMAKE
-AC_CONFIG_SRCDIR([itl-gobject.c])
+AC_INIT([libitl-gobject], 0.3, [https://github.com/aelmahmoudy/libitl-gobject/issues])
+AM_INIT_AUTOMAKE([subdir-objects])
+AC_CONFIG_SRCDIR([src])
#AC_CONFIG_HEADERS([config.h])
LTVERSION=CURRENT:REV:AGE
AC_SUBST(LTVERSION)
@@ -31,5 +31,5 @@ GOBJECT_INTROSPECTION_CHECK([0.6.7])
# Checks for library functions.
-AC_CONFIG_FILES([Makefile libitl-gobject.pc])
+AC_CONFIG_FILES([Makefile src/Makefile libitl-gobject.pc])
AC_OUTPUT
diff --git a/Makefile.am b/src/Makefile.am
similarity index 95%
copy from Makefile.am
copy to src/Makefile.am
index 65ae2cb..e2ab6a5 100644
--- a/Makefile.am
+++ b/src/Makefile.am
@@ -11,9 +11,6 @@ libitl_gobject_ladir = $(includedir)/itl
BUILT_SOURCES=itl-gobject-enums.c itl-gobject-enums.h
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = @PACKAGE at .pc
-
CLEANFILES=itl-gobject-enums.c itl-gobject-enums.h
-include $(INTROSPECTION_MAKEFILE)
diff --git a/itl-gobject-enums.c.in b/src/itl-gobject-enums.c.in
similarity index 100%
rename from itl-gobject-enums.c.in
rename to src/itl-gobject-enums.c.in
diff --git a/itl-gobject-enums.h.in b/src/itl-gobject-enums.h.in
similarity index 100%
rename from itl-gobject-enums.h.in
rename to src/itl-gobject-enums.h.in
diff --git a/itl-gobject.c b/src/itl-gobject.c
similarity index 94%
rename from itl-gobject.c
rename to src/itl-gobject.c
index c34a95b..dd1b709 100644
--- a/itl-gobject.c
+++ b/src/itl-gobject.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
+/* Copyright (C) 2011,2017 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
@@ -165,6 +165,7 @@ enum
PROP_PRESSURE,
PROP_TEMPERATURE,
/* Method properties */
+ PROP_METHOD,
PROP_FAJR_ANG,
PROP_ISHAA_ANG,
PROP_IMSAAK_ANG,
@@ -175,6 +176,7 @@ enum
PROP_MATHHAB,
PROP_NEAREST_LAT,
PROP_EXTREME,
+ PROP_EXTREME_LAT,
PROP_OFFSET,
PROP_FAJR_OFFSET,
PROP_SHUROOQ_OFFSET,
@@ -232,6 +234,9 @@ itl_prayer_set_property (GObject *object,
prayer->priv->loc.temperature = (double) g_value_get_double (value);
break;
/* Method properties */
+ case PROP_METHOD:
+ prayer->priv->method.method = (int) g_value_get_enum (value);
+ break;
case PROP_FAJR_ANG:
prayer->priv->method.fajrAng = (double) g_value_get_double (value);
break;
@@ -262,6 +267,9 @@ itl_prayer_set_property (GObject *object,
case PROP_EXTREME:
prayer->priv->method.extreme = (int) g_value_get_enum (value);
break;
+ case PROP_EXTREME_LAT:
+ prayer->priv->method.extremeLat = (double) g_value_get_double (value);
+ break;
case PROP_OFFSET:
prayer->priv->method.offset = (int) g_value_get_boolean (value);
break;
@@ -322,6 +330,9 @@ itl_prayer_get_property (GObject *object,
g_value_set_double (value, (gdouble) prayer->priv->loc.temperature);
break;
/* Method properties */
+ case PROP_METHOD:
+ g_value_set_enum (value, (gint) prayer->priv->method.method);
+ break;
case PROP_FAJR_ANG:
g_value_set_double (value, (gdouble) prayer->priv->method.fajrAng);
break;
@@ -352,6 +363,9 @@ itl_prayer_get_property (GObject *object,
case PROP_EXTREME:
g_value_set_enum (value, (gint) prayer->priv->method.extreme);
break;
+ case PROP_EXTREME_LAT:
+ g_value_set_double (value, (gdouble) prayer->priv->method.extremeLat);
+ break;
case PROP_OFFSET:
g_value_set_boolean (value, (gboolean) prayer->priv->method.offset);
break;
@@ -460,6 +474,13 @@ itl_prayer_class_init (ItlPrayerClass *klass)
G_PARAM_WRITABLE));
/* Method properties */
+ g_object_class_install_property (gobject_class, PROP_METHOD,
+ g_param_spec_enum ("method",
+ "Method",
+ "Calculation method",
+ ITL_TYPE_METHOD,
+ NONE,
+ G_PARAM_READABLE));
g_object_class_install_property (gobject_class, PROP_FAJR_ANG,
g_param_spec_double ("fajr-ang",
"Fajr angle",
@@ -531,6 +552,13 @@ itl_prayer_class_init (ItlPrayerClass *klass)
GOOD_INVALID,
G_PARAM_READABLE |
G_PARAM_WRITABLE));
+ g_object_class_install_property (gobject_class, PROP_EXTREME_LAT,
+ g_param_spec_double ("extreme-lat",
+ "Extreme latitude",
+ "Latitude at which the extreme method should always be used",
+ -90.0, 90.0, 55.0,
+ G_PARAM_READABLE |
+ G_PARAM_WRITABLE));
g_object_class_install_property (gobject_class, PROP_OFFSET,
g_param_spec_boolean ("offset",
"Enable Offsets",
diff --git a/itl-gobject.h b/src/itl-gobject.h
similarity index 93%
rename from itl-gobject.h
rename to src/itl-gobject.h
index f2842d5..d44acd7 100644
--- a/itl-gobject.h
+++ b/src/itl-gobject.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
+/* Copyright (C) 2011,2017 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
@@ -55,7 +55,10 @@ typedef enum
MUSLIM_LEAGUE,
UMM_ALQURRA,
FIXED_ISHAA,
- EGYPT_NEW
+ EGYPT_NEW,
+ UMM_ALQURRA_RAMADAN,
+ MOONSIGHTING_COMMITTEE,
+ MOROCCO_AWQAF
} ItlMethod;
typedef enum
@@ -74,7 +77,8 @@ typedef enum
HALF_INVALID,
MIN_ALWAYS,
MIN_INVALID,
- GOOD_INVALID_SAME
+ GOOD_INVALID_SAME,
+ ANGLE_BASED
} ItlExtremeMethod;
#define ITL_TYPE_PRAYER itl_prayer_get_type()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/libitl-gobject.git
More information about the Debian-islamic-commits
mailing list