[Debian-islamic-commits] [itools] 01/02: Added autoconf.diff patch to add autoconf tiles

أحمد المحمودي (Ahmed El-Mahmoudy) aelmahmoudy at users.sourceforge.net
Tue Oct 31 03:28:55 UTC 2017


This is an automated email from the git hooks/post-receive script.

aelmahmoudy-guest pushed a commit to branch master
in repository itools.

commit e69849bddad8636c178cb9807b49621b71a21952
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Tue Oct 31 04:06:42 2017 +0100

    Added autoconf.diff patch to add autoconf tiles
    
    * Removed fix_link_libs_placement.diff and use_CPPFLAGS.diff patches, no longer needed
    * debian/rules: removed overrides
    
    Closes: #880313
---
 debian/patches/autoconf.diff                | 63 +++++++++++++++++++++++++++++
 debian/patches/fix_link_libs_placement.diff | 30 --------------
 debian/patches/series                       |  3 +-
 debian/patches/use_CPPFLAGS.diff            | 43 --------------------
 debian/rules                                |  6 ---
 5 files changed, 64 insertions(+), 81 deletions(-)

diff --git a/debian/patches/autoconf.diff b/debian/patches/autoconf.diff
new file mode 100644
index 0000000..e3880e7
--- /dev/null
+++ b/debian/patches/autoconf.diff
@@ -0,0 +1,63 @@
+Description: add autoconf files
+Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
+
+Index: itools/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ itools/Makefile.am	2017-10-31 03:37:40.861896846 +0100
+@@ -0,0 +1,11 @@
++bin_PROGRAMS	= ical idate ipraytime
++ical_LDADD= -litl -lm
++ical_SOURCES = ical.c
++idate_LDADD= -litl -lm
++idate_SOURCES = idate.c
++ipraytime_LDADD= -litl -lm
++ipraytime_SOURCES = ipraytime.c
++
++bin_SCRIPTS=ireminder
++
++man_MANS=doc/ical.1 doc/idate.1 doc/ipraytime.1 doc/ireminder.1
+Index: itools/configure.ac
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ itools/configure.ac	2017-10-31 03:38:43.158146266 +0100
+@@ -0,0 +1,33 @@
++#                                               -*- Autoconf -*-
++# Process this file with autoconf to produce a configure script.
++
++AC_PREREQ([2.69])
++AC_INIT([itools], [1.0], [https://github.com/arabeyes-org/ITL-programs/issues/new])
++AM_INIT_AUTOMAKE()
++AC_CONFIG_SRCDIR([ipraytime.c])
++AC_CONFIG_HEADERS([config.h])
++
++# Checks for programs.
++AC_PROG_CC
++#AC_PROG_INSTALL
++AC_PROG_MAKE_SET
++
++# Checks for libraries.
++AC_CHECK_LIB([itl], [getNorthQibla])
++AC_CHECK_LIB([m], [pow])
++
++# Checks for header files.
++AC_CHECK_HEADERS([stdlib.h string.h sys/time.h unistd.h])
++
++# Checks for typedefs, structures, and compiler characteristics.
++AC_CHECK_HEADER_STDBOOL
++AC_TYPE_UID_T
++
++# Checks for library functions.
++AC_FUNC_ERROR_AT_LINE
++AC_FUNC_MALLOC
++AC_FUNC_MKTIME
++AC_CHECK_FUNCS([strcasecmp])
++
++AC_CONFIG_FILES([Makefile])
++AC_OUTPUT
+Index: itools/ChangeLog
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ itools/ChangeLog	2017-10-31 03:39:58.654448536 +0100
+@@ -0,0 +1 @@
++See NEWS
diff --git a/debian/patches/fix_link_libs_placement.diff b/debian/patches/fix_link_libs_placement.diff
deleted file mode 100644
index 8732cdc..0000000
--- a/debian/patches/fix_link_libs_placement.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Fix libs placement for linking ; FTBFS with gcc-4.6
-Author: Daniel T Chen <crimsun at ubuntu.com>
-Origin: Ubuntu
-Bug-Debian: http://bugs.debian.org/641648
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/770840
-Forwarded: yes
-Reviewed-By: Daniel T Chen <crimsun at ubuntu.com>
-Last-Update: 2011-09-14
-
---- itools-1.0.orig/Makefile.in
-+++ itools-1.0/Makefile.in
-@@ -16,15 +16,15 @@ all: $(PROGRAMS)
- 
- ical: ical.c
- 	@echo "==> Building ical..."
--	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) ical.c -o ical
-+	$(CC) $(CFLAGS) $(LDFLAGS) ical.c $(LIBS) -o ical
- 
- idate: idate.c
- 	@echo "==> Building idate..."
--	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) idate.c -o idate
-+	$(CC) $(CFLAGS) $(LDFLAGS) idate.c $(LIBS) -o idate
- 
- ipraytime: ipraytime.c
- 	@echo "==> Building ipraytime..."
--	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) ipraytime.c -o ipraytime
-+	$(CC) $(CFLAGS) $(LDFLAGS) ipraytime.c $(LIBS) -o ipraytime
- 
- static: ical.c idate.c ipraytime.c
- 	$(CC) $(CFLAGS) $(LDFLAGS) ipraytime.c -o ipraytime -static $(LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index d169e87..4abd46c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_manpages.diff
-fix_link_libs_placement.diff
 str_format_security.diff
-use_CPPFLAGS.diff
+autoconf.diff
diff --git a/debian/patches/use_CPPFLAGS.diff b/debian/patches/use_CPPFLAGS.diff
deleted file mode 100644
index 237b2da..0000000
--- a/debian/patches/use_CPPFLAGS.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Use CPPFLAGS during compilation
-  This is needed to get fortify libc functions to be used.
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -16,27 +16,27 @@
- 
- ical: ical.c
- 	@echo "==> Building ical..."
--	$(CC) $(CFLAGS) $(LDFLAGS) ical.c $(LIBS) -o ical
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ical.c $(LIBS) -o ical
- 
- idate: idate.c
- 	@echo "==> Building idate..."
--	$(CC) $(CFLAGS) $(LDFLAGS) idate.c $(LIBS) -o idate
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) idate.c $(LIBS) -o idate
- 
- ipraytime: ipraytime.c
- 	@echo "==> Building ipraytime..."
--	$(CC) $(CFLAGS) $(LDFLAGS) ipraytime.c $(LIBS) -o ipraytime
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ipraytime.c $(LIBS) -o ipraytime
- 
- static: ical.c idate.c ipraytime.c
--	$(CC) $(CFLAGS) $(LDFLAGS) ipraytime.c -o ipraytime -static $(LIBS)
--	$(CC) $(CFLAGS) $(LDFLAGS) idate.c -o idate -static $(LIBS)
--	$(CC) $(CFLAGS) $(LDFLAGS) ical.c -o ical -static $(LIBS)
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ipraytime.c -o ipraytime -static $(LIBS)
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) idate.c -o idate -static $(LIBS)
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ical.c -o ical -static $(LIBS)
- 
- static-tree: ical.c idate.c ipraytime.c
--	$(CC) $(CFLAGS) -g $(LDFLAGS) ipraytime.c -o ipraytime -I../../libs/build/ \
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -g $(LDFLAGS) ipraytime.c -o ipraytime -I../../libs/build/ \
- 	-L../../libs/build/ ../../libs/build/libitl.a -lm
--	$(CC) $(CFLAGS) -g $(LDFLAGS) idate.c -o idate -I../../libs/build/ \
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -g $(LDFLAGS) idate.c -o idate -I../../libs/build/ \
- 	-L../../libs/build/ ../../libs/build/libitl.a -lm
--	$(CC) $(CFLAGS) -g $(LDFLAGS) ical.c -o ical -I../../libs/build/ \
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -g $(LDFLAGS) ical.c -o ical -I../../libs/build/ \
- 	-L../../libs/build/ ../../libs/build/libitl.a -lm
- 
- install: all
diff --git a/debian/rules b/debian/rules
index b3dbcfd..b8796e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,3 @@
 
 %:
 	dh $@
-
-override_dh_auto_configure:
-	./configure prefix=$(CURDIR)/debian/itools/usr
-
-override_dh_auto_install:
-	$(MAKE) debinstall

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/itools.git



More information about the Debian-islamic-commits mailing list