svn commit: r718535 - in /ofbiz/trunk/debian: ./ move-files.pl ofbiz-framework.config ofbiz-framework.dirs ofbiz-framework.postinst ofbiz.config ofbiz.default ofbiz.dirs ofbiz.init ofbiz.links ofbiz.postinst ofbiz.postrm ofbiz.prerm ofbiz.templates rules

[doogie-3]

Author: doogie
Date: Tue Nov 18 01:45:52 2008
New Revision: 718535

URL: http://svn.apache.org/viewvc?rev=718535&view=rev
Log:
The ofbiz-framework.deb is now installable; upgrades are *not*
handled.  Instaling -applications or -specialpurpose, or any other
package that drops into hot-deploy is not yet supported; namely, the
extra seed/demo data won't get installed, and the daemon won't be
restarted.

Removed:
    ofbiz/trunk/debian/ofbiz.config
    ofbiz/trunk/debian/ofbiz.default
    ofbiz/trunk/debian/ofbiz.dirs
    ofbiz/trunk/debian/ofbiz.init
    ofbiz/trunk/debian/ofbiz.links
    ofbiz/trunk/debian/ofbiz.postinst
    ofbiz/trunk/debian/ofbiz.postrm
    ofbiz/trunk/debian/ofbiz.prerm
    ofbiz/trunk/debian/ofbiz.templates
Modified:
    ofbiz/trunk/debian/   (props changed)
    ofbiz/trunk/debian/move-files.pl
    ofbiz/trunk/debian/ofbiz-framework.config
    ofbiz/trunk/debian/ofbiz-framework.dirs
    ofbiz/trunk/debian/ofbiz-framework.postinst
    ofbiz/trunk/debian/rules

Propchange: ofbiz/trunk/debian/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 18 01:45:52 2008
@@ -3,9 +3,13 @@
 ofbiz
 ofbiz-specialpurpose
 ofbiz-specialpurpose.debhelper.log
+ofbiz-applications
+ofbiz-applications.debhelper.log
 ofbiz.debhelper.log
-ofbiz.prerm.debhelper
-ofbiz.postinst.debhelper
-ofbiz.postrm.debhelper
-ofbiz.substvars
+ofbiz-framework
+ofbiz-framework.debhelper.log
+ofbiz-framework.prerm.debhelper
+ofbiz-framework.postinst.debhelper
+ofbiz-framework.postrm.debhelper
+ofbiz-framework.substvars
 stamps

Modified: ofbiz/trunk/debian/move-files.pl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/move-files.pl?rev=718535&r1=718534&r2=718535&view=diff
==============================================================================
--- ofbiz/trunk/debian/move-files.pl (original)
+++ ofbiz/trunk/debian/move-files.pl Tue Nov 18 01:45:52 2008
@@ -101,7 +101,8 @@
  next if (m,(^|.*/)build\.xml$,);
  #print("1\n");
  next if (m,^$appDirsRe/[^/]+/(build/classes|src|testdef)/.*,);
