As list administrator, your authorization is requested for the
following mailing list posting:
List: [email protected]
From: [email protected]
Subject: [SCM] openimageio branch, master, updated.
debian/1.0.0+dfsg0-1-12-gfe033ae
Reason: Post to moderated list
At your convenience, visit:
http://lists.alioth.debian.org/cgi-bin/mailman/admindb/pkg-phototools-commits
to approve or deny the request.
--- Begin Message ---
The following commit has been merged in the master branch:
commit 64b55ae3b8a5fffc69a7d90843d2a15393afed3d
Author: Matteo F. Vescovi <[email protected]>
Date: Mon Apr 16 10:16:23 2012 +0200
debian/patches/: patchset re-worked
I made a mistake using gbp-pq and removed all the credits about docs
patching by David Paleino (dapal).
This re-work of the patchset tries to fix this.
Git-Dch: Ignore
diff --git a/debian/patches/0001-Fix_docs_generation.patch
b/debian/patches/0001-Fix_docs_generation.patch
new file mode 100644
index 0000000..743c20a
--- /dev/null
+++ b/debian/patches/0001-Fix_docs_generation.patch
@@ -0,0 +1,39 @@
+From: "Matteo F. Vescovi" <[email protected]>
+Date: Mon, 16 Apr 2012 10:11:46 +0200
+Subject: Fix_docs_generation
+
+---
+From: David Paleino <[email protected]>
+Subject: fix LaTeX→PDF generation
+Origin: vendor
+Forwarded: no
+
+ src/doc/CMakeLists.txt | 1 -
+ src/doc/Makefile | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
+index 6dcec9d..035b659 100644
+--- a/src/doc/CMakeLists.txt
++++ b/src/doc/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ project(documentation)
+
+ set (public_docs
+- openimageio.pdf
+ ${OpenImageIO_SOURCE_DIR}/../LICENSE
+ ${OpenImageIO_SOURCE_DIR}/../CHANGES
+ )
+diff --git a/src/doc/Makefile b/src/doc/Makefile
+index cdc25e4..7b47251 100644
+--- a/src/doc/Makefile
++++ b/src/doc/Makefile
+@@ -4,7 +4,7 @@ all: openimageio.pdf
+
+
+ # document making rule: use pdflatex
+-openimageio.pdf: *.tex *.aux
++openimageio.pdf: *.tex
+ pdflatex openimageio
+
+
diff --git a/debian/patches/0001-PDF_documentation_file_removed.patch
b/debian/patches/0001-PDF_documentation_file_removed.patch
deleted file mode 100644
index 4ea661f..0000000
--- a/debian/patches/0001-PDF_documentation_file_removed.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: "Matteo F. Vescovi" <[email protected]>
-Date: Sun, 11 Mar 2012 12:49:40 +0100
-Subject: PDF_documentation_file_removed
-
----
- src/doc/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
-index 6dcec9d..035b659 100644
---- a/src/doc/CMakeLists.txt
-+++ b/src/doc/CMakeLists.txt
-@@ -1,7 +1,6 @@
- project(documentation)
-
- set (public_docs
-- openimageio.pdf
- ${OpenImageIO_SOURCE_DIR}/../LICENSE
- ${OpenImageIO_SOURCE_DIR}/../CHANGES
- )
diff --git a/debian/patches/0003-Fix_FTBFS_on_kFreeBSD.patch
b/debian/patches/0002-Fix_FTBFS_on_kFreeBSD.patch
similarity index 100%
rename from debian/patches/0003-Fix_FTBFS_on_kFreeBSD.patch
rename to debian/patches/0002-Fix_FTBFS_on_kFreeBSD.patch
diff --git a/debian/patches/0002-Fix_docs_generation.patch
b/debian/patches/0002-Fix_docs_generation.patch
deleted file mode 100644
index fcf8e8f..0000000
--- a/debian/patches/0002-Fix_docs_generation.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: "Matteo F. Vescovi" <[email protected]>
-Date: Thu, 12 Apr 2012 15:31:36 +0200
-Subject: Fix_docs_generation
-
----
- src/doc/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/doc/Makefile b/src/doc/Makefile
-index cdc25e4..7b47251 100644
---- a/src/doc/Makefile
-+++ b/src/doc/Makefile
-@@ -4,7 +4,7 @@ all: openimageio.pdf
-
-
- # document making rule: use pdflatex
--openimageio.pdf: *.tex *.aux
-+openimageio.pdf: *.tex
- pdflatex openimageio
-
-
diff --git a/debian/patches/series b/debian/patches/series
index 68448fa..077abbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0001-PDF_documentation_file_removed.patch
-0002-Fix_docs_generation.patch
-0003-Fix_FTBFS_on_kFreeBSD.patch
+0001-Fix_docs_generation.patch
+0002-Fix_FTBFS_on_kFreeBSD.patch
--
OpenImageIO packaging
--- End Message ---
--- Begin Message ---
If you reply to this message, keeping the Subject: header intact,
Mailman will discard the held message. Do this if the message is
spam. If you reply to this message and include an Approved: header
with the list password in it, the message will be approved for posting
to the list. The Approved: header can also appear in the first line
of the body of the reply.
--- End Message ---
_______________________________________________
Pkg-phototools-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-phototools-devel
