summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2011-09-27 00:09:54 +0200
committerAlbert Astals Cid <aacid@kde.org>2011-09-27 00:09:54 +0200
commit6d34d4af90b8b41360de4dabb000bbcc894775d0 (patch)
tree0607bce12358cf3322cd76cd85d9a2e1e9d5c420
parentbaf54c2876edd476ffc68da6518598847bb7ec8a (diff)
Rename pdfmerge and pdfextract
To pdfunite and pdfseparate, the old names were taken
-rw-r--r--utils/.gitignore4
-rw-r--r--utils/CMakeLists.txt28
-rw-r--r--utils/Makefile.am16
-rw-r--r--utils/pdfseparate.1 (renamed from utils/pdfextract.1)16
-rw-r--r--utils/pdfseparate.cc (renamed from utils/pdfextract.cc)6
-rw-r--r--utils/pdfunite.1 (renamed from utils/pdfmerge.1)14
-rw-r--r--utils/pdfunite.cc (renamed from utils/pdfmerge.cc)6
7 files changed, 45 insertions, 45 deletions
diff --git a/utils/.gitignore b/utils/.gitignore
index d18e8c93..71779f0f 100644
--- a/utils/.gitignore
+++ b/utils/.gitignore
@@ -2,11 +2,11 @@
.libs
Makefile
Makefile.in
-pdfextract
+pdfseparate
pdffonts
pdfimages
pdfinfo
-pdfmerge
+pdfunite
pdftohtml
pdftoppm
pdftops
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index a36616da..daea0751 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -102,20 +102,20 @@ target_link_libraries(pdftohtml ${common_libs})
install(TARGETS pdftohtml DESTINATION bin)
install(FILES pdftohtml.1 DESTINATION share/man/man1)
-# pdfextract
-set(pdfextract_SOURCES ${common_srcs}
- pdfextract.cc
+# pdfseparate
+set(pdfseparate_SOURCES ${common_srcs}
+ pdfseparate.cc
)
-add_executable(pdfextract ${pdfextract_SOURCES})
-target_link_libraries(pdfextract ${common_libs})
-install(TARGETS pdfextract DESTINATION bin)
-install(FILES pdfextract.1 DESTINATION share/man/man1)
+add_executable(pdfseparate ${pdfseparate_SOURCES})
+target_link_libraries(pdfseparate ${common_libs})
+install(TARGETS pdfseparate DESTINATION bin)
+install(FILES pdfseparate.1 DESTINATION share/man/man1)
-# pdfmerge
-set(pdfmerge_SOURCES ${common_srcs}
- pdfmerge.cc
+# pdfunite
+set(pdfunite_SOURCES ${common_srcs}
+ pdfunite.cc
)
-add_executable(pdfmerge ${pdfmerge_SOURCES})
-target_link_libraries(pdfmerge ${common_libs})
-install(TARGETS pdfmerge DESTINATION bin)
-install(FILES pdfmerge.1 DESTINATION share/man/man1)
+add_executable(pdfunite ${pdfunite_SOURCES})
+target_link_libraries(pdfunite ${common_libs})
+install(TARGETS pdfunite DESTINATION bin)
+install(FILES pdfunite.1 DESTINATION share/man/man1)
diff --git a/utils/Makefile.am b/utils/Makefile.am
index ac2a15e8..144d8125 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -50,8 +50,8 @@ bin_PROGRAMS = \
pdftops \
pdftotext \
pdftohtml \
- pdfextract \
- pdfmerge \
+ pdfseparate \
+ pdfunite \
$(pdftoppm_binary) \
$(pdftocairo_binary)
@@ -62,8 +62,8 @@ dist_man1_MANS = \
pdftops.1 \
pdftotext.1 \
pdftohtml.1 \
- pdfextract.1 \
- pdfmerge.1 \
+ pdfseparate.1 \
+ pdfunite.1 \
$(pdftoppm_manpage) \
$(pdftocairo_manpage)
@@ -106,12 +106,12 @@ pdftohtml_SOURCES = \
HtmlUtils.h \
$(common)
-pdfextract_SOURCES = \
- pdfextract.cc \
+pdfseparate_SOURCES = \
+ pdfseparate.cc \
$(common)
-pdfmerge_SOURCES = \
- pdfmerge.cc \
+pdfunite_SOURCES = \
+ pdfunite.cc \
$(common)
# Yay, automake! It should be able to figure out that it has to dist
diff --git a/utils/pdfextract.1 b/utils/pdfseparate.1
index 2760045d..f871d3be 100644
--- a/utils/pdfextract.1
+++ b/utils/pdfseparate.1
@@ -1,16 +1,16 @@
.\" Copyright 2011 The Poppler Developers - http://poppler.freedesktop.org
-.TH pdfextract 1 "15 September 2011"
+.TH pdfseparate 1 "15 September 2011"
.SH NAME
-pdfextract \- Portable Document Format (PDF) page extractor
+pdfseparate \- Portable Document Format (PDF) page extractor
.SH SYNOPSIS
-.B pdfextract
+.B pdfseparate
[options]
.I PDF-file PDF-page-pattern
.SH DESCRIPTION
-.B pdfextract
+.B pdfseparate
extract single pages from a Portable Document Format (PDF).
.PP
-pdfextract reads the PDF file
+pdfseparate reads the PDF file
.IR PDF-file ,
extracts one or more pages, and writes one PDF file for each page to
.IR PDF-page-pattern,
@@ -37,13 +37,13 @@ and
.B \-\-help
are equivalent.)
.SH EXAMPLE
-pdfextract sample.pdf sample-%d.pdf
+pdfseparate sample.pdf sample-%d.pdf
.TP
extracts all pages from sample.pdf, if i.e. sample.pdf has 3 pages, it produces
.TP
sample-1.pdf, sample-2.pdf, sample-3.pdf
.SH AUTHOR
-The pdfextract software and documentation are copyright 1996-2004 Glyph
+The pdfseparate software and documentation are copyright 1996-2004 Glyph
& Cog, LLC and copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org
.SH "SEE ALSO"
-.BR pdfmerge (1),
+.BR pdfunite (1),
diff --git a/utils/pdfextract.cc b/utils/pdfseparate.cc
index d6a7eb5c..9e627052 100644
--- a/utils/pdfextract.cc
+++ b/utils/pdfseparate.cc
@@ -1,6 +1,6 @@
//========================================================================
//
-// pdfextract.cc
+// pdfseparate.cc
//
// This file is licensed under the GPLv2 or later
//
@@ -95,12 +95,12 @@ main (int argc, char *argv[])
ok = parseArgs (argDesc, &argc, argv);
if (!ok || argc != 3 || printVersion || printHelp)
{
- fprintf (stderr, "pdfextract version %s\n", PACKAGE_VERSION);
+ fprintf (stderr, "pdfseparate version %s\n", PACKAGE_VERSION);
fprintf (stderr, "%s\n", popplerCopyright);
fprintf (stderr, "%s\n", xpdfCopyright);
if (!printVersion)
{
- printUsage ("pdfextract", "<PDF-sourcefile> <PDF-pattern-destfile>",
+ printUsage ("pdfseparate", "<PDF-sourcefile> <PDF-pattern-destfile>",
argDesc);
}
if (printVersion || printHelp)
diff --git a/utils/pdfmerge.1 b/utils/pdfunite.1
index aecf5554..9b1f2e8f 100644
--- a/utils/pdfmerge.1
+++ b/utils/pdfunite.1
@@ -1,13 +1,13 @@
.\" Copyright 2011 The Poppler Developers - http://poppler.freedesktop.org
-.TH pdfmerge 1 "15 September 2011"
+.TH pdfunite 1 "15 September 2011"
.SH NAME
-pdfmerge \- Portable Document Format (PDF) page merger
+pdfunite \- Portable Document Format (PDF) page merger
.SH SYNOPSIS
-.B pdfmerge
+.B pdfunite
[options]
.I PDF-sourcefile1..PDF-sourcefilen PDF-destfile
.SH DESCRIPTION
-.B pdfmerge
+.B pdfunite
merges several PDF (Portable Document Format) files in order of their occurence on command line to one PDF result file.
.TP
Neither of the PDF-sourcefile1 to PDF-sourcefilen should be encrypted.
@@ -23,11 +23,11 @@ and
.B \-\-help
are equivalent.)
.SH EXAMPLE
-pdfmerge sample1.pdf sample2.pdf sample.pdf
+pdfunite sample1.pdf sample2.pdf sample.pdf
.TP
merges all pages from sample1.pdf and sample2.pdf (in that order) and creates sample.pdf
.SH AUTHOR
-The pdfmerge software and documentation are copyright 1996-2004 Glyph & Cog, LLC
+The pdfunite software and documentation are copyright 1996-2004 Glyph & Cog, LLC
and copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org
.SH "SEE ALSO"
-.BR pdfextract (1),
+.BR pdfseparate (1),
diff --git a/utils/pdfmerge.cc b/utils/pdfunite.cc
index 28f7265e..3b3d2bba 100644
--- a/utils/pdfmerge.cc
+++ b/utils/pdfunite.cc
@@ -1,6 +1,6 @@
//========================================================================
//
-// pdfmerge.cc
+// pdfunite.cc
//
// This file is licensed under the GPLv2 or later
//
@@ -54,11 +54,11 @@ int main (int argc, char *argv[])
exitCode = 99;
if (argc <= 3 || printVersion || printHelp) {
- fprintf(stderr, "pdfmerge version %s\n", PACKAGE_VERSION);
+ fprintf(stderr, "pdfunite version %s\n", PACKAGE_VERSION);
fprintf(stderr, "%s\n", popplerCopyright);
fprintf(stderr, "%s\n", xpdfCopyright);
if (!printVersion) {
- printUsage("pdfmerge", "<PDF-sourcefile-1>..<PDF-sourcefile-n> <PDF-destfile>",
+ printUsage("pdfunite", "<PDF-sourcefile-1>..<PDF-sourcefile-n> <PDF-destfile>",
argDesc);
}
if (printVersion || printHelp)