[Pkg-voip-commits] r3071 - in freepbx/trunk/debian: . contrib contrib/template/debian

[Diego Iastrubni]

Author: elcuco-guest
Date: 2007-01-27 18:33:40 +0100 (Sat, 27 Jan 2007)
New Revision: 3071

Modified:
   freepbx/trunk/debian/contrib/fpx-modules
   freepbx/trunk/debian/contrib/template/debian/prerm
   freepbx/trunk/debian/freepbx-admin.install
Log:
- freepbx modules created by this script now are called  freepbx-module-$NAME, they are stored in a directory called this way. to make lintian happier.
- install and uninstall templates are fixed.
- work around upstream bugs in the module_admin script, fixed upstream. not sure if it's worth time to backport.



Modified: freepbx/trunk/debian/contrib/fpx-modules
===================================================================
--- freepbx/trunk/debian/contrib/fpx-modules	2007-01-27 16:58:24 UTC (rev 3070)
+++ freepbx/trunk/debian/contrib/fpx-modules	2007-01-27 17:33:40 UTC (rev 3071)
@@ -353,12 +353,15 @@
 			exec_cmd( "cd modules/$rawname/; dch -v \"2.1-$version-1\" \"New upstream release\"" );
 			outn("Please update the changelog as needed, new entry created.");
 		}
-				
 		exec_cmd( "sed -r -i 's/@@RAWNAME@@/$rawname/g' modules/$rawname/debian/*" );
 		exec_cmd( "sed -r -i 's/@@VERSION@@/$version/g'	modules/$rawname/debian/*" );
 		exec_cmd( "sed -r -i 's/@@NAME@@/$name/g' modules/$rawname/debian/*" );
 		exec_cmd( "sed -r -i 's|@@DATE@@|$date|g' modules/$rawname/debian/*" );
 		exec_cmd( "sed -r -i 's|@@INFO@@|$date|g' modules/$rawname/debian/*" );
+
+		// module directories MUST be freepbx-module-$rawname
+		// otherwise lintian shouts
+		rename( "modules/$rawname/", "modules/freepbx-module-$rawname/" );
 	}
 	
 	// now we have the most updated modules, download the module list as well
@@ -384,8 +387,8 @@
 			print("\n");
 		}
 		
-		debug( "cd modules/" . $module["rawname"] );
-		chdir( "modules/" . $module["rawname"] );
+		debug( "cd modules/freepbx-module-" . $module["rawname"] );
+		chdir( "modules/freepbx-module-" . $module["rawname"] );
 		
 		if (exec_cmd( "echo y | debuild -uc -us -rfakeroot &> build.log" ) == 0){
 			print( " ok.\n" );

Modified: freepbx/trunk/debian/contrib/template/debian/prerm
===================================================================
--- freepbx/trunk/debian/contrib/template/debian/prerm	2007-01-27 16:58:24 UTC (rev 3070)
+++ freepbx/trunk/debian/contrib/template/debian/prerm	2007-01-27 17:33:40 UTC (rev 3071)
@@ -24,11 +24,11 @@
 
 case "$1" in
     purge)
-            /usr/share/freepbx-common/freepbx-module-status uninstall @@RAWNAME@@
+		/usr/share/asterisk/bin/module_admin uninstall @@RAWNAME@@ || true
     ;;
 
     remove)
-            /usr/share/freepbx-common/freepbx-module-status uninstall @@RAWNAME@@    
+		/usr/share/asterisk/bin/module_admin uninstall @@RAWNAME@@ || true
     ;;
     
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

Modified: freepbx/trunk/debian/freepbx-admin.install
===================================================================
--- freepbx/trunk/debian/freepbx-admin.install	2007-01-27 16:58:24 UTC (rev 3070)
+++ freepbx/trunk/debian/freepbx-admin.install	2007-01-27 17:33:40 UTC (rev 3071)
@@ -6,7 +6,6 @@
 amp_conf/htdocs/admin/common/*.css			usr/share/freepbx/common/
 debian/rapid/mainstyle-alternative.css			usr/share/freepbx/common/
 amp_conf/htdocs/admin/common/*.php			usr/share/freepbx/common/
-amp_conf/htdocs/admin/common/script.js.php		usr/share/freepbx/common/
 amp_conf/htdocs/admin/modules/core			usr/share/freepbx/modules/
 amp_conf/htdocs/admin/images/*.png			usr/share/freepbx/images/
 amp_conf/htdocs/admin/images/*.gif			usr/share/freepbx/images/
@@ -20,7 +19,6 @@
 debian/rapid/freepbx-install-*.sh			usr/share/freepbx-common/
 debian/rapid/freepbx-remove-*.sh			usr/share/freepbx-common/
 debian/rapid/freepbx-post-reload			usr/share/freepbx-common/
-debian/rapid/freepbx-module-status			usr/share/freepbx-common/
 debian/rapid/freepbx-enable-all-modules			usr/share/freepbx-common/
 debian/rapid/post-reload/*				usr/share/freepbx-common/post-reload/