diff options
Diffstat (limited to 'packaging/Debian')
| -rw-r--r-- | packaging/Debian/README | 25 | ||||
| -rw-r--r-- | packaging/Debian/debian/README.build-upstream | 39 | ||||
| -rw-r--r-- | packaging/Debian/debian/patches/fhs.patch | 2 |
3 files changed, 44 insertions, 22 deletions
diff --git a/packaging/Debian/README b/packaging/Debian/README index 1bb68d633a..764a042939 100644 --- a/packaging/Debian/README +++ b/packaging/Debian/README @@ -27,19 +27,29 @@ these instructions: to the normal Debian development packages -- dpkg-dev, libc6-dev, devscripts, etc.): + autoconf debhelper libpam0g-dev libreadline4-dev libcupsys2-dev - autoconf + libacl1-dev | acl-dev (>= 2.0.0) + libkrb5-dev + libldap2-dev + po-debconf + python-dev (>= 2.2) - Notes about the packages required to build Samba Debian packages: + Notes regarding the packages required to build Samba Debian packages: * The libcupsys2-dev is not available in Debian Potato (Debian 2.2). - That's fine; the configure script won't detect CUPS support and the - resulting binaries won't support CUPS. + That's fine; the configure script won't detect CUPS support and the + resulting binaries won't support CUPS. + + * The list above is current as of samba-3.0.0beta1, but it can get + out of date. The best way to check what packages are required to + build the samba packages on Debian is to look for the Build-Depends: + field in the file debian/control. -1) cd samba[-<version>]. For example, "cd samba-2.2.5". +1) cd samba[-<version>]. For example, "cd samba-3.0.0beta1". 2) cp -a packaging/Debian/debian/ debian It's important that you copy instead of symlink because the build tools in Potato have a problem that prevents the build to work with @@ -48,9 +58,8 @@ devscripts, etc.): Debian version numbers! Don't complain later if you can't upgrade to official versions of the Samba packages for Debian.) - Edit the changelog and make sure the version is right. For example, - for Samba 2.2.4, the version number should something like 2.2.4-0.1 - (use a number less than 1 like 0.1, 0.2, etc. so there is no conflict - with future upgrades to the official Debian packages.) + for Samba 3.0.0beta1, the version number should something like + 3.0.0beta1-1.1. 4) Run 'debian/rules binary'. - It is better that you prefix the above command with 'fakeroot'. If you have problems you might try building as root. diff --git a/packaging/Debian/debian/README.build-upstream b/packaging/Debian/debian/README.build-upstream index f555f52af5..764a042939 100644 --- a/packaging/Debian/debian/README.build-upstream +++ b/packaging/Debian/debian/README.build-upstream @@ -3,10 +3,15 @@ Building Samba Packages for Debian GNU/Linux Building Debian packages is not as hard as some people might think. The following instructions will allow you to build your own Samba Debian -packages. These instructions, and the files in packaging/Debian/, are -current as of Samba 2.2.5, and should allow you to build Debian packages -for Debian Potato (2.2), Debian Woody (3.0), and Debian unstable as of -the date Samba 2.2.5 was released. +packages. These instructions, and the files in packaging/Debian/, should +be current as of Samba 3.0beta1, and should allow you to build Debian +packages for Debian unstable. + +We try to maintain as much compatibility with previous releases +of Debian as possible, so it is possible that the files in +packaging/Debian/ can also be used to build Samba Debian packages for +other Debian releases. However, sometimes this is just not possible +because we need to use stuff that is only available on Debian unstable. Instructions ------------ @@ -22,19 +27,29 @@ these instructions: to the normal Debian development packages -- dpkg-dev, libc6-dev, devscripts, etc.): + autoconf debhelper libpam0g-dev libreadline4-dev libcupsys2-dev - autoconf + libacl1-dev | acl-dev (>= 2.0.0) + libkrb5-dev + libldap2-dev + po-debconf + python-dev (>= 2.2) - Notes about the packages required to build Samba Debian packages: + Notes regarding the packages required to build Samba Debian packages: * The libcupsys2-dev is not available in Debian Potato (Debian 2.2). - That's fine; the configure script won't detect CUPS support and the - resulting binaries won't support CUPS. + That's fine; the configure script won't detect CUPS support and the + resulting binaries won't support CUPS. -1) cd samba[-<version>]. For example, "cd samba-2.2.5". + * The list above is current as of samba-3.0.0beta1, but it can get + out of date. The best way to check what packages are required to + build the samba packages on Debian is to look for the Build-Depends: + field in the file debian/control. + +1) cd samba[-<version>]. For example, "cd samba-3.0.0beta1". 2) cp -a packaging/Debian/debian/ debian It's important that you copy instead of symlink because the build tools in Potato have a problem that prevents the build to work with @@ -43,9 +58,8 @@ devscripts, etc.): Debian version numbers! Don't complain later if you can't upgrade to official versions of the Samba packages for Debian.) - Edit the changelog and make sure the version is right. For example, - for Samba 2.2.4, the version number should something like 2.2.4-0.1 - (use a number less than 1 like 0.1, 0.2, etc. so there is no conflict - with future upgrades to the official Debian packages.) + for Samba 3.0.0beta1, the version number should something like + 3.0.0beta1-1.1. 4) Run 'debian/rules binary'. - It is better that you prefix the above command with 'fakeroot'. If you have problems you might try building as root. @@ -58,4 +72,3 @@ better things to do and know nothing about the Debian packaging system. Eloy A. Paris <peloy@debian.org> Steve Langasek <vorlon@debian.org> - diff --git a/packaging/Debian/debian/patches/fhs.patch b/packaging/Debian/debian/patches/fhs.patch index dd66188cbe..781f895f1e 100644 --- a/packaging/Debian/debian/patches/fhs.patch +++ b/packaging/Debian/debian/patches/fhs.patch @@ -335,7 +335,7 @@ diff -uNr samba-3.0alpha23.orig/source/param/loadparm.c samba-3.0alpha23/source/ char *szLockDir; char *szPidDir; char *szRootdir; -@@ -1055,8 +1058,13 @@ +@@ -1053,8 +1056,13 @@ {"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, |