← Back to branch summary

~ubuntu-branches/ubuntu/natty/pdfmod/natty

« back to all changes in this revision

Viewing changes to debian/patches/0002-Fix-PDFMod-s-compilation-to-choose-correct-Poppler.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chow Loong Jin
  • Date: 2010-09-29 17:34:49 UTC
  • mfrom: (2.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20100929173449-4ezagrzettatjk36
Tags: 0.9.0-1
* New upstream release
* debian/copyright: Document PdfSharp.SharpZipLib/*
* Drop all patches: committed upstream
* No change bump of Standards-Version from 3.8.4 to 3.9.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0002-Fix-PDFMod-s-compilation-to-choose-correct-Poppler.patch
1
 
From da6b1cfe37c41741d00792e17ee21163e4fb0533 Mon Sep 17 00:00:00 2001
2
 
From: Chow Loong Jin <hyperair@ubuntu.com>
3
 
Date: Fri, 18 Jun 2010 03:23:18 +0800
4
 
Subject: [PATCH 2/3] Fix PDFMod's compilation to choose correct Poppler#
5
 
 
6
 
Signed-off-by: Gabriel Burt <gabriel.burt@gmail.com>
7
 
---
8
 
 src/Makefile.am |   28 +++++++---------------------
9
 
 1 files changed, 7 insertions(+), 21 deletions(-)
10
 
 
11
 
diff --git a/src/Makefile.am b/src/Makefile.am
12
 
index 52a31d6..892373f 100644
13
 
--- a/src/Makefile.am
14
 
+++ b/src/Makefile.am
15
 
@@ -3,36 +3,16 @@
16
 
 #
17
 
 EXTRA_DIST =
18
 
 
19
 
-if ENABLE_DEBUG
20
 
 ASSEMBLY_COMPILER_COMMAND = $(MCS)
21
 
 ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug "-define:DEBUG"
22
 
 ASSEMBLY = ../bin/PdfMod.exe
23
 
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
24
 
 COMPILE_TARGET = exe
25
 
-PROJECT_REFERENCES =  \
26
 
-       ../bin/PdfSharp.dll \
27
 
-       ../bin/poppler-sharp.dll
28
 
+PROJECT_REFERENCES = ../bin/PdfSharp.dll
29
 
 BUILD_DIR = ../bin
30
 
 
31
 
 PDFMOD_EXE_MDB_SOURCE=../bin/PdfMod.exe.mdb
32
 
 
33
 
-endif
34
 
-
35
 
-if ENABLE_RELEASE
36
 
-ASSEMBLY_COMPILER_COMMAND = $(MCS)
37
 
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG
38
 
-ASSEMBLY = ../bin/PdfMod.exe
39
 
-ASSEMBLY_MDB = $(ASSEMBLY).mdb
40
 
-COMPILE_TARGET = exe
41
 
-PROJECT_REFERENCES =  \
42
 
-       ../bin/PdfSharp.dll \
43
 
-       ../bin/poppler-sharp.dll
44
 
-BUILD_DIR = ../bin
45
 
-
46
 
-PDFMOD_EXE_MDB_SOURCE=../bin/PdfMod.exe.mdb
47
 
-
48
 
-endif
49
 
-
50
 
 AL=al2
51
 
 SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
52
 
 
53
 
@@ -90,6 +70,12 @@ REFERENCES =  \
54
 
        System \
55
 
        System.Core
56
 
 
57
 
+if USE_BUNDLED_POPPLER
58
 
+PROJECT_REFERENCES += ../bin/poppler-sharp.dll
59
 
+else
60
 
+REFERENCES += -pkg:poppler-sharp
61
 
+endif
62
 
+
63
 
 DLL_REFERENCES = 
64
 
 
65
 
 CLEANFILES = $(PROGRAMFILES) $(BINARIES)
66
 
1.7.0.4
67