[debian-edu-commits] debian-edu/slbackup-php.git (#11) - edu-wheezy (branch) updated: debian/0.3-2.2-10-g7e1e7e5

[Mike Gabriel]

The branch, edu-wheezy has been updated
       via  7e1e7e5f516668d9118e2b294b6cec19a53c2e2a (commit)
      from  730316e8db53c1254e9db8430c484284e9b833ec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                             |    1 +
 debian/patches/001_slbackup-php_cookie+request-merge.patch   |   10 ++++++++++
 .../patches/002_slbackup-php_restore-paths-with-blanks.patch |    6 +++++-
 debian/patches/101_slbackup-php_i18n-de.patch                |    8 ++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 02b29b2..f0fd70b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ slbackup-php (0.3-2.3) UNRELEASED; urgency=low
   * 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 at wanadoo.fr> -> thanks!
+  * Add/update patch headers.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 15 Jan 2012 13:40:20 +0100
 
diff --git a/debian/patches/001_slbackup-php_cookie+request-merge.patch b/debian/patches/001_slbackup-php_cookie+request-merge.patch
index 66fad53..1d374b4 100644
--- a/debian/patches/001_slbackup-php_cookie+request-merge.patch
+++ b/debian/patches/001_slbackup-php_cookie+request-merge.patch
@@ -1,3 +1,13 @@
+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 at das-netzwerkteam.de>
 --- a/src/index.php	2012-01-15 12:53:18.000000000 +0100
 +++ b/src/index.php	2012-01-15 14:36:19.000000000 +0100
 @@ -570,21 +570,33 @@
diff --git a/debian/patches/002_slbackup-php_restore-paths-with-blanks.patch b/debian/patches/002_slbackup-php_restore-paths-with-blanks.patch
index 97fe0b2..8255e50 100644
--- a/debian/patches/002_slbackup-php_restore-paths-with-blanks.patch
+++ b/debian/patches/002_slbackup-php_restore-paths-with-blanks.patch
@@ -1,7 +1,11 @@
 Description: Fix restoring files with blanks in their name.
  Fix restoring files with blanks in their name.
  
- This patches closes Debian BTS issue #565181.
+ 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 at wanadoo.fr>
 --- a/templates/restore.tpl
diff --git a/debian/patches/101_slbackup-php_i18n-de.patch b/debian/patches/101_slbackup-php_i18n-de.patch
index eaefbbe..3d26883 100644
--- a/debian/patches/101_slbackup-php_i18n-de.patch
+++ b/debian/patches/101_slbackup-php_i18n-de.patch
@@ -1,3 +1,11 @@
+Description: German translation of the SLBackup WebGUI
+ German translation of the SLBackup WebGUI.
+ 
+ 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 at das-netzwerkteam.de>
 --- /dev/null
 +++ b/po/de.po
 @@ -0,0 +1,290 @@


hooks/post-receive
-- 
slbackup-php.git (Debian package slbackup-php)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup-php.git" (Debian package slbackup-php).