[Debian-islamic-commits] [libitl] 07/18: Remove patches, no longer needed

[أحمد المحمودي (Ahmed El-Mahmoudy)]

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

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

commit 8f1ca58425a0111e6234ba8e073f49299bae88af
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Tue Oct 24 12:27:14 2017 +0200

    Remove patches, no longer needed
---
 debian/patches/01_Makefile.in.diff | 14 ---------
 debian/patches/add_destdir.diff    | 58 --------------------------------------
 debian/patches/series              |  3 --
 debian/patches/set_libdir.diff     | 35 -----------------------
 4 files changed, 110 deletions(-)

diff --git a/debian/patches/01_Makefile.in.diff b/debian/patches/01_Makefile.in.diff
deleted file mode 100644
index a2f77a8..0000000
--- a/debian/patches/01_Makefile.in.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: LDFLAGS contains -Wl, which causes $(LD) to fail, hence use $(CC) 
- instead. Also add -Wl before -soname linker option.
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
---- libitl-0.7.0.orig/Makefile.in
-+++ libitl-0.7.0/Makefile.in
-@@ -35,7 +35,7 @@
- 	@false
- 
- build/libitl.so: components
--	$(LD) build/*.o $(LDFLAGS) -shared -lm -lc -soname=$(SONAME) -o build/$(FULLNAME)
-+	$(CC) build/*.o $(LDFLAGS) -shared -lm -lc -Wl,-soname=$(SONAME) -o build/$(FULLNAME)
- 	(cd build/ && ln -sf $(FULLNAME) $(SONAME))
- 	(cd build/ && ln -sf $(FULLNAME) libitl.so)
- 
diff --git a/debian/patches/add_destdir.diff b/debian/patches/add_destdir.diff
deleted file mode 100644
index fd6f994..0000000
--- a/debian/patches/add_destdir.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Prepend $(DESTDIR) to install paths
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -66,15 +66,15 @@
-         #strip --strip-unneeded build/$(FULLNAME)
- 	rm -f build/*.o build/ITL_*
- 	@echo "==> Installing libitl library..."
--	test -d $(PREFIX)/lib \
--	|| mkdir -p $(PREFIX)/lib \
-+	test -d $(DESTDIR)$(PREFIX)/lib \
-+	|| mkdir -p $(DESTDIR)$(PREFIX)/lib \
- 	|| exit 1;
--	cp build/$(FULLNAME) $(PREFIX)/lib
--	cp build/libitl.a $(PREFIX)/lib
-+	cp build/$(FULLNAME) $(DESTDIR)$(PREFIX)/lib
-+	cp build/libitl.a $(DESTDIR)$(PREFIX)/lib
-         # Using cp -P as cp --no-dereference is not POSIX
-         # or use --preserve=link instead.
--	cp -P build/$(SONAME) $(PREFIX)/lib
--	cp -P build/libitl.so $(PREFIX)/lib
-+	cp -P build/$(SONAME) $(DESTDIR)$(PREFIX)/lib
-+	cp -P build/libitl.so $(DESTDIR)$(PREFIX)/lib
- 	@echo "==> Installing ITL components..."
- 	for i in $(COMPONENTS); do \
- 	  $(MAKE) -C $$i install || exit 1; \
---- a/hijri/Makefile
-+++ b/hijri/Makefile
-@@ -10,10 +10,10 @@
- 
- install: all
- 	@echo "==> Installing hijri component..."
--	test -d $(PREFIX)/include/itl \
--	|| install -d $(PREFIX)/include/itl \
-+	test -d $(DESTDIR)$(PREFIX)/include/itl \
-+	|| install -d $(DESTDIR)$(PREFIX)/include/itl \
- 	|| exit 1;
--	install src/hijri.h $(PREFIX)/include/itl
-+	install src/hijri.h $(DESTDIR)$(PREFIX)/include/itl
- 
- uninstall:
- 	@echo "==> Uninstalling hijri component..."
---- a/prayertime/Makefile
-+++ b/prayertime/Makefile
-@@ -10,10 +10,10 @@
- 
- install: all
- 	@echo "==> Installing prayertime component..."
--	test -d $(PREFIX)/include/itl \
--	|| install $(PREFIX)/include/itl \
-+	test -d $(DESTDIR)$(PREFIX)/include/itl \
-+	|| install $(DESTDIR)$(PREFIX)/include/itl \
- 	|| exit 1;
--	install src/prayer.h $(PREFIX)/include/itl
-+	install src/prayer.h $(DESTDIR)$(PREFIX)/include/itl
- 
- uninstall:
- 	@echo "==> Uninstalling prayertime component..."
diff --git a/debian/patches/series b/debian/patches/series
index 3b2d108..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +0,0 @@
-add_destdir.diff
-set_libdir.diff
-01_Makefile.in.diff
diff --git a/debian/patches/set_libdir.diff b/debian/patches/set_libdir.diff
deleted file mode 100644
index dc7e3b7..0000000
--- a/debian/patches/set_libdir.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Get LIBDIR setting from configure script, and install libraries 
- there.
-Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -66,15 +66,15 @@
-         #strip --strip-unneeded build/$(FULLNAME)
- 	rm -f build/*.o build/ITL_*
- 	@echo "==> Installing libitl library..."
--	test -d $(DESTDIR)$(PREFIX)/lib \
--	|| mkdir -p $(DESTDIR)$(PREFIX)/lib \
-+	test -d $(DESTDIR)$(LIBDIR) \
-+	|| mkdir -p $(DESTDIR)$(LIBDIR) \
- 	|| exit 1;
--	cp build/$(FULLNAME) $(DESTDIR)$(PREFIX)/lib
--	cp build/libitl.a $(DESTDIR)$(PREFIX)/lib
-+	cp build/$(FULLNAME) $(DESTDIR)$(LIBDIR)
-+	cp build/libitl.a $(DESTDIR)$(LIBDIR)
-         # Using cp -P as cp --no-dereference is not POSIX
-         # or use --preserve=link instead.
--	cp -P build/$(SONAME) $(DESTDIR)$(PREFIX)/lib
--	cp -P build/libitl.so $(DESTDIR)$(PREFIX)/lib
-+	cp -P build/$(SONAME) $(DESTDIR)$(LIBDIR)
-+	cp -P build/libitl.so $(DESTDIR)$(LIBDIR)
- 	@echo "==> Installing ITL components..."
- 	for i in $(COMPONENTS); do \
- 	  $(MAKE) -C $$i install || exit 1; \
---- a/build/config.mk.in
-+++ b/build/config.mk.in
-@@ -13,3 +13,5 @@
- PREFIX=@prefix@
- VERSION=@PACKAGE_VERSION@
- TARNAME=@PACKAGE_TARNAME@
-+prefix=@prefix@
-+LIBDIR=@libdir@

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