r135 - trunk/debian/patches

Sun Nov 9 16:56:42 UTC 2008

Author: rousseau
Date: 2008-11-09 16:56:42 +0000 (Sun, 09 Nov 2008)
New Revision: 135

Modified:
   trunk/debian/patches/04_bins-edit-gui
   trunk/debian/patches/05_share-man
   trunk/debian/patches/06_doc_bins.sgml
   trunk/debian/patches/07_fix_share
   trunk/debian/patches/08_fix_bins-edit-gui_encoding
   trunk/debian/patches/09_fix_wrong_relpath
   trunk/debian/patches/10_symlinks_movies
   trunk/debian/patches/11_check_template_style
   trunk/debian/patches/12_optional_xml_elements
   trunk/debian/patches/13_locale_encoding
   trunk/debian/patches/14_bins-edit-gui
   trunk/debian/patches/15_example_css
   trunk/debian/patches/16_examples_html
   trunk/debian/patches/17_bins
   trunk/debian/patches/18_bins-memory-leak
   trunk/debian/patches/19_bins-insert-directory
   trunk/debian/patches/20_bins-syscall
   trunk/debian/patches/21_bins-trim
   trunk/debian/patches/22_bins-hash-ref
Log:
remove dpatch specific lines sinc we now use quilt


Modified: trunk/debian/patches/04_bins-edit-gui
===================================================================

--- trunk/debian/patches/04_bins-edit-gui	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/04_bins-edit-gui	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,10 +1,8 @@
-#!/bin/sh -e
-## bins-edit-gui by Ludovic Rousseau <rousseau at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: bins-edit-gui.glade is in /usr/share/bins/ instead of
-## DP: /usr/local/share/bins/
+bins-edit-gui by Ludovic Rousseau <rousseau at debian.org>
 
+bins-edit-gui.glade is in /usr/share/bins/ instead of
+/usr/local/share/bins/
+
 --- bins-1.1.29.orig/bins-edit-gui
 +++ bins-1.1.29/bins-edit-gui
 @@ -138,7 +138,7 @@

Modified: trunk/debian/patches/05_share-man
===================================================================
--- trunk/debian/patches/05_share-man	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/05_share-man	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,9 +1,7 @@
-#!/bin/sh -e
-## 05-share-man by Martin Michlmayr <tbm at cyrius.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Install man pages in the right directory
+05-share-man by Martin Michlmayr <tbm at cyrius.com>
 
+Install man pages in the right directory
+
 --- bins-1.1.29.orig/install.sh
 +++ bins-1.1.29/install.sh
 @@ -36,7 +36,7 @@

Modified: trunk/debian/patches/06_doc_bins.sgml
===================================================================
--- trunk/debian/patches/06_doc_bins.sgml	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/06_doc_bins.sgml	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,11 +1,8 @@
-#!/bin/sh -e
-## doc/bins.sgml by Ludovic Rousseau <rousseau at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: the template are not in the upstream defined directory (/etc/bins)
-## DP: but in /usr/share/bins/
+doc/bins.sgml by Ludovic Rousseau <rousseau at debian.org>
 
- at DPATCH@
+the template are not in the upstream defined directory (/etc/bins)
+but in /usr/share/bins/
+
 --- bins-1.1.29.orig/doc/bins.sgml
 +++ bins-1.1.29/doc/bins.sgml
 @@ -188,7 +188,7 @@

Modified: trunk/debian/patches/07_fix_share
===================================================================
--- trunk/debian/patches/07_fix_share	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/07_fix_share	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,9 +1,7 @@
-#!/bin/sh -e
-## 07_fix_share.dpatch by Martin Michlmayr <tbm at cyrius.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use correct dir for share, Bug#327797
+07_fix_share.dpatch by Martin Michlmayr <tbm at cyrius.com>
 
+use correct dir for share, Bug#327797
+
 --- bins-1.1.29.orig/install.sh
 +++ bins-1.1.29/install.sh
 @@ -24,8 +24,9 @@

Modified: trunk/debian/patches/08_fix_bins-edit-gui_encoding
===================================================================
--- trunk/debian/patches/08_fix_bins-edit-gui_encoding	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/08_fix_bins-edit-gui_encoding	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_fix_bins-edit-gui_encoding.dpatch by  <rousseau at acer.maison.bogus>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
 --- bins-1.1.29.orig/bins-edit-gui
 +++ bins-1.1.29/bins-edit-gui
 @@ -121,10 +121,10 @@

Modified: trunk/debian/patches/09_fix_wrong_relpath
===================================================================
--- trunk/debian/patches/09_fix_wrong_relpath	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/09_fix_wrong_relpath	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,9 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_fix_wrong_relpath.dpatch by Martin Michlmayr <tbm at cyrius.com>
-##
-## DP: Fix a off by one in relpath() [#334088]
+09_fix_wrong_relpath.dpatch by Martin Michlmayr <tbm at cyrius.com>
 
