Commit 8fda67e36cd08994cc1847e4c166748400d6a29b - ijs

+9

-6

Makefile.am less more

33	33
34	34	pkgincludedir=$(includedir)/ijs
35	35	m4datadir = $(datadir)/aclocal
36		pkgconfigdatadir = $(libdir)/pkgconfig
	36	pkgconfigdatadir = $(prefix)/lib/pkgconfig
37	37
38	38	lib_LTLIBRARIES = libijs.la
39	39

92	92	libtool: $(LIBTOOL_DEPS)
93	93	$(SHELL) ./config.status --recheck
94	94
95		doc: ijs_spec.pdf
	95	doc: ijs_spec.ps ijs_spec.pdf
96	96
97		# We use db2pdf because it can handle embedded .eps
98		ijs_spec.pdf: ijs_spec.sgml
99		$(DB2PDF) ijs_spec.sgml
	97	# We don't use db2pdf because it can't handle embedded .eps
	98	ijs_spec.ps: ijs_spec.sgml
	99	$(DB2PS) ijs_spec.sgml
	100
	101	ijs_spec.pdf: ijs_spec.ps
	102	$(PS2PDF) ijs_spec.ps
100	103
101	104	# Note that ijs_spec.pdf is included in the dist list above,
102	105	# so the 'doc' target needs to be build for 'make dist' to work.

114	117	config.sub \
115	118	ltmain.sh
116	119
117		CLEANFILES = gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux ijs_spec.pdf
	120	CLEANFILES = gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux ijs_spec.ps ijs_spec.pdf
118	121	DISTCLEANFILES = ijs-config config.cache config.log config.status
119	122	# ijs-config.in ijs.pc ijs.pc.in ijs.m4 ijs.h
120	123	MAINTAINERCLEANFILES = INSTALL aclocal.m4 config.h.in configure Makefile.in stamp-h.in $(CLEANSCRIPTS)

+1

-1

Makefile.in less more

116	116
117	117	MAINT_CHARSET = latin1
118	118	m4datadir = $(datadir)/aclocal
119		pkgconfigdatadir = $(libdir)/pkgconfig
	119	pkgconfigdatadir = $(prefix)/lib/pkgconfig
120	120
121	121	lib_LTLIBRARIES = libijs.la
122	122

+9

-3

configure.ac less more

123	123	AC_ISC_POSIX
124	124	AC_PROG_INSTALL
125	125
126		AC_PATH_PROG(DB2PDF, db2pdf)
127		if test x${DB2PDF} = x ; then
	126	AC_PATH_PROG(DB2PS, db2ps)
	127	if test x${DB2PS} = x ; then
	128	AC_MSG_WARN([PostScript documentation cannot be generated!])
	129	fi
	130	AC_SUBST(DB2PS)
	131	AC_PATH_PROG(PS2PDF, ps2pdf)
	132	if test x${PS2PDF} = x ; then
128	133	AC_MSG_WARN([PDF documentation cannot be generated!])
129	134	fi
130		AC_SUBST(DB2PS)
	135	AC_SUBST(PS2PDF)
	136
131	137
132	138	dnl conditional building
133	139

+0

-8

~~debian/.git-dpm~~ less more

0		# see git-dpm(1) from git-dpm package
1		1304e0ee64218e441242701923125fd28c93de85
2		1304e0ee64218e441242701923125fd28c93de85
3		445a7bcf9bee8d4e38546f0bb0cd85151c38ea38
4		445a7bcf9bee8d4e38546f0bb0cd85151c38ea38
5		ijs_0.35.orig.tar.gz
6		201df12d476dfc2da0ae1fe7710eede9d305be04
7		344262

+0

-53

~~debian/patches/0001-Let-the-pkgconfig-file-be-installed-in-and-work-from.patch~~ less more

0		From 6a46dbe5b05c050bbc361f6869428c0aab1a1804 Mon Sep 17 00:00:00 2001
1		From: YunQiang Su <wzssyqa@gmail.com>
2		Date: Sat, 10 Feb 2018 16:11:49 +0100
3		Subject: Let the pkgconfig file be installed in and work from the multiarch
4		directory
5
6		Last-Update: 2013-08-18
7		---
8		Makefile.am \| 2 +-
9		Makefile.in \| 2 +-
10		ijs-config.in \| 3 +--
11		3 files changed, 3 insertions(+), 4 deletions(-)
12
13		diff --git a/Makefile.am b/Makefile.am
14		index a6284d6..62af128 100644
15		--- a/Makefile.am
16		+++ b/Makefile.am
17		@@ -34,7 +34,7 @@ MAINT_CHARSET = latin1
18
19		pkgincludedir=$(includedir)/ijs
20		m4datadir = $(datadir)/aclocal
21		-pkgconfigdatadir = $(prefix)/lib/pkgconfig
22		+pkgconfigdatadir = $(libdir)/pkgconfig
23
24		lib_LTLIBRARIES = libijs.la
25
26		diff --git a/Makefile.in b/Makefile.in
27		index a7bc529..6351950 100644
28		--- a/Makefile.in
29		+++ b/Makefile.in
30		@@ -117,7 +117,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign dist-bzip2 no-dependencies
31
32		MAINT_CHARSET = latin1
33		m4datadir = $(datadir)/aclocal
34		-pkgconfigdatadir = $(prefix)/lib/pkgconfig
35		+pkgconfigdatadir = $(libdir)/pkgconfig
36
37		lib_LTLIBRARIES = libijs.la
38
39		diff --git a/ijs-config.in b/ijs-config.in
40		index 3a17ac6..bc3fee2 100644
41		--- a/ijs-config.in
42		+++ b/ijs-config.in
43		@@ -43,8 +43,7 @@ while test $# -gt 0; do
44		echo $includes
45		;;
46		--libs)
47		- libdirs=-L@libdir@
48		- echo $libdirs -lijs
49		+ echo -lijs
50		;;
51		*)
52		echo "${usage}" 1>&2

