take back last changes, remove unused cmake option, new patchfile

3 files changed, 133 insertions, 91 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f0166a32e3b9..4ba3f88d6b9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = scribus-svn
 	pkgdesc = A desktop publishing program - Version from SVN
 	pkgver = 22789
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.scribus.net
 	arch = i686
 	arch = x86_64
@@ -28,10 +28,10 @@ pkgbase = scribus-svn
 	optdepends = lib2geom: for mesh distortion
 	provides = scribus
 	conflicts = scribus
-	source = scribus::svn://scribus.net/
+	source = scribus::svn://scribus.net/trunk
 	source = python2.patch
 	sha256sums = SKIP
-	sha256sums = c28a5dd091d8185454166eebbdf0a230dca7ad214742dcf35d7ffaed7a586516
+	sha256sums = 1801f9b1fbabeee33112c48e706706072e1e60b1160b1723c9bb80df0b4e2c66
 
 pkgname = scribus-svn
 
diff --git a/PKGBUILD b/PKGBUILD
index 9f0ec981d047..f42f5274d2c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=scribus-svn
 pkgver=22789
-pkgrel=1
+pkgrel=2
 pkgdesc="A desktop publishing program - Version from SVN"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
@@ -17,9 +17,9 @@ makedepends=('subversion' 'cmake' 'qt5-tools')
 optdepends=('lib2geom: for mesh distortion')
 conflicts=('scribus')
 provides=('scribus')