- at DPATCH@
+Fix a off by one in relpath() [#334088]
+
 --- bins-1.1.29.orig/bins
 +++ bins-1.1.29/bins
 @@ -1151,7 +1151,7 @@

Modified: trunk/debian/patches/10_symlinks_movies
===================================================================
--- trunk/debian/patches/10_symlinks_movies	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/10_symlinks_movies	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,9 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_symlinks_movies.dpatch by Martin Michlmayr <tbm at cyrius.com>
-##
-## DP: Support linkInsteadOfCopy for movies [#334064]
+10_symlinks_movies.dpatch by Martin Michlmayr <tbm at cyrius.com>
 
- at DPATCH@
+Support linkInsteadOfCopy for movies [#334064]
+
 --- bins-1.1.29.orig/bins
 +++ bins-1.1.29/bins
 @@ -1849,7 +1849,20 @@

Modified: trunk/debian/patches/11_check_template_style
===================================================================
--- trunk/debian/patches/11_check_template_style	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/11_check_template_style	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,9 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_check_template_style.dpatch by Martin Michlmayr <tbm at cyrius.com>
-##
-## DP: Check if template style exists before processing images [#308114]
+11_check_template_style.dpatch by Martin Michlmayr <tbm at cyrius.com>
 
- at DPATCH@
+Check if template style exists before processing images [#308114]
+
 --- bins-1.1.29.orig/bins
 +++ bins-1.1.29/bins
 @@ -1092,6 +1092,11 @@

Modified: trunk/debian/patches/12_optional_xml_elements
===================================================================
--- trunk/debian/patches/12_optional_xml_elements	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/12_optional_xml_elements	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,10 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_optional_xml_elements.dpatch  by Martin Michlmayr <tbm at cyrius.com>
-##
-## DP: Make XML elements optional and check whether the XML files are
-## DP: valid bins files [#308338]
+12_optional_xml_elements.dpatch  by Martin Michlmayr <tbm at cyrius.com>
 
- at DPATCH@
+Make XML elements optional and check whether the XML files are
+valid bins files [#308338]
+
 --- bins-1.1.29.orig/bins
 +++ bins-1.1.29/bins
 @@ -3899,10 +3899,14 @@

Modified: trunk/debian/patches/13_locale_encoding
===================================================================
--- trunk/debian/patches/13_locale_encoding	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/13_locale_encoding	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 13_locale_encoding.dpatch by Jérôme Sautret
-##
-## DP: convert latin-1 output to locale [#308111]
+13_locale_encoding.dpatch by Jérôme Sautret
 
- at DPATCH@
+convert latin-1 output to locale [#308111]
 
 --- bins-1.1.29.orig/bins
 +++ bins-1.1.29/bins

Modified: trunk/debian/patches/14_bins-edit-gui
===================================================================
--- trunk/debian/patches/14_bins-edit-gui	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/14_bins-edit-gui	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_bins-edit-gui.dpatch by  <rousseau at macbox.maison.bogus>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
 --- bins-1.1.29.orig/bins-edit-gui
 +++ bins-1.1.29/bins-edit-gui
 @@ -38,8 +38,33 @@

Modified: trunk/debian/patches/15_example_css
===================================================================
--- trunk/debian/patches/15_example_css	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/15_example_css	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15_example_css.dpatch by  <rousseau at macbox.maison.bogus>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
 --- /dev/null
 +++ bins-1.1.29/doc/example.css
 @@ -0,0 +1,80 @@

Modified: trunk/debian/patches/16_examples_html
===================================================================
--- trunk/debian/patches/16_examples_html	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/16_examples_html	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 16_examples_html.dpatch by  <rousseau at macbox.maison.bogus>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
 --- bins-1.1.29.orig/doc/examples.html
 +++ bins-1.1.29/doc/examples.html
 @@ -92,6 +92,6 @@

Modified: trunk/debian/patches/17_bins
===================================================================
--- trunk/debian/patches/17_bins	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/17_bins	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 17_bin.dpatch by  <rousseau at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
 --- bins-1.1.29.orig/bins
 +++ bins-1.1.29/bins
 @@ -547,7 +547,7 @@

Modified: trunk/debian/patches/18_bins-memory-leak
===================================================================
--- trunk/debian/patches/18_bins-memory-leak	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/18_bins-memory-leak	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 18_bins-1.1.29-memory-leak.dpatch by  <rousseau at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
 --- bins-1.1.29.orig/bins
 +++ bins-1.1.29/bins
 @@ -449,13 +449,13 @@

Modified: trunk/debian/patches/19_bins-insert-directory
===================================================================
--- trunk/debian/patches/19_bins-insert-directory	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/19_bins-insert-directory	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 19_bins-1.1.29-insert-directory.dpatch by  <rousseau at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
 --- bins-1.1.29.orig/bins
 +++ bins-1.1.29/bins
 @@ -399,6 +399,10 @@

Modified: trunk/debian/patches/20_bins-syscall
===================================================================
--- trunk/debian/patches/20_bins-syscall	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/20_bins-syscall	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,10 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_bins-1.1.29-syscall.dpatch by  <rousseau at localhost.localdomain>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
 --- bins-1.1.29.orig/bins
 +++ bins-1.1.29/bins
 @@ -3546,13 +3546,14 @@

Modified: trunk/debian/patches/21_bins-trim
===================================================================
--- trunk/debian/patches/21_bins-trim	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/21_bins-trim	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,11 +1,3 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 21_bins-trim.dpatch by  <rousseau at imac.maison.bogus>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add -trim argument to jpegtran.
-## DP: Closes: #284157: bins: avoidable jpegtran image corruption
-
- at DPATCH@
 --- bins-1.1.29.orig/bins
 +++ bins-1.1.29/bins
 @@ -4894,7 +4894,7 @@

Modified: trunk/debian/patches/22_bins-hash-ref
===================================================================
--- trunk/debian/patches/22_bins-hash-ref	2008-08-06 19:32:16 UTC (rev 134)
+++ trunk/debian/patches/22_bins-hash-ref	2008-11-09 16:56:42 UTC (rev 135)
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 22_hash_ref.dpatch by  <rousseau at imac.maison.bogus>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Closes: #481662 bins: Crashes mid-album
+22_hash_ref.dpatch by  <rousseau at imac.maison.bogus>
 
- at DPATCH@
+Closes: #481662 bins: Crashes mid-album
+
 --- bins-1.1.29.orig/bins
 +++ bins-1.1.29/bins
 @@ -3750,8 +3750,8 @@