- next if (m,^framework/(catalina/work|data/derby|logs)/.*,);
+ next if (m,^runtime/(catalina/work|data/derby|logs)/.*,);
+ next if (m,^\.hg(|/.*),);
  #print("2\n");
  my $type = undef;
  if ($_ eq 'framework/entity/config/entityengine.xml') {
@@ -166,12 +167,14 @@
  my $pkg;
  if (m,^specialpurpose/.*,) {
  $pkg = 'ofbiz-specialpurpose';
+ } elsif (m,^applications/.*,) {
+ $pkg = 'ofbiz-applications';
  } else {
- $pkg = 'ofbiz';
+ $pkg = 'ofbiz-framework';
  }
  my $base = 'debian/' . $pkg;
  my $file = $_;
- print(STDERR "$type: $file\n") if ($file =~ m/.*runtime.*/);
+ print(STDERR "$type: $file\n") if ($file =~ m/^.*runtime.*/);
  if ($type eq 'code') {
  my $target = "$base/usr/share/ofbiz/$file";
  #print("Copying ($file) ($target)\n");
@@ -229,10 +232,10 @@
  configure_ofbiz
  fi
 _EOF_
-push(@{$scripts{'ofbiz'}->{'postinst'}->{'configure'}}, $postinst);
+push(@{$scripts{'ofbiz-framework'}->{'postinst'}->{'configure'}}, $postinst);
 foreach my $pkg (keys(%scripts)) {
  foreach my $script (keys(%{$scripts{$pkg}})) {
- open(SCRIPT, ">> debian/ofbiz.$script.debhelper");
+ open(SCRIPT, ">> debian/$pkg.$script.debhelper");
  print(SCRIPT "case \"\$1\" in\n");
  my $segments = $scripts{$pkg}->{$script};
  foreach my $arg (keys(%$segments)) {

Modified: ofbiz/trunk/debian/ofbiz-framework.config
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/ofbiz-framework.config?rev=718535&r1=718534&r2=718535&view=diff
==============================================================================
--- ofbiz/trunk/debian/ofbiz-framework.config (original)
+++ ofbiz/trunk/debian/ofbiz-framework.config Tue Nov 18 01:45:52 2008
@@ -33,9 +33,7 @@
  #dbc_authmethod_admin="ident"
  dbc_authmethod_user="password"
  . /usr/share/dbconfig-common/dpkg/config
- set -x
  dbc_go ofbiz $@
- set +x
 fi
 if [ -r "/etc/ofbiz/debconf.cfg" ]; then
  . "/etc/ofbiz/debconf.cfg"
@@ -53,7 +51,6 @@
 if set_if ofbiz/admin-password-encrypted "$ofbiz_admin_password_encrypted"; then
  db_fset ofbiz/admin-password-encrypted seen true
 fi
-set -x
 #db_set ofbiz/admin-password ofbiz || true
 set_if ofbiz/readers "$ofbiz_readers" || true
 set_if ofbiz/admin-port "$ofbiz_admin_port" || true
@@ -113,7 +110,7 @@
  db_fset ofbiz/admin-password seen false
  fi
  ;;
- (4) db_input medium $import_question || true
+ (4) db_input low $import_question || true
  ;;
  (5) db_get $import_question && do_import="$RET"
  if [ "$do_import" = "true" ]; then

Modified: ofbiz/trunk/debian/ofbiz-framework.dirs
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/ofbiz-framework.dirs?rev=718535&r1=718534&r2=718535&view=diff
==============================================================================
--- ofbiz/trunk/debian/ofbiz-framework.dirs (original)
+++ ofbiz/trunk/debian/ofbiz-framework.dirs Tue Nov 18 01:45:52 2008
@@ -1,3 +1,5 @@
 usr/share/ofbiz/support
 etc/ofbiz
+var/cache/ofbiz
 var/lib/ofbiz
+var/log/ofbiz

Modified: ofbiz/trunk/debian/ofbiz-framework.postinst
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/ofbiz-framework.postinst?rev=718535&r1=718534&r2=718535&view=diff
==============================================================================
--- ofbiz/trunk/debian/ofbiz-framework.postinst (original)
+++ ofbiz/trunk/debian/ofbiz-framework.postinst Tue Nov 18 01:45:52 2008
@@ -17,6 +17,7 @@
 #under the License.
 
 set -e
+
 : "$0" "$@"
 JAVA_HOME=""
 JAVA_HOMES="/usr/lib/jvm/java-6-sun /usr/lib/j2sdk1.5"

Modified: ofbiz/trunk/debian/rules
URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/rules?rev=718535&r1=718534&r2=718535&view=diff
==============================================================================
--- ofbiz/trunk/debian/rules (original)
+++ ofbiz/trunk/debian/rules Tue Nov 18 01:45:52 2008
@@ -72,7 +72,7 @@
  mkdir -p runtime/catalina/work
  perl debian/move-files.pl
  dh_installdirs -v
- cp -a debian/*.xslt debian/*.class debian/ofbiz/usr/share/ofbiz/support
+ cp -a debian/*.xslt debian/*.class debian/ofbiz-framework/usr/share/ofbiz/support
  dh_link
 # tar -c . --exclude debian --exclude src --exclude build.xml --exclude build/classes --exclude framework/example | tar -C debian/ofbiz-svn-$(UPSTREAM_VERSION)/var/lib/ofbiz/$(UPSTREAM_VERSION) -x
 # dh_strip
@@ -81,7 +81,8 @@
 # dh_shlibdeps
  dh_md5sums
  dh_installdebconf
- dh_installinit
+ dh_installinit -N ofbiz-framework
+ dh_installinit -p ofbiz-framework --name ofbiz
  dh_installdeb
  dh_gencontrol
  dh_builddeb