[debian-edu-commits] debian-edu/ 04/06: Refresh patches, now handled with gbp pq

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository algobox.

commit 71a34931509f4736dd484e1d4627411b8fbd4a3f
Author: David Prévot <taffit at debian.org>
Date:   Thu Aug 28 08:19:30 2014 -0400

    Refresh patches, now handled with gbp pq
    
    Git-Dch: Ignore
---
 ...y.patch => 0001-Fix-desktop-entry-syntax.patch} | 20 ++++++++++++++------
 ... => 0002-Use-fonts-from-fonts-liberation.patch} | 22 +++++++++++++++-------
 debian/patches/series                              |  4 ++--
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/debian/patches/Fix_desktop-entry.patch b/debian/patches/0001-Fix-desktop-entry-syntax.patch
similarity index 57%
rename from debian/patches/Fix_desktop-entry.patch
rename to debian/patches/0001-Fix-desktop-entry-syntax.patch
index daeeb30..052f02a 100644
--- a/debian/patches/Fix_desktop-entry.patch
+++ b/debian/patches/0001-Fix-desktop-entry-syntax.patch
@@ -1,9 +1,17 @@
-Description: Fix desktop-entry syntax
- Get rid of deprecated entries (Encoding, TerminalOptions), translate
- GenericName into English, and add Keywords entry.
-Author: David Prévot <taffit at debian.org>
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
+Date: Sat, 21 Sep 2013 10:39:17 -0400
+Subject: Fix desktop-entry syntax
+
+Get rid of deprecated entries (Encoding, TerminalOptions), translate
+GenericName into English, and add Keywords entry.
+
 Forwarded: <523E1938.2000701 at debian.org>
-Last-Update: 2013-09-21
+---
+ utilities/algobox.desktop | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/utilities/algobox.desktop b/utilities/algobox.desktop
+index f4027f4..14dbd4f 100644
 --- a/utilities/algobox.desktop
 +++ b/utilities/algobox.desktop
 @@ -1,11 +1,11 @@
@@ -20,7 +28,7 @@ Last-Update: 2013-09-21
  MimeType=
  Name[fr]=AlgoBox
  Name=AlgoBox
-@@ -13,6 +13,5 @@
+@@ -13,6 +13,5 @@ Name[POSIX]=AlgoBox
  Name[fr_FR]=AlgoBox
  StartupNotify=false
  Terminal=false
diff --git a/debian/patches/Use_fonts-liberation.patch b/debian/patches/0002-Use-fonts-from-fonts-liberation.patch
similarity index 59%
rename from debian/patches/Use_fonts-liberation.patch
rename to debian/patches/0002-Use-fonts-from-fonts-liberation.patch
index e17e4e2..9f1423d 100644
--- a/debian/patches/Use_fonts-liberation.patch
+++ b/debian/patches/0002-Use-fonts-from-fonts-liberation.patch
@@ -1,13 +1,21 @@
-Description: Use fonts from fonts-liberation
- Embedded sourceless Liberation fonts have been stripped away
- from the Debian source package
-Author: David Prévot <taffit at debian.org>
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
+Date: Mon, 23 Sep 2013 16:36:28 -0400
+Subject: Use fonts from fonts-liberation
+
+Embedded sourceless Liberation fonts have been stripped away
+from the Debian source package
+
 Forwarded: not-needed
-Last-Update: 2013-09-23
+---
+ algobox.qrc | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/algobox.qrc b/algobox.qrc
+index 7fcb2d2..ade2744 100644
 --- a/algobox.qrc
 +++ b/algobox.qrc
 @@ -77,14 +77,6 @@
-         <file>documents/apropos.txt</file>
+         <file>documents/aidefonction.txt</file>
          <file>documents/modelelatex.txt</file>
          <file>documents/interdits.txt</file>
 -        <file>documents/LiberationMono-Regular.ttf</file>
@@ -19,5 +27,5 @@ Last-Update: 2013-09-23
 -	<file>documents/LiberationSans-Italic.ttf</file>
 -	<file>documents/LiberationSans-Regular.ttf</file>
          <file>documents/completion.txt</file>
+ 	<file>utilities/license_html.txt</file>
      </qresource>
- </RCC>
diff --git a/debian/patches/series b/debian/patches/series
index 32a4bbf..690878b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-Fix_desktop-entry.patch
-Use_fonts-liberation.patch
+0001-Fix-desktop-entry-syntax.patch
+0002-Use-fonts-from-fonts-liberation.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/algobox.git