+0

-70

~~debian/patches/0002-Use-db2pdf-directly-instead-of-chaining-db2ps-and-ps.patch~~ less more

0		From 1304e0ee64218e441242701923125fd28c93de85 Mon Sep 17 00:00:00 2001
1		From: Didier Raboud <odyx@debian.org>
2		Date: Sat, 10 Feb 2018 16:11:50 +0100
3		Subject: Use db2pdf directly instead of chaining db2ps and ps2pdf: the
4
5		chain adds an architecture-specific diff
6		Bug-Debian: https://bugs.debian.org/744821
7		Last-Update: 2014-04-15
8		---
9		Makefile.am \| 13 +++++--------
10		configure.ac \| 12 +++---------
11		2 files changed, 8 insertions(+), 17 deletions(-)
12
13		diff --git a/Makefile.am b/Makefile.am
14		index 62af128..38f06d1 100644
15		--- a/Makefile.am
16		+++ b/Makefile.am
17		@@ -93,14 +93,11 @@ EXTRA_DIST = \
18		libtool: $(LIBTOOL_DEPS)
19		$(SHELL) ./config.status --recheck
20
21		-doc: ijs_spec.ps ijs_spec.pdf
22		+doc: ijs_spec.pdf
23
24		-# We don't use db2pdf because it can't handle embedded .eps
25		-ijs_spec.ps: ijs_spec.sgml
26		- $(DB2PS) ijs_spec.sgml
27		-
28		-ijs_spec.pdf: ijs_spec.ps
29		- $(PS2PDF) ijs_spec.ps
30		+# We use db2pdf because it can handle embedded .eps
31		+ijs_spec.pdf: ijs_spec.sgml
32		+ $(DB2PDF) ijs_spec.sgml
33
34		# Note that ijs_spec.pdf is included in the dist list above,
35		# so the 'doc' target needs to be build for 'make dist' to work.
36		@@ -118,7 +115,7 @@ CLEANSCRIPTS = \
37		config.sub \
38		ltmain.sh
39
40		-CLEANFILES = gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux ijs_spec.ps ijs_spec.pdf
41		+CLEANFILES = gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux ijs_spec.pdf
42		DISTCLEANFILES = ijs-config config.cache config.log config.status
43		# ijs-config.in ijs.pc ijs.pc.in ijs.m4 ijs.h
44		MAINTAINERCLEANFILES = INSTALL aclocal.m4 config.h.in configure Makefile.in stamp-h.in $(CLEANSCRIPTS)
45		diff --git a/configure.ac b/configure.ac
46		index 5e42c71..a71a152 100644
47		--- a/configure.ac
48		+++ b/configure.ac
49		@@ -124,17 +124,11 @@ AC_SUBST(LIBTOOL_DEPS)
50		AC_ISC_POSIX
51		AC_PROG_INSTALL
52
53		-AC_PATH_PROG(DB2PS, db2ps)
54		-if test x${DB2PS} = x ; then
55		- AC_MSG_WARN([PostScript documentation cannot be generated!])
56		-fi
57		-AC_SUBST(DB2PS)
58		-AC_PATH_PROG(PS2PDF, ps2pdf)
59		-if test x${PS2PDF} = x ; then
60		+AC_PATH_PROG(DB2PDF, db2pdf)
61		+if test x${DB2PDF} = x ; then
62		AC_MSG_WARN([PDF documentation cannot be generated!])
63		fi
64		-AC_SUBST(PS2PDF)
65		-
66		+AC_SUBST(DB2PS)
67
68		dnl conditional building
69

+38

-0

