Rolling back minor changes done in pythonqt that broke compilation on…

… Jessie And updated manpage related stuff properly
patacrep · Nov 16, 2015 · be4f336 · be4f336
1 parent 56f71e2
commit be4f336
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -219,7 +219,7 @@ add_custom_target(
 if(GENERATE_MANPAGES)
 
   set(PATAGUI_MAN_SRCS
-    ${SOURCE_DIR}/manpages/patagui.1.txt
+    ${SOURCE_DIR}/manpages/Patagui.1.txt
     )
 
   set(PATAGUI_MAN_LANGS default fr)

diff --git a/manpages/songbook-client.1.fr.txt → manpages/Patagui.1.fr.txt b/manpages/songbook-client.1.fr.txt → manpages/Patagui.1.fr.txt
@@ -1,5 +1,5 @@
 Patagui(1)
-==================
+==========
 
 NOM
 ---

diff --git a/manpages/songbook-client.1.txt → manpages/Patagui.1.txt b/manpages/songbook-client.1.txt → manpages/Patagui.1.txt
@@ -1,5 +1,5 @@
 Patagui(1)
-==================
+==========
 
 NAME
 ----
@@ -18,7 +18,7 @@ DESCRIPTION
 that allows to handle the song selection and appearance customization
 of a songbook. The embedded editor allows to add, remove and modify the
 songs in the available library. Finally a build option allows to create
-nice high quality pdf documents, directly from theGUI interface.
+nice high quality pdf documents, directly from the GUI interface.
 
 OPTIONS
 -------

diff --git a/pythonqt/pythonqt.zip b/pythonqt/pythonqt.zip
diff --git a/src/import-dialog.cc b/src/import-dialog.cc
@@ -567,7 +567,7 @@ int ImportDialog::copy_data(struct archive *ar, struct archive *aw)
 {
     const void *buff;
     size_t size;
-    off_t offset;
+    int64_t offset;
 
     do {
         int r = archive_read_data_block(ar, &buff, &size, &offset);