-source=('scribus::svn://scribus.net/' python2.patch)
+source=('scribus::svn://scribus.net/trunk' python2.patch)
 sha256sums=('SKIP'
-            'c28a5dd091d8185454166eebbdf0a230dca7ad214742dcf35d7ffaed7a586516')
+            '1801f9b1fbabeee33112c48e706706072e1e60b1160b1723c9bb80df0b4e2c66')
 _svnmod='scribus'
 
 pkgver() {
@@ -29,30 +29,29 @@ pkgver() {
 }
 
 prepare() {
-  cd $_svnmod/trunk
+  cd $_svnmod/Scribus
   patch -Np1 < "$srcdir"/python2.patch || true
 }
 
 build() {
-  cd $_svnmod/trunk/Scribus
+  cd $_svnmod/Scribus
   cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr \
 	-DCMAKE_SKIP_RPATH:BOOL=YES \
 	-DWANT_GRAPHICSMAGICK:BOOL=YES \
 	-DCMAKE_LIBRARY_PATH:PATH=/usr/lib \
 	-DCMAKE_INCLUDE_PATH:PATH=/usr/include/python2.7 \
 	-DCMAKE_EXE_LINKER_FLAGS:STRING="-lQt5Quick -lQt5PrintSupport" \
-	-DCMAKE_APPDATA_DIR:PATH=/usr/share/appdata \
-	-DQT_PREFIX:PATH="/usr" -DWANT_SVNVERSION:BOOL=YES 
+	-DQT_PREFIX:PATH="/usr" -DWANT_SVNVERSION:BOOL=YES
   make
 }
 
 package () {
-  cd $_svnmod/trunk/Scribus
+  cd "$srcdir"/$_svnmod/Scribus
   make DESTDIR="$pkgdir" install
   install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
   install -Dm644 scribus.desktop $pkgdir/usr/share/applications/scribus.desktop
-  install -d "$pkgdir"/usr/share/pixmaps
-  ln -s /usr/share/scribus/icons/1_5_0/scribus.png "$pkgdir"/usr/share/pixmaps/scribus.png
+  install -d "${pkgdir}"/usr/share/pixmaps
+  ln -s /usr/share/scribus/icons/1_5_0/scribus.png "${pkgdir}"/usr/share/pixmaps/scribus.png
   # move around some picture files
   for _i in AppIcon.png AllCaps.png Kapital.xpm Strike.xpm \
 		       outlined.png shadow.png shade.png Revers.png zeichen.png
diff --git a/python2.patch b/python2.patch
index 17e4e8c74058..ee2642d028b5 100644
--- a/python2.patch
+++ b/python2.patch
@@ -1,231 +1,274 @@
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/3columnA4.py trunk/Scribus/scribus/plugins/scriptplugin/samples/3columnA4.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/3columnA4.py	2017-03-29 21:17:58.546722296 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/3columnA4.py	2017-03-29 21:44:22.445693514 +0200
+Index: Scribus/scribus/plugins/scriptplugin/samples/3columnA4.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/samples/3columnA4.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/samples/3columnA4.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  """ Creates 3 column layout on A4 paper and save it under 3columnA4.sla filename. This is a simple way to demonstrate creating a doc on the fly. """
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/3columnUSLTR.py trunk/Scribus/scribus/plugins/scriptplugin/samples/3columnUSLTR.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/3columnUSLTR.py	2017-03-29 21:17:58.546722296 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/3columnUSLTR.py	2017-03-29 21:44:30.395656189 +0200
+Index: Scribus/scribus/plugins/scriptplugin/samples/3columnUSLTR.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/samples/3columnUSLTR.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/samples/3columnUSLTR.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  """ Creates 3 column layout on US Letter  paper and save it under 3columnUSLTR.sla filename. This is a simple way to demonstrate creating a doc on the fly. """
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/Calender.py trunk/Scribus/scribus/plugins/scriptplugin/samples/Calender.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/Calender.py	2017-03-29 21:17:58.546722296 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/Calender.py	2017-03-29 21:44:43.712260230 +0200
+Index: Scribus/scribus/plugins/scriptplugin/samples/Calender.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/samples/Calender.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/samples/Calender.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  """ This Script creates a Calendar Sheet for the Current Month """
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/ExtractText.py trunk/Scribus/scribus/plugins/scriptplugin/samples/ExtractText.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/ExtractText.py	2017-03-29 21:17:58.543388972 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/ExtractText.py	2017-03-29 21:44:48.508904307 +0200
+Index: Scribus/scribus/plugins/scriptplugin/samples/ExtractText.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/samples/ExtractText.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/samples/ExtractText.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  """
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/Sample1.py trunk/Scribus/scribus/plugins/scriptplugin/samples/Sample1.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/Sample1.py	2017-03-29 21:17:58.546722296 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/Sample1.py	2017-03-29 21:44:57.488861973 +0200
+Index: Scribus/scribus/plugins/scriptplugin/samples/Sample1.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/samples/Sample1.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/samples/Sample1.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  """ A sample script """
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/boilerplate.py trunk/Scribus/scribus/plugins/scriptplugin/samples/boilerplate.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/boilerplate.py	2017-03-29 21:17:58.546722296 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/boilerplate.py	2017-03-29 21:45:05.005493161 +0200
+Index: Scribus/scribus/plugins/scriptplugin/samples/boilerplate.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/samples/boilerplate.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/samples/boilerplate.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  import sys
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/golden-mean.py trunk/Scribus/scribus/plugins/scriptplugin/samples/golden-mean.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/golden-mean.py	2017-03-29 21:17:58.546722296 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/golden-mean.py	2017-03-29 21:45:09.598804794 +0200
+Index: Scribus/scribus/plugins/scriptplugin/samples/golden-mean.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/samples/golden-mean.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/samples/golden-mean.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  """Golden Mean for Scribus.
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/legende.py trunk/Scribus/scribus/plugins/scriptplugin/samples/legende.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/legende.py	2017-03-29 21:17:58.550055620 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/legende.py	2017-03-29 21:45:15.442110500 +0200
+Index: Scribus/scribus/plugins/scriptplugin/samples/legende.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/samples/legende.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/samples/legende.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  """ When you have an image selected this script creates small text legende
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/moins_10_pourcent_group.py trunk/Scribus/scribus/plugins/scriptplugin/samples/moins_10_pourcent_group.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/moins_10_pourcent_group.py	2017-03-29 21:17:58.550055620 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/moins_10_pourcent_group.py	2017-03-29 21:45:22.102078985 +0200
+Index: Scribus/scribus/plugins/scriptplugin/samples/moins_10_pourcent_group.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/samples/moins_10_pourcent_group.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/samples/moins_10_pourcent_group.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  """ Make selected group smaller by 10% """
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/plus_10_pourcent_group.py trunk/Scribus/scribus/plugins/scriptplugin/samples/plus_10_pourcent_group.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/plus_10_pourcent_group.py	2017-03-29 21:17:58.546722296 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/plus_10_pourcent_group.py	2017-03-29 21:45:28.348716065 +0200
+Index: Scribus/scribus/plugins/scriptplugin/samples/plus_10_pourcent_group.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/samples/plus_10_pourcent_group.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/samples/plus_10_pourcent_group.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  """ Make selected group larger by 10% """
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/pochette_cd.py trunk/Scribus/scribus/plugins/scriptplugin/samples/pochette_cd.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/pochette_cd.py	2017-03-29 21:17:58.546722296 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/pochette_cd.py	2017-03-29 21:45:34.875351791 +0200
+Index: Scribus/scribus/plugins/scriptplugin/samples/pochette_cd.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/samples/pochette_cd.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/samples/pochette_cd.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  """ This script creates a CD Pochette - a paper pocket for CD/DVD disc """
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/quote.py trunk/Scribus/scribus/plugins/scriptplugin/samples/quote.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/quote.py	2017-03-29 21:17:58.546722296 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/quote.py	2017-03-29 21:47:58.714663426 +0200
+Index: Scribus/scribus/plugins/scriptplugin/samples/quote.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/samples/quote.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/samples/quote.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: iso-8859-1 -*-
  
  """ This script changes quotation marks from " " to french style """
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/sample_db_usage.py trunk/Scribus/scribus/plugins/scriptplugin/samples/sample_db_usage.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/sample_db_usage.py	2017-03-29 21:17:58.546722296 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/sample_db_usage.py	2017-03-29 21:45:48.628619833 +0200
+Index: Scribus/scribus/plugins/scriptplugin/samples/sample_db_usage.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/samples/sample_db_usage.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/samples/sample_db_usage.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  """OK. This is a sample Scribus database connection with Python HOWTO.
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/trait_de_coupe.py trunk/Scribus/scribus/plugins/scriptplugin/samples/trait_de_coupe.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/trait_de_coupe.py	2017-03-29 21:17:58.550055620 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/trait_de_coupe.py	2017-03-29 21:45:53.861928292 +0200
+Index: Scribus/scribus/plugins/scriptplugin/samples/trait_de_coupe.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/samples/trait_de_coupe.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/samples/trait_de_coupe.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  """ Draws a "crop marks" around selected object """
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/wordcount.py trunk/Scribus/scribus/plugins/scriptplugin/samples/wordcount.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/samples/wordcount.py	2017-03-29 21:17:58.546722296 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/wordcount.py	2017-03-29 21:46:00.898561484 +0200
+Index: Scribus/scribus/plugins/scriptplugin/samples/wordcount.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/samples/wordcount.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/samples/wordcount.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  """ Counts the words in the whole document or in a textframe """
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/Autoquote.py trunk/Scribus/scribus/plugins/scriptplugin/scripts/Autoquote.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/Autoquote.py	2017-03-29 21:17:58.813388241 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/scripts/Autoquote.py	2017-03-29 21:42:53.636107065 +0200
+Index: Scribus/scribus/plugins/scriptplugin/scripts/Align_image_in_frame.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/scripts/Align_image_in_frame.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/scripts/Align_image_in_frame.py	(Arbeitskopie)
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ # Align_image_in_frame.py
+ # This version 2014.04.19
+ """
+@@ -140,4 +140,4 @@
+             scribus.redrawAll()
+  
+ if __name__ == '__main__':
+-    main()
+\ No newline at end of file
++    main()
+Index: Scribus/scribus/plugins/scriptplugin/scripts/Autoquote.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/scripts/Autoquote.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/scripts/Autoquote.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  # File: quotes.py - changes typewriter quotes to typographic quotes
  # © 2010.08.28 Gregory Pittman
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/Autoquote2.py trunk/Scribus/scribus/plugins/scriptplugin/scripts/Autoquote2.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/Autoquote2.py	2017-03-29 21:17:58.813388241 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/scripts/Autoquote2.py	2017-03-29 21:42:58.732750178 +0200
+Index: Scribus/scribus/plugins/scriptplugin/scripts/Autoquote2.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/scripts/Autoquote2.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/scripts/Autoquote2.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  # File: spacenquotes.py - changes typewriter quotes to typographic quotes with option to add spaces
  # © 2010.08.28 Gregory Pittman
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/Caption.py trunk/Scribus/scribus/plugins/scriptplugin/scripts/Caption.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/Caption.py	2017-03-29 21:17:58.813388241 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/scripts/Caption.py	2017-03-29 21:42:05.079663595 +0200
+Index: Scribus/scribus/plugins/scriptplugin/scripts/Caption.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/scripts/Caption.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/scripts/Caption.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8  -*-
  
  # ****************************************************************************
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/ColorChart.py trunk/Scribus/scribus/plugins/scriptplugin/scripts/ColorChart.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/ColorChart.py	2017-03-29 21:17:58.816721565 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/scripts/ColorChart.py	2017-03-29 21:43:22.059308755 +0200
+Index: Scribus/scribus/plugins/scriptplugin/scripts/ColorChart.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/scripts/ColorChart.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/scripts/ColorChart.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python2
  # -*- coding: utf-8 -*-
  
  """
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/DirectImageImport.py trunk/Scribus/scribus/plugins/scriptplugin/scripts/DirectImageImport.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/DirectImageImport.py	2017-03-29 21:17:58.816721565 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/scripts/DirectImageImport.py	2017-03-29 21:43:30.555935934 +0200
+Index: Scribus/scribus/plugins/scriptplugin/scripts/DirectImageImport.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/scripts/DirectImageImport.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/scripts/DirectImageImport.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  """ 
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/FontSample.py trunk/Scribus/scribus/plugins/scriptplugin/scripts/FontSample.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/FontSample.py	2017-03-29 21:17:58.816721565 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/scripts/FontSample.py	2017-03-29 21:43:36.055910341 +0200
+Index: Scribus/scribus/plugins/scriptplugin/scripts/FontSample.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/scripts/FontSample.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/scripts/FontSample.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  
  # ****************************************************************************
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/InfoBox.py trunk/Scribus/scribus/plugins/scriptplugin/scripts/InfoBox.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/InfoBox.py	2017-03-29 21:17:58.816721565 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/scripts/InfoBox.py	2017-03-29 21:42:20.419593323 +0200
+Index: Scribus/scribus/plugins/scriptplugin/scripts/InfoBox.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/scripts/InfoBox.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/scripts/InfoBox.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8  -*-
  
  # ****************************************************************************
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/Ligatursatz.py trunk/Scribus/scribus/plugins/scriptplugin/scripts/Ligatursatz.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/Ligatursatz.py	2017-03-29 21:17:58.816721565 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/scripts/Ligatursatz.py	2017-03-29 21:44:35.838963939 +0200
+Index: Scribus/scribus/plugins/scriptplugin/scripts/Ligatursatz.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/scripts/Ligatursatz.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/scripts/Ligatursatz.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python

 +#!/usr/bin/env python2

  # -*- coding: utf8 -*-

  

  """

-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/color2csv.py trunk/Scribus/scribus/plugins/scriptplugin/scripts/color2csv.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/color2csv.py	2017-03-29 21:17:58.816721565 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/scripts/color2csv.py	2017-03-29 21:43:50.619175789 +0200
+Index: Scribus/scribus/plugins/scriptplugin/scripts/color2csv.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/scripts/color2csv.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/scripts/color2csv.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  """
  ABOUT THIS SCRIPT:
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/csv2color.py trunk/Scribus/scribus/plugins/scriptplugin/scripts/csv2color.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/csv2color.py	2017-03-29 21:17:58.816721565 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/scripts/csv2color.py	2017-03-29 21:43:55.282487348 +0200
+Index: Scribus/scribus/plugins/scriptplugin/scripts/csv2color.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/scripts/csv2color.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/scripts/csv2color.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
  # -*- coding: utf-8 -*-
  """
  ABOUT THIS SCRIPT:
-diff -Naur trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/importcsv2table.py trunk/Scribus/scribus/plugins/scriptplugin/scripts/importcsv2table.py
---- trunk.orig/Scribus/scribus/plugins/scriptplugin/scripts/importcsv2table.py	2017-03-29 21:17:58.816721565 +0200
-+++ trunk/Scribus/scribus/plugins/scriptplugin/scripts/importcsv2table.py	2017-03-29 21:44:02.932451592 +0200
+Index: Scribus/scribus/plugins/scriptplugin/scripts/importcsv2table.py
+===================================================================
+--- Scribus/scribus/plugins/scriptplugin/scripts/importcsv2table.py	(Revision 22789)
++++ Scribus/scribus/plugins/scriptplugin/scripts/importcsv2table.py	(Arbeitskopie)
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2