Commit c89c2fbbdfc798b0395c887aaf2db043c33f393e - ijs

+38

-0

debian/patches/1001_pkgconfig_libdir.patch 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

+58

-0

debian/patches/1002_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)

+3

-0

debian/patches/README less more

	0	0xxx: Grabbed from upstream development.
	1	1xxx: Possibly relevant for upstream adoption.
	2	2xxx: Only relevant for official Debian release.

+0

-38

~~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

+0

-58

~~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)