trying to get HEAD building again. If you want the code

prior to this merge, checkout HEAD_PRE_3_0_0_BETA_3_MERGE
(This used to be commit adb98e7b7cd0f025b52c570e4034eebf4047b1ad)

3 files changed, 7 insertions, 37 deletions

diff --git a/packaging/Solaris/makepkg.sh b/packaging/Solaris/makepkg.sh
index b57e182e4a..bd370e9a62 100755
--- a/packaging/Solaris/makepkg.sh
+++ b/packaging/Solaris/makepkg.sh
@@ -11,37 +11,6 @@ INSTALL_BASE=/usr/local
 
 add_dynamic_entries() 
 {
-  # First build the codepages and append codepage entries to prototype
-  echo "#\n# Codepages \n#"
-  echo d none samba/lib/codepages 0755 root other
-
-  CODEPAGELIST="437 737 850 852 861 932 866 949 950 936"
-  # Check if make_smbcodepage exists
-  if [ ! -f $DISTR_BASE/source/bin/make_smbcodepage ]; then
-    echo "Could not find $DISTR_BASE/source/bin/make_smbcodepage to generate codepages.\n\
-     Please create the binaries before packaging." >&2
-    exit 1
-  fi
-
-  for p in $CODEPAGELIST; do
-    $DISTR_BASE/source/bin/make_smbcodepage c $p $DISTR_BASE/source/codepages/codepage_def.$p $DISTR_BASE/source/codepages/codepage.$p
-    echo f none samba/lib/codepages/codepage.$p=source/codepages/codepage.$p 0644 root other
-  done
-
-  # Create unicode maps
-  if [ ! -f $DISTR_BASE/source/bin/make_unicodemap ]; then
-    echo "Missing $DISTR_BASE/source/bin/make_unicodemap. Aborting." >&2
-    exit 1
-  fi
-
-  # Pull in all the unicode map files from source/codepages/CP*.TXT
-  list=`find $DISTR_BASE/source/codepages -name "CP*.TXT" | sed 's|^.*CP\(.*\)\.TXT|\1|'`
-  for umap in $list
-  do
-    $DISTR_BASE/source/bin/make_unicodemap $umap $DISTR_BASE/source/codepages/CP$umap.TXT $DISTR_BASE/source/codepages/unicode_map.$umap
-    echo f none samba/lib/codepages/unicode_map.$umap=source/codepages/unicode_map.$umap 0644 root other
-  done
-
   # Add the binaries, docs and SWAT files
 
   echo "#\n# Binaries \n#"
diff --git a/packaging/Solaris/pkg-specs/pkginfo b/packaging/Solaris/pkg-specs/pkginfo
index d195f177e9..d24ecaefe8 100644
--- a/packaging/Solaris/pkg-specs/pkginfo
+++ b/packaging/Solaris/pkg-specs/pkginfo
@@ -1,7 +1,7 @@
 PKG=samba
 NAME=SMB based file/printer sharing
 ARCH=sparc
-VERSION=2.0.6
+VERSION=3.0.0beta3
 CATEGORY=system
 VENDOR=Samba Group
 DESC=File and printer sharing for NT workstations
diff --git a/packaging/Solaris/prototype.master b/packaging/Solaris/prototype.master
index bfcb3e0049..ff5ba895b3 100644
--- a/packaging/Solaris/prototype.master
+++ b/packaging/Solaris/prototype.master
@@ -8,7 +8,6 @@
 i pkginfo=./pkginfo
 i copyright=./copyright
 i request=./request
-i checkinstall
 i preremove=./preremove
 i postinstall=./postinstall
 i i.swat=./i.swat
@@ -40,10 +39,12 @@ d none samba/docs 0755 root other
 #
 f none samba/lib/smb.conf.example=examples/smb.conf.default 0644 root other
 d none samba/lib/regeditscripts 0755 root other
-f none samba/lib/regeditscripts/NT4_PlainPassword.reg=docs/NT4_PlainPassword.reg 0444 root other
-f none samba/lib/regeditscripts/Win95_PlainPassword.reg=docs/Win95_PlainPassword.reg 0444 root other
-f none samba/lib/regeditscripts/Win98_PlainPassword.reg=docs/Win98_PlainPassword.reg 0444 root other
-f none samba/lib/regeditscripts/Win2000_PlainPassword.reg=docs/Win2000_PlainPassword.reg 0444 root other
+f none samba/lib/regeditscripts/NT4_PlainPassword.reg=docs/Registry/NT4_PlainPassword.reg 0444 root other
+f none samba/lib/regeditscripts/Win95_PlainPassword.reg=docs/Registry/Win95_PlainPassword.reg 0444 root other
+f none samba/lib/regeditscripts/Win98_PlainPassword.reg=docs/Registry/Win98_PlainPassword.reg 0444 root other
+f none samba/lib/regeditscripts/WinME_PlainPassword.reg=docs/Registry/WinME_PlainPassword.reg 0444 root other
+f none samba/lib/regeditscripts/Win2000_PlainPassword.reg=docs/Registry/Win2000_PlainPassword.reg 0444 root other
+f none samba/lib/regeditscripts/WinXP_PlainPassword.reg=docs/Registry/WinXP_PlainPassword.reg 0444 root other
 #
 # Random files 
 f none samba/docs/Samba-HOWTO-Collection.pdf=docs/Samba-HOWTO-Collection.pdf 0644 root other