[Pkg-voip-commits] r2210 - in ari/trunk/debian: . patches

[Diego Iastrubni]

Author: elcuco-guest
Date: 2006-08-10 05:28:57 +0000 (Thu, 10 Aug 2006)
New Revision: 2210

Modified:
   ari/trunk/debian/
   ari/trunk/debian/dirs
   ari/trunk/debian/docs
   ari/trunk/debian/patches/00list
   ari/trunk/debian/patches/change-amp-functions-dir.dpatch
   ari/trunk/debian/patches/fix-include-glob.dpatch
   ari/trunk/debian/patches/remove-dir-warnings.dpatch
   ari/trunk/debian/rules
Log:
- the package was not been built because a missing "mergeWithUpstream" property was missing on the debian dir.
- rules now deletes another file which is distributed upstream and should not be packaged
- docs, dir, 00list did not contain an empty line at the end of the file
- *.dpatch now contain my full email, and comments

now it should build :)




Property changes on: ari/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: ari/trunk/debian/dirs
===================================================================
--- ari/trunk/debian/dirs	2006-08-09 18:29:57 UTC (rev 2209)
+++ ari/trunk/debian/dirs	2006-08-10 05:28:57 UTC (rev 2210)
@@ -8,3 +8,4 @@
 usr/share/ari/theme/
 usr/share/ari/theme/images/
 var/www/
+

Modified: ari/trunk/debian/docs
===================================================================
--- ari/trunk/debian/docs	2006-08-09 18:29:57 UTC (rev 2209)
+++ ari/trunk/debian/docs	2006-08-10 05:28:57 UTC (rev 2210)
@@ -1,2 +1,2 @@
 recordings/CHANGE.log
-recordings/README.txt
\ No newline at end of file
+recordings/README.txt

Modified: ari/trunk/debian/patches/00list
===================================================================
--- ari/trunk/debian/patches/00list	2006-08-09 18:29:57 UTC (rev 2209)
+++ ari/trunk/debian/patches/00list	2006-08-10 05:28:57 UTC (rev 2210)
@@ -2,4 +2,4 @@
 change-amp-functions-dir
 #remove-dir-warnings
 
-#fix-include-glob
\ No newline at end of file
+#fix-include-glob

Modified: ari/trunk/debian/patches/change-amp-functions-dir.dpatch
===================================================================
--- ari/trunk/debian/patches/change-amp-functions-dir.dpatch	2006-08-09 18:29:57 UTC (rev 2209)
+++ ari/trunk/debian/patches/change-amp-functions-dir.dpatch	2006-08-10 05:28:57 UTC (rev 2210)
@@ -1,6 +1,7 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## change-amp-functions-dir.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
 ##
+## All lines beginning with `## DP:' are a description of the patch.
 ## DP: ARI is not installed as part of freepbx, so we need to modify it's path. 
 
 @DPATCH@

Modified: ari/trunk/debian/patches/fix-include-glob.dpatch
===================================================================
--- ari/trunk/debian/patches/fix-include-glob.dpatch	2006-08-09 18:29:57 UTC (rev 2209)
+++ ari/trunk/debian/patches/fix-include-glob.dpatch	2006-08-10 05:28:57 UTC (rev 2210)
@@ -1,8 +1,8 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-include-glob.dpatch by  <diegolocal at turing.in.xorcom.com>
+## fix-include-glob.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: voicemail.conf can include other files (for example voicemail.d). we should load them anyway
 
 @DPATCH@
 diff -urNad ari-00.09.21/recordings/includes/login.php /tmp/dpep.7EJxV9/ari-00.09.21/recordings/includes/login.php

Modified: ari/trunk/debian/patches/remove-dir-warnings.dpatch
===================================================================
--- ari/trunk/debian/patches/remove-dir-warnings.dpatch	2006-08-09 18:29:57 UTC (rev 2209)
+++ ari/trunk/debian/patches/remove-dir-warnings.dpatch	2006-08-10 05:28:57 UTC (rev 2210)
@@ -1,8 +1,8 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-include-glob.dpatch by  <diegolocal at turing.in.xorcom.com>
+## fix-include-glob.dpatch by  Diego Iastrubni <diego.iastrubni at xorcom.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: No need to display this warning to the user
 
 @DPATCH@
 diff -urNad ari-00.09.21/recordings/modules/voicemail.module /tmp/dpep.w7Sskk/ari-00.09.21/recordings/modules/voicemail.module
@@ -22,7 +22,7 @@
          } 
          else {
 -          $_SESSION['ari_error'] .= sprintf(_("Path is not a directory: %s"),$path) . "<br>";
-+          // Do we really need to disturn the user with this...?
++          // Do we really need to disturb the user with this...?
 +          //$_SESSION['ari_error'] .= sprintf(_("Path is not a directory: %s"),$path) . "<br>";
          }
        }

Modified: ari/trunk/debian/rules
===================================================================
--- ari/trunk/debian/rules	2006-08-09 18:29:57 UTC (rev 2209)
+++ ari/trunk/debian/rules	2006-08-10 05:28:57 UTC (rev 2210)
@@ -62,8 +62,8 @@
 #	clean up l18n dir
 # 	rm -f debian/ari/usr/share/ari/locale/*.txt*
 # 	rm -f debian/ari/usr/share/ari/locale/ari*.po
-
 	rm -f debian/ari/usr/share/ari/locale/readme.txt
+	rm -f debian/ari/usr/share/ari/locale/locale.txt
 	find debian/ari/usr/share/ari/locale/ -name '*.po' | xargs rm -f
 	
 #	add default link to ARI