Hi Jonathan, dear Release Team, @Jonathan: thanks for this overview... On Mi 18 Jan 2012 14:09:57 CET Jonathan Wiltshire wrote:
slbackup-php ------------ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655832 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565181 -> not uploaded yet...
A new version has been uploaded to Debian sid (0.3-3).
Once that is done and it has a chance for any bugs to be revealed, you should build stable packages and prepare a debdiff for the release team.They prefer a bug against release.debian.org with your debdiff attached.
A debdiff is attached to this mail. Thanks, Mike -- DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419 GnuPG Key ID 0xB588399B mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
diff -Nru slbackup-php-0.3/debian/changelog slbackup-php-0.3/debian/changelog
--- slbackup-php-0.3/debian/changelog 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/changelog 2012-01-19 15:38:17.000000000 +0100
@@ -1,3 +1,19 @@
+slbackup-php (0.3-3) unstable; urgency=low
+
+ * Mike Gabriel becomes Debian package maintainer.
+ * Enable quilt patch system. Bump Standards-Version from 3.7.3 to 3.9.2.
+ * Add generic README.source that explains the usage of quilt.
+ * Add patch: 001_slbackup-php_cookie+request-merge.patch. Fixes reappearing
+ login page on every click (closes: #655832).
+ * Add patch: 002_slbackup-php_restore-paths-with-blanks.patch. Allows restore
+ of files with blanks in their name. Closes: #565181.
+ Patch provided by Cyril ETCHEVERRIA <cyril.e@wanadoo.fr> -> thanks!
+ * Add patch: 003_slbackup-php_fix-failed-in-status-template.patch,
+ for last failed backup really show timestamp of the last failed backup
+ and not erroneously the timestamp of the last successful backup.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 18 Jan 2012 17:05:14 +0100
+
slbackup-php (0.3-2.2) unstable; urgency=low
* Non-maintainer upload.
diff -Nru slbackup-php-0.3/debian/control slbackup-php-0.3/debian/control
--- slbackup-php-0.3/debian/control 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/control 2012-01-19 15:32:00.000000000 +0100
@@ -1,10 +1,13 @@
Source: slbackup-php
Section: misc
Priority: optional
-Maintainer: Patrick Winnertz <winnie@debian.org>
-Uploaders: Morten Werner Olsen <werner@debian.org>, Finn-Arne Johansen <faj@bzz.no>
-Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 5), po-debconf, smarty-gettext, php5-cli
+Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Uploaders:
+ Patrick Winnertz <winnie@debian.org>,
+ Morten Werner Olsen <werner@debian.org>,
+ Finn-Arne Johansen <faj@bzz.no>
+Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 5), po-debconf, smarty-gettext, php5-cli, quilt (>= 0.46-7~)
Package: slbackup-php
Architecture: all
diff -Nru slbackup-php-0.3/debian/patches/001_slbackup-php_cookie+request-merge.patch slbackup-php-0.3/debian/patches/001_slbackup-php_cookie+request-merge.patch
--- slbackup-php-0.3/debian/patches/001_slbackup-php_cookie+request-merge.patch 1970-01-01 01:00:00.000000000 +0100
+++ slbackup-php-0.3/debian/patches/001_slbackup-php_cookie+request-merge.patch 2012-01-19 15:32:00.000000000 +0100
@@ -0,0 +1,75 @@
+Description: Fix returning to the login page on every click
+ Fix returning to the login page on every click
+
+ This patch closes Debian BTS issue #655832.
+.
+ This patch is not forwarded to upstream as Debian Edu
+ seems to become upstream and package maintainer for
+ next (wheezy) release.
+Forwarded: not-needed
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+--- a/src/index.php
++++ b/src/index.php
+@@ -570,21 +570,33 @@
+ loadConfig () ;
+ require('/usr/share/php/smarty/libs/Smarty.class.php') ;
+ session_start() ;
+-$authenticated = ($_COOKIE['Authenticated'] == "True") ;
+ loadLocale () ;
+ ob_start ();
+
+ $smarty = new Smarty();
+ $smarty->template_dir = $smarty_templ ;
+ $smarty->compile_dir = $smarty_compile ;
++unset ($_COOKIE['smarty_templ']);
++unset ($_COOKIE['smarty_compile']);
+
+ # fetch script to use whith passing the ssh-password
+ $ssh_askpass = sprintf ("%s/script/mypass.sh",
+ dirname (dirname ($_SERVER["SCRIPT_FILENAME"])));
+
++$arguments = $_REQUEST;
++
++# merge _COOKIE and _REQUEST
++$allowed_cookie_keys = array('nonhttps', 'xorstring', 'PHPSESSID', 'locale',);
++foreach ($_COOKIE as $key => $value) {
++ if ((! array_key_exists($key, $arguments)) && (in_array($key, $allowed_cookie_keys))) {
++ if (is_string($key) && is_string($value)) {
++ $arguments[$key] = $value;
++ }
++ }
++}
+
+ # Fetch arguments passed as the script is executed
+-foreach ($_REQUEST as $key => $value) {
++foreach ($arguments as $key => $value) {
+ switch ($key) {
+ case "smarty_templ":
+ case "smarty_compile":
+@@ -597,7 +609,7 @@
+ break ;
+ case "xorstring":
+ if (empty($passwd))
+- $xorstring = $value ;
++ $xorstring = base64_decode($value) ;
+ else break ;
+ if (empty ($value))
+ break ;
+@@ -640,6 +652,8 @@
+ }
+ }
+
++unset ($arguments);
++
+ if ($submit == "logout") {
+ unset ($passwd) ;
+ unset ($xorstring) ;
+@@ -666,7 +680,7 @@
+ $xorstring = xorstring ($encrypt, $passwd) ;
+ }
+
+-setcookie ('xorstring', $xorstring) ;
++setcookie ('xorstring', base64_encode($xorstring)) ;
+
+ $scheduler = readcron ($passwd) ;
+
diff -Nru slbackup-php-0.3/debian/patches/002_slbackup-php_restore-paths-with-blanks.patch slbackup-php-0.3/debian/patches/002_slbackup-php_restore-paths-with-blanks.patch
--- slbackup-php-0.3/debian/patches/002_slbackup-php_restore-paths-with-blanks.patch 1970-01-01 01:00:00.000000000 +0100
+++ slbackup-php-0.3/debian/patches/002_slbackup-php_restore-paths-with-blanks.patch 2012-01-19 15:32:00.000000000 +0100
@@ -0,0 +1,149 @@
+Description: Fix restoring files with blanks in their name.
+ Fix restoring files with blanks in their name.
+
+ This patch is not forwarded to upstream as Debian Edu
+ seems to become upstream and package maintainer for
+ next (wheezy) release.
+
+ This patch closes Debian BTS issue #565181.
+Forwarded: not-needed
+Author: Cyril ETCHEVERRIA <cyril.e@wanadoo.fr>
+--- a/templates/restore.tpl
++++ b/templates/restore.tpl
+@@ -42,13 +42,13 @@
+ <IMG SRC="/icons/generic.gif" alt="[ ]">
+ {/if}
+ {if $dir.type == "file"}
+- <A HREF=index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}</A>
++ <A HREF="index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}">{$dir.name}</A>
+ {elseif $dir.type == "delfile"}
+- <A HREF=index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}(deleted)</A>
++ <A HREF="index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}">{$dir.name}(deleted)</A>
+ {elseif $dir.type == deldir}
+- <A HREF=index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name} ({t}Deleted{/t})</A>
++ <A HREF="index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}">{$dir.name} ({t}Deleted{/t})</A>
+ {else}
+- <A HREF=index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}</A>
++ <A HREF="index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}">{$dir.name}</A>
+ {/if}
+ <BR>
+ {/foreach}
+@@ -59,13 +59,13 @@
+ <IMG SRC="/icons/transfer.gif" alt="[ ]">
+ {/if}
+ {if $version.type == "parent"}
+- <A HREF=index.php?restorelocation&client={$client}&sub={$version.sub}&location={$location}>{$version.name}</A>
++ <A HREF="index.php?restorelocation&client={$client}&sub={$version.sub}&location={$location}">{$version.name}</A>
+ {elseif $version.type == "currentfile"}
+- <A HREF=index.php?restorefile&client={$client}&file={$version.sub}&location={$location}&revision=current>current</A>
++ <A HREF="index.php?restorefile&client={$client}&file={$version.sub}&location={$location}&revision=current">current</A>
+ {elseif $version.type == "diff.gz"}
+- <A HREF=index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}>{$version.ts}</A>
++ <A HREF="index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}">{$version.ts}</A>
+ {elseif $version.type == "snapshot.gz"}
+- <A HREF=index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}>{$version.ts}</A>
++ <A HREF="index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}">{$version.ts}</A>
+ {else}
+ unknown snapshot type $version.type
+ {/if}
+--- a/src/index.php
++++ b/src/index.php
+@@ -71,7 +71,7 @@
+ function removesnapshots ($passwd, $clientdir, $snapshot) {
+ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
+
+- $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force --remove-older-than %s %s'",
++ $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force --remove-older-than %s \"%s\"'",
+ $ssh_options, $backupuser,
+ $backuphost, $snapshot, $clientdir) ;
+
+@@ -98,7 +98,7 @@
+ function listsnapshots ($passwd, $clientdir) {
+ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
+
+- $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data -maxdepth 1 -name \"increments.*\" -printf %s'",
++ $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data\" -maxdepth 1 -name \"increments.*\" -printf %s'",
+ $ssh_options, $backupuser,
+ $backuphost, $clientdir, '"%P\n"') ;
+
+@@ -126,7 +126,7 @@
+ function fetchfile ($passwd, $clientdir, $location, $file) {
+ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
+
+- $cmd = sprintf ("ssh %s %s@%s 'cat %s%s/%s'",
++ $cmd = sprintf ("ssh %s %s@%s 'cat \"%s%s/%s\"'",
+ $ssh_options, $backupuser,
+ $backuphost, $clientdir, $location, $file ) ;
+
+@@ -169,7 +169,7 @@
+ } else unset ($tempfile) ;
+ if (empty($tempfile))
+ return ;
+- $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force %s/rdiff-backup-data/increments%s/%s %s'",
++ $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force \"%s/rdiff-backup-data/increments%s/%s %s\"'",
+ $ssh_options, $backupuser,
+ $backuphost, $clientdir, $location, $file, $tempfile ) ;
+
+@@ -180,7 +180,7 @@
+ fclose ($pipes[1]) ;
+ proc_close ($proc) ;
+ }
+- $cmd = sprintf ("ssh %s %s@%s 'cat %s && rm %s'",
++ $cmd = sprintf ("ssh %s %s@%s 'cat \"%s\" && rm \"%s\"'",
+ $ssh_options, $backupuser,
+ $backuphost, $tempfile, $tempfile) ;
+ $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ;
+@@ -213,7 +213,7 @@
+
+ $env = array ('SSH_ASKPASS' => $ssh_askpass,
+ 'DISPLAY' => ':nowhere') ;
+- $cmd = sprintf ("ssh %s %s@%s 'find %s%s/%s -maxdepth 1 -mindepth 1 -type f -name %s'",
++ $cmd = sprintf ("ssh %s %s@%s 'find \"%s%s/%s\" -maxdepth 1 -mindepth 1 -type f -name \"%s\"'",
+ $ssh_options, $backupuser,
+ $backuphost, $clientdir, $location, $parent, $base ) ;
+ $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ;
+@@ -230,7 +230,7 @@
+ proc_close ($proc) ;
+ }
+ $baselen= strlen ($base) ;
+- $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data/increments%s/%s -maxdepth 1 -mindepth 1 -type f -name \"%s*.gz\"'",
++ $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data/increments%s/%s\" -maxdepth 1 -mindepth 1 -type f -name \"%s*.gz\"'",
+ $ssh_options, $backupuser,
+ $backuphost, $clientdir, $location, $parent, $base ) ;
+
+@@ -283,7 +283,7 @@
+
+ $env = array ('SSH_ASKPASS' => $ssh_askpass,
+ 'DISPLAY' => ':nowhere') ;
+- $cmd = sprintf ("ssh %s %s@%s 'find %s%s/%s -maxdepth 1 -mindepth 1 -type d'",
++ $cmd = sprintf ("ssh %s %s@%s 'find \"%s%s/%s\" -maxdepth 1 -mindepth 1 -type d'",
+ $ssh_options, $backupuser,
+ $backuphost, $clientdir, $location, $sub ) ;
+ $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ;
+@@ -299,7 +299,7 @@
+ fclose ($pipes[1]) ;
+ proc_close ($proc) ;
+ }
+- $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data/increments%s/%s -maxdepth 1 -mindepth 1 -type d'",
++ $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data/increments%s/%s\" -maxdepth 1 -mindepth 1 -type d'",
+ $ssh_options, $backupuser,
+ $backuphost, $clientdir, $location, $sub ) ;
+ $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ;
+@@ -322,7 +322,7 @@
+ fclose ($pipes[1]) ;
+ proc_close ($proc) ;
+ }
+- $cmd = sprintf ("ssh %s %s@%s 'find %s%s/%s -maxdepth 1 -mindepth 1 -type f'",
++ $cmd = sprintf ("ssh %s %s@%s 'find \"%s%s/%s\" -maxdepth 1 -mindepth 1 -type f'",
+ $ssh_options, $backupuser,
+ $backuphost, $clientdir, $location, $sub ) ;
+
+@@ -339,7 +339,7 @@
+ fclose ($pipes[1]) ;
+ proc_close ($proc) ;
+ }
+- $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data/increments%s/%s -maxdepth 1 -mindepth 1 -type f -name \"*.snapshot.gz\"'",
++ $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data/increments%s/%s\" -maxdepth 1 -mindepth 1 -type f -name \"*.snapshot.gz\"'",
+ $ssh_options, $backupuser,
+ $backuphost, $clientdir, $location, $sub ) ;
+ $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ;
diff -Nru slbackup-php-0.3/debian/patches/003_slbackup-php_fix-failed-in-status-template.patch slbackup-php-0.3/debian/patches/003_slbackup-php_fix-failed-in-status-template.patch
--- slbackup-php-0.3/debian/patches/003_slbackup-php_fix-failed-in-status-template.patch 1970-01-01 01:00:00.000000000 +0100
+++ slbackup-php-0.3/debian/patches/003_slbackup-php_fix-failed-in-status-template.patch 2012-01-17 20:19:48.000000000 +0100
@@ -0,0 +1,13 @@
+Index: slbackup-php/templates/status.tpl
+===================================================================
+--- slbackup-php.orig/templates/status.tpl 2012-01-17 20:18:55.000000000 +0100
++++ slbackup-php/templates/status.tpl 2012-01-17 20:19:40.000000000 +0100
+@@ -29,7 +29,7 @@
+ {if $values.ok > $values.failed }
+ {t 1=$values.ok|date_format:"%c"}OK at %1{/t}
+ {elseif $values.failed <> ''}
+- {t 1=$values.ok|date_format:"%c"}Failed at %1{/t}
++ {t 1=$values.failed|date_format:"%c"}Failed at %1{/t}
+ {elseif $values.started == ''}
+ {t}Client never backed up{/t}
+ {/if}
diff -Nru slbackup-php-0.3/debian/patches/series slbackup-php-0.3/debian/patches/series
--- slbackup-php-0.3/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ slbackup-php-0.3/debian/patches/series 2012-01-19 15:36:04.000000000 +0100
@@ -0,0 +1,3 @@
+001_slbackup-php_cookie+request-merge.patch
+002_slbackup-php_restore-paths-with-blanks.patch
+003_slbackup-php_fix-failed-in-status-template.patch
diff -Nru slbackup-php-0.3/debian/po/cs.po slbackup-php-0.3/debian/po/cs.po
--- slbackup-php-0.3/debian/po/cs.po 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/po/cs.po 2012-01-19 15:40:03.000000000 +0100
@@ -11,10 +11,10 @@
"PO-Revision-Date: 2007-06-25 09:16+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
-"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
#. Type: boolean
#. Description
diff -Nru slbackup-php-0.3/debian/po/da.po slbackup-php-0.3/debian/po/da.po
--- slbackup-php-0.3/debian/po/da.po 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/po/da.po 2012-01-19 15:40:03.000000000 +0100
@@ -11,10 +11,10 @@
"PO-Revision-Date: 2010-05-10 17:30+01:00\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
#. Type: boolean
#. Description
diff -Nru slbackup-php-0.3/debian/po/de.po slbackup-php-0.3/debian/po/de.po
--- slbackup-php-0.3/debian/po/de.po 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/po/de.po 2012-01-19 15:40:03.000000000 +0100
@@ -10,10 +10,10 @@
"PO-Revision-Date: 2007-06-24 19:55+0200\n"
"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
-"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
#. Type: boolean
#. Description
diff -Nru slbackup-php-0.3/debian/po/es.po slbackup-php-0.3/debian/po/es.po
--- slbackup-php-0.3/debian/po/es.po 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/po/es.po 2012-01-19 15:40:03.000000000 +0100
@@ -35,10 +35,10 @@
"PO-Revision-Date: 2010-04-07 10:36+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
#. Type: boolean
#. Description
diff -Nru slbackup-php-0.3/debian/po/eu.po slbackup-php-0.3/debian/po/eu.po
--- slbackup-php-0.3/debian/po/eu.po 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/po/eu.po 2012-01-19 15:40:03.000000000 +0100
@@ -11,10 +11,10 @@
"PO-Revision-Date: 2007-06-25 11:00+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>, 2007\n"
"Language-Team: Euskara <Librezale@librezale.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
#. Type: boolean
#. Description
diff -Nru slbackup-php-0.3/debian/po/fi.po slbackup-php-0.3/debian/po/fi.po
--- slbackup-php-0.3/debian/po/fi.po 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/po/fi.po 2012-01-19 15:40:03.000000000 +0100
@@ -6,10 +6,10 @@
"PO-Revision-Date: 2008-03-01 22:35+0200\n"
"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
-"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
"X-Poedit-Language: Finnish\n"
"X-Poedit-Country: FINLAND\n"
diff -Nru slbackup-php-0.3/debian/po/fr.po slbackup-php-0.3/debian/po/fr.po
--- slbackup-php-0.3/debian/po/fr.po 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/po/fr.po 2012-01-19 15:40:03.000000000 +0100
@@ -11,10 +11,10 @@
"PO-Revision-Date: 2007-06-30 11:30+0200\n"
"Last-Translator: Hugues Naulet <hnaulet@gmail.com>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
#. Type: boolean
#. Description
@@ -29,8 +29,8 @@
"Please note that SSL is needed to connect to the slbackup-php server. "
"Activating it is therefore strongly recommended."
msgstr ""
-"Veuillez noter que SSL est nécessaire pour se connecter au serveur « "
-"slbackup-php ».Son activation est donc fortement recommandée."
+"Veuillez noter que SSL est nécessaire pour se connecter au serveur « slbackup-"
+"php ».Son activation est donc fortement recommandée."
#. Type: boolean
#. Description
diff -Nru slbackup-php-0.3/debian/po/gl.po slbackup-php-0.3/debian/po/gl.po
--- slbackup-php-0.3/debian/po/gl.po 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/po/gl.po 2012-01-19 15:40:03.000000000 +0100
@@ -10,10 +10,10 @@
"PO-Revision-Date: 2007-06-25 00:41+0200\n"
"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
-"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
#. Type: boolean
#. Description
diff -Nru slbackup-php-0.3/debian/po/ja.po slbackup-php-0.3/debian/po/ja.po
--- slbackup-php-0.3/debian/po/ja.po 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/po/ja.po 2012-01-19 15:40:03.000000000 +0100
@@ -10,10 +10,10 @@
"PO-Revision-Date: 2009-10-25 06:52+0900\n"
"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
-"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
#. Type: boolean
#. Description
diff -Nru slbackup-php-0.3/debian/po/nl.po slbackup-php-0.3/debian/po/nl.po
--- slbackup-php-0.3/debian/po/nl.po 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/po/nl.po 2012-01-19 15:40:03.000000000 +0100
@@ -11,10 +11,10 @@
"PO-Revision-Date: 2007-10-26 13:30+0100\n"
"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
"X-Poedit-Language: Dutch\n"
#. Type: boolean
diff -Nru slbackup-php-0.3/debian/po/pt.po slbackup-php-0.3/debian/po/pt.po
--- slbackup-php-0.3/debian/po/pt.po 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/po/pt.po 2012-01-19 15:40:03.000000000 +0100
@@ -11,10 +11,10 @@
"PO-Revision-Date: 2007-06-25 09:20+0000\n"
"Last-Translator: Ricardo Silva <ardoric@gmail.com>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
-"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
#. Type: boolean
#. Description
diff -Nru slbackup-php-0.3/debian/po/ru.po slbackup-php-0.3/debian/po/ru.po
--- slbackup-php-0.3/debian/po/ru.po 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/po/ru.po 2012-01-19 15:40:03.000000000 +0100
@@ -11,13 +11,13 @@
"PO-Revision-Date: 2007-07-01 19:18+0400\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
-"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#. Type: boolean
#. Description
diff -Nru slbackup-php-0.3/debian/po/sv.po slbackup-php-0.3/debian/po/sv.po
--- slbackup-php-0.3/debian/po/sv.po 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/po/sv.po 2012-01-19 15:40:03.000000000 +0100
@@ -11,10 +11,10 @@
"PO-Revision-Date: 2007-06-24 15:22+0200\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
-"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
#. Type: boolean
#. Description
diff -Nru slbackup-php-0.3/debian/po/vi.po slbackup-php-0.3/debian/po/vi.po
--- slbackup-php-0.3/debian/po/vi.po 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/po/vi.po 2012-01-19 15:40:03.000000000 +0100
@@ -10,10 +10,10 @@
"PO-Revision-Date: 2007-06-25 21:32+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
-"Language: vi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: LocFactoryEditor 1.6.4a3\n"
diff -Nru slbackup-php-0.3/debian/README.source slbackup-php-0.3/debian/README.source
--- slbackup-php-0.3/debian/README.source 1970-01-01 01:00:00.000000000 +0100
+++ slbackup-php-0.3/debian/README.source 2012-01-19 15:32:00.000000000 +0100
@@ -0,0 +1,58 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ break
+ fi
+ done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+ quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches. Then, for every file that will be modified by this patch,
+run:
+
+ quilt add <file>
+
+before editing those files. You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly. After editing the files, run:
+
+ quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+ quilt import -P <patch> /path/to/patch
+ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches. The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
diff -Nru slbackup-php-0.3/debian/rules slbackup-php-0.3/debian/rules
--- slbackup-php-0.3/debian/rules 2012-01-19 18:28:48.000000000 +0100
+++ slbackup-php-0.3/debian/rules 2012-01-19 15:32:00.000000000 +0100
@@ -14,13 +14,15 @@
dh_testroot
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) clean
+ dh_quilt_unpatch
dh_clean
debconf-updatepo
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_clean -k
+ dh_quilt_patch
-$(MAKE) mo-files
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/slbackup-php prefix=/usrAttachment:
pgpF33pCIf_0P.pgp
Description: Digitale PGP-Unterschrift