debian/patches/pkgconfig-libdir.diff less more

	0	Description: Let the pkgconfig file be installed in and work from the multiarch directory
	1	Author: YunQiang Su <wzssyqa@gmail.com>
	2	Last-Update: 2013-08-18
	3
	4	--- a/Makefile.am
	5	+++ b/Makefile.am
	6	@@ -34,7 +34,7 @@
	7
	8	pkgincludedir=$(includedir)/ijs
	9	m4datadir = $(datadir)/aclocal
	10	-pkgconfigdatadir = $(prefix)/lib/pkgconfig
	11	+pkgconfigdatadir = $(libdir)/pkgconfig
	12
	13	lib_LTLIBRARIES = libijs.la
	14
	15	--- a/Makefile.in
	16	+++ b/Makefile.in
	17	@@ -117,7 +117,7 @@
	18
	19	MAINT_CHARSET = latin1
	20	m4datadir = $(datadir)/aclocal
	21	-pkgconfigdatadir = $(prefix)/lib/pkgconfig
	22	+pkgconfigdatadir = $(libdir)/pkgconfig
	23
	24	lib_LTLIBRARIES = libijs.la
	25
	26	--- a/ijs-config.in
	27	+++ b/ijs-config.in
	28	@@ -43,8 +43,7 @@
	29	echo $includes
	30	;;
	31	--libs)
	32	- libdirs=-L@libdir@
	33	- echo $libdirs -lijs
	34	+ echo -lijs
	35	;;
	36	*)
	37	echo "${usage}" 1>&2

+2

-2

debian/patches/series less more

0		0001-Let-the-pkgconfig-file-be-installed-in-and-work-from.patch
1		0002-Use-db2pdf-directly-instead-of-chaining-db2ps-and-ps.patch
	0	pkgconfig-libdir.diff
	1	use_db2pdf.patch

+58

-0

debian/patches/use_db2pdf.patch less more

	0	Description: Use db2pdf directly instead of chaining db2ps and ps2pdf: the
	1	chain adds an architecture-specific diff
	2	Author: Didier Raboud <odyx@debian.org>
	3	Bug-Debian: https://bugs.debian.org/744821
	4	Last-Update: 2014-04-15
	5	--- a/configure.ac
	6	+++ b/configure.ac
	7	@@ -124,17 +124,11 @@
	8	AC_ISC_POSIX
	9	AC_PROG_INSTALL
	10
	11	-AC_PATH_PROG(DB2PS, db2ps)
	12	-if test x${DB2PS} = x ; then
	13	- AC_MSG_WARN([PostScript documentation cannot be generated!])
	14	-fi
	15	-AC_SUBST(DB2PS)
	16	-AC_PATH_PROG(PS2PDF, ps2pdf)
	17	-if test x${PS2PDF} = x ; then
	18	+AC_PATH_PROG(DB2PDF, db2pdf)
	19	+if test x${DB2PDF} = x ; then
	20	AC_MSG_WARN([PDF documentation cannot be generated!])
	21	fi
	22	-AC_SUBST(PS2PDF)
	23	-
	24	+AC_SUBST(DB2PS)
	25
	26	dnl conditional building
	27
	28	--- a/Makefile.am
	29	+++ b/Makefile.am
	30	@@ -93,14 +93,11 @@
	31	libtool: $(LIBTOOL_DEPS)
	32	$(SHELL) ./config.status --recheck
	33
	34	-doc: ijs_spec.ps ijs_spec.pdf
	35	+doc: ijs_spec.pdf
	36
	37	-# We don't use db2pdf because it can't handle embedded .eps
	38	-ijs_spec.ps: ijs_spec.sgml
	39	- $(DB2PS) ijs_spec.sgml
	40	-
	41	-ijs_spec.pdf: ijs_spec.ps
	42	- $(PS2PDF) ijs_spec.ps
	43	+# We use db2pdf because it can handle embedded .eps
	44	+ijs_spec.pdf: ijs_spec.sgml
	45	+ $(DB2PDF) ijs_spec.sgml
	46
	47	# Note that ijs_spec.pdf is included in the dist list above,
	48	# so the 'doc' target needs to be build for 'make dist' to work.
	49	@@ -118,7 +115,7 @@
	50	config.sub \
	51	ltmain.sh
	52
	53	-CLEANFILES = gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux ijs_spec.ps ijs_spec.pdf
	54	+CLEANFILES = gmon.out core ijs_spec.log ijs_spec.tex ijs_spec.aux ijs_spec.pdf
	55	DISTCLEANFILES = ijs-config config.cache config.log config.status
	56	# ijs-config.in ijs.pc ijs.pc.in ijs.m4 ijs.h
	57	MAINTAINERCLEANFILES = INSTALL aclocal.m4 config.h.in configure Makefile.in stamp-h.in $(CLEANSCRIPTS)

+2

-1

ijs-config.in less more

42	42	echo $includes
43	43	;;
44	44	--libs)
45		echo -lijs
	45	libdirs=-L@libdir@
	46	echo $libdirs -lijs
46	47	;;
47	48	*)
48	49	echo "${usage}" 1>&2