From 3771b0cf307a534b9c3cfa169f0877172f652ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Vanicat?= Date: Sat, 16 Sep 2017 23:01:49 +0200 Subject: update patches, drop 0002-Look-for-epdfinfo-where-it-is --- .../patches/0001-Use-debian-libsynctex-dev.patch | 21 +++++++------------- .../0002-Look-for-epdfinfo-where-it-is.patch | 23 ---------------------- debian/patches/series | 1 - 3 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 debian/patches/0002-Look-for-epdfinfo-where-it-is.patch (limited to 'debian/patches') diff --git a/debian/patches/0001-Use-debian-libsynctex-dev.patch b/debian/patches/0001-Use-debian-libsynctex-dev.patch index 60767c3..0d18eb3 100644 --- a/debian/patches/0001-Use-debian-libsynctex-dev.patch +++ b/debian/patches/0001-Use-debian-libsynctex-dev.patch @@ -3,15 +3,15 @@ Date: Tue, 19 Apr 2016 22:38:29 +0200 Subject: Use debian libsynctex-dev --- - server/Makefile.am | 7 +------ + server/Makefile.am | 2 +- server/epdfinfo.c | 2 +- - 2 files changed, 2 insertions(+), 7 deletions(-) + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/Makefile.am b/server/Makefile.am -index 43984a7..17dc02f 100644 +index 2321571..0452257 100644 --- a/server/Makefile.am +++ b/server/Makefile.am -@@ -3,14 +3,9 @@ epdfinfo_CFLAGS = -Wall $(glib_CFLAGS) $(poppler_glib_CFLAGS) $(poppler_CFLAGS) +@@ -3,7 +3,7 @@ epdfinfo_CFLAGS = -Wall $(glib_CFLAGS) $(poppler_glib_CFLAGS) $(poppler_CFLAGS) $(png_CFLAGS) epdfinfo_CXXFLAGS = -Wall $(epdfinfo_CFLAGS) epdfinfo_LDADD = $(glib_LIBS) $(poppler_glib_LIBS) $(poppler_LIBS) \ @@ -19,19 +19,12 @@ index 43984a7..17dc02f 100644 + $(png_LIBS) -lsynctex $(zlib_LIBS) epdfinfo_SOURCES = epdfinfo.c epdfinfo.h poppler-hack.cc --noinst_LIBRARIES = libsynctex.a --libsynctex_a_SOURCES = synctex_parser.c synctex_parser_utils.c synctex_parser.h \ -- synctex_parser_local.h synctex_parser_utils.h --libsynctex_a_CFLAGS = -w -- - GITCLEANFILES = Makefile.in aclocal.m4 config.h.in \ - configure depcomp install-sh missing autom4te.cache \ - $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz + noinst_LIBRARIES = libsynctex.a diff --git a/server/epdfinfo.c b/server/epdfinfo.c -index 54377a5..6d8fddf 100644 +index 86d9200..5bee3dc 100644 --- a/server/epdfinfo.c +++ b/server/epdfinfo.c -@@ -37,7 +37,7 @@ +@@ -39,7 +39,7 @@ #include #include #include diff --git a/debian/patches/0002-Look-for-epdfinfo-where-it-is.patch b/debian/patches/0002-Look-for-epdfinfo-where-it-is.patch deleted file mode 100644 index f207181..0000000 --- a/debian/patches/0002-Look-for-epdfinfo-where-it-is.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: =?utf-8?q?R=C3=A9mi_Vanicat?= -Date: Tue, 18 Oct 2016 17:40:49 +0200 -Subject: Look for epdfinfo where it is. - ---- - lisp/pdf-info.el | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/lisp/pdf-info.el b/lisp/pdf-info.el -index 2eea21f..da48192 100644 ---- a/lisp/pdf-info.el -+++ b/lisp/pdf-info.el -@@ -62,9 +62,7 @@ - :group 'pdf-tools) - - (defcustom pdf-info-epdfinfo-program -- (expand-file-name "epdfinfo" -- (file-name-directory -- (or load-file-name default-directory))) -+ "/usr/bin/epdfinfo" - "Filename of the epdfinfo executable." - :group 'pdf-info - :type '(file :must-match t)) diff --git a/debian/patches/series b/debian/patches/series index 128cc2b..885ccc8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 0001-Use-debian-libsynctex-dev.patch -0002-Look-for-epdfinfo-where-it-is.patch -- cgit v1.2.3