[tokkee]

tokkee.org

Code

projects / pkg-mlmmj.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2a63b99)
patches/: Cleaned up patches.
authorSebastian Harl <sh@tokkee.org>
Wed, 4 Mar 2009 18:47:17 +0000 (19:47 +0100)
committerSebastian Harl <sh@tokkee.org>
Wed, 4 Mar 2009 18:57:32 +0000 (19:57 +0100)
 * Don't use a custom /bin/sh script to execute the patches but use dpatch
   instead.
 * Use prefix "a" and "b" for path names.

debian/changelog patch | blob | history
debian/patches/02_fix_mlmmj_php.dpatch patch | blob | history
debian/patches/05_fix_displayed_full_paths.dpatch patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index 5bf799469fc348af02adfb5b27b6c728e1f1b3e0..12535d25d21688fe40c53f297248daff054014a5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,11 +22,13 @@ mlmmj (1.2.16-0.1) unstable; urgency=low
       of that itself.
   * debian/patches/:
     - Added short descriptions to all patches.
       of that itself.
   * debian/patches/:
     - Added short descriptions to all patches.
+    - Cleaned up patches: Don't use a custom /bin/sh script to execute the
+      patches but use dpatch instead. Use prefix "a" and "b" for path names.
     - Removed 01_debian_make_mlmmj-ml - instead added mlmmj-make-ml to debian/
       directly.
     - Removed unused 05_fix_call_to_free.
 
     - Removed 01_debian_make_mlmmj-ml - instead added mlmmj-make-ml to debian/
       directly.
     - Removed unused 05_fix_call_to_free.
 
- -- Sebastian Harl <sh@tokkee.org>  Wed, 04 Mar 2009 19:29:26 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Wed, 04 Mar 2009 19:46:29 +0100
 
 mlmmj (1.2.15-1.1) unstable; urgency=low
 
 
 mlmmj (1.2.15-1.1) unstable; urgency=low
 
diff --git a/debian/patches/02_fix_mlmmj_php.dpatch b/debian/patches/02_fix_mlmmj_php.dpatch
index f8a23dafb04d4994781f84ed4c59691a68d6bbab..5be580403ca5780c5f149ac83adada6b750b951e 100644 (file)
--- a/debian/patches/02_fix_mlmmj_php.dpatch
+++ b/debian/patches/02_fix_mlmmj_php.dpatch
@@ -1,12 +1,13 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_mlmmj_php.dpatch by  <boll@tristram.fork.dk>
+## 02_fix_mlmmj_php.dpatch by Søren Boll Overgaard <boll@tristram.fork.dk>
 ##
 ## DP: Adapt pathes used in the web interface to match the installation paths.
 
 @DPATCH@
 ##
 ## DP: Adapt pathes used in the web interface to match the installation paths.
 
 @DPATCH@
-diff -urNad mlmmj-1.2.7/contrib/web/php-admin/conf/config.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/conf/config.php
---- mlmmj-1.2.7/contrib/web/php-admin/conf/config.php  2005-05-12 18:36:37.000000000 +0200
-+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/conf/config.php 2005-05-12 18:52:05.000000000 +0200
+
+diff a/contrib/web/php-admin/conf/config.php b/contrib/web/php-admin/conf/config.php
+--- a/contrib/web/php-admin/conf/config.php
++++ b/contrib/web/php-admin/conf/config.php
 @@ -1,6 +1,6 @@
  <?php
  
 @@ -1,6 +1,6 @@
  <?php
  
@@ -15,9 +16,9 @@ diff -urNad mlmmj-1.2.7/contrib/web/php-admin/conf/config.php /tmp/dpep.1ZV6mc/m
 +$templatedir = "/usr/share/mlmmj-php-web-admin/templates/";
  
  ?>
 +$templatedir = "/usr/share/mlmmj-php-web-admin/templates/";
  
  ?>
-diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess
---- mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess      2005-05-12 18:36:37.000000000 +0200
-+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess     2005-05-12 18:52:05.000000000 +0200
+diff a/contrib/web/php-admin/htdocs/dot.htaccess b/contrib/web/php-admin/htdocs/dot.htaccess
+--- a/contrib/web/php-admin/htdocs/dot.htaccess
++++ b/contrib/web/php-admin/htdocs/dot.htaccess
 @@ -1,4 +1,5 @@
  Require valid-user
  AuthType Basic
 @@ -1,4 +1,5 @@
  Require valid-user
  AuthType Basic
@@ -26,9 +27,9 @@ diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess /tmp/dpep.1ZV6
 +AuthName "mlmmj web-interface on Debian GNU/Linux"
 +AuthUserFile /etc/mlmmj-php-web-admin/htpasswd
 +php_value include_path "/usr/share/mlmmj-php-web-admin"
 +AuthName "mlmmj web-interface on Debian GNU/Linux"
 +AuthUserFile /etc/mlmmj-php-web-admin/htpasswd
 +php_value include_path "/usr/share/mlmmj-php-web-admin"
-diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php
---- mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php  2005-05-12 18:36:37.000000000 +0200
-+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php 2005-05-12 18:52:05.000000000 +0200
+diff a/contrib/web/php-admin/htdocs/edit.php b/contrib/web/php-admin/htdocs/edit.php
+--- a/contrib/web/php-admin/htdocs/edit.php
++++ b/contrib/web/php-admin/htdocs/edit.php
 @@ -26,7 +26,7 @@
   * IN THE SOFTWARE.
   */
 @@ -26,7 +26,7 @@
   * IN THE SOFTWARE.
   */
@@ -38,9 +39,9 @@ diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php /tmp/dpep.1ZV6mc/m
  require("class.FastTemplate.php");
  
  function mlmmj_boolean($name, $nicename, $text) 
  require("class.FastTemplate.php");
  
  function mlmmj_boolean($name, $nicename, $text) 
-diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php
---- mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php 2005-05-12 18:36:37.000000000 +0200
-+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php        2005-05-12 18:52:05.000000000 +0200
+diff a/contrib/web/php-admin/htdocs/index.php b/contrib/web/php-admin/htdocs/index.php
+--- a/contrib/web/php-admin/htdocs/index.php
++++ b/contrib/web/php-admin/htdocs/index.php
 @@ -27,7 +27,7 @@
   */
  
 @@ -27,7 +27,7 @@
   */
  
@@ -50,9 +51,9 @@ diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php /tmp/dpep.1ZV6mc/
  
  $tpl = new FastTemplate($templatedir);
  
  
  $tpl = new FastTemplate($templatedir);
  
-diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php
---- mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php  2005-05-12 18:36:37.000000000 +0200
-+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php 2005-05-12 18:52:05.000000000 +0200
+diff a/contrib/web/php-admin/htdocs/save.php b/contrib/web/php-admin/htdocs/save.php
+--- a/contrib/web/php-admin/htdocs/save.php
++++ b/contrib/web/php-admin/htdocs/save.php
 @@ -26,7 +26,7 @@
   * IN THE SOFTWARE.
   */
 @@ -26,7 +26,7 @@
   * IN THE SOFTWARE.
   */
@@ -62,9 +63,9 @@ diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php /tmp/dpep.1ZV6mc/m
  require("class.FastTemplate.php");
  
  function mlmmj_boolean($name, $nicename, $text)
  require("class.FastTemplate.php");
  
  function mlmmj_boolean($name, $nicename, $text)
-diff -urNad mlmmj-1.2.7/contrib/web/php-user/example.html /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-user/example.html
---- mlmmj-1.2.7/contrib/web/php-user/example.html      2004-07-09 22:28:16.000000000 +0200
-+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-user/example.html     2005-05-12 18:53:51.000000000 +0200
+diff a/contrib/web/php-user/example.html b/contrib/web/php-user/example.html
+--- a/contrib/web/php-user/example.html
++++ b/contrib/web/php-user/example.html
 @@ -1,7 +1,7 @@
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
  <html>
 @@ -1,7 +1,7 @@
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
  <html>
diff --git a/debian/patches/05_fix_displayed_full_paths.dpatch b/debian/patches/05_fix_displayed_full_paths.dpatch
index f57e1dd0d06c7495ce9da73b010b200692ae6531..6a1345c92c3f817a7cdb522de60374d35289384e 100644 (file)
--- a/debian/patches/05_fix_displayed_full_paths.dpatch
+++ b/debian/patches/05_fix_displayed_full_paths.dpatch
@@ -1,31 +1,14 @@
-#! /bin/sh -e
-## 05_fix_displayed_full_paths.dpatch by  <boll@andariel>
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_fix_displayed_full_paths.dpatch by Søren Boll Overgaard <boll@andariel>
 ##
 ## DP: Adapt the path name of binaries in an error message to the paths as
 ## DP: used in the Debian package.
 
 ##
 ## DP: Adapt the path name of binaries in an error message to the paths as
 ## DP: used in the Debian package.
 
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
 @DPATCH@
 @DPATCH@
-diff -urNad /home/boll/mlmmj/mlmmj-1.0.0-RELEASE/include/mlmmj.h mlmmj-1.0.0-RELEASE/include/mlmmj.h
---- /home/boll/mlmmj/mlmmj-1.0.0-RELEASE/include/mlmmj.h       2004-09-07 11:49:10.000000000 +0000
-+++ mlmmj-1.0.0-RELEASE/include/mlmmj.h        2004-10-03 08:29:27.000000000 +0000
+
+diff a/include/mlmmj.h b/include/mlmmj.h
+--- a/include/mlmmj.h
++++ b/include/mlmmj.h
 @@ -70,7 +70,7 @@
  #define CHECKFULLPATH(name) if(strchr(name, '/') == NULL) { \
                        fprintf(stderr, "All mlmmj binaries have to " \
 @@ -70,7 +70,7 @@
  #define CHECKFULLPATH(name) if(strchr(name, '/') == NULL) { \
                        fprintf(stderr, "All mlmmj binaries have to " \
mlmmj Debian package