Rev 11326: Remove samba-gtk bits,
add bzr-builddeb. in file:///home/jelmer/bzr.samba/4.0-debian/
Jelmer Vernooij
jelmer at samba.org
Mon Feb 12 23:31:14 GMT 2007
At file:///home/jelmer/bzr.samba/4.0-debian/
------------------------------------------------------------
revno: 11326
revision-id: jelmer at samba.org-20070212233059-qp30zbb16dsyx4yl
parent: jelmer at samba.org-20070127225126-jg4e3hu1c1jwzxaj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-debian
timestamp: Tue 2007-02-13 00:30:59 +0100
message:
Remove samba-gtk bits, add bzr-builddeb.
removed:
debian/libgtksamba-dev.install svn-v2:1042 at fc4039ab-9d04-0410-8cac-899223bdd6b0-branches%2fsamba4-libgtksamba%2ddev.install
debian/libgtksamba0.install svn-v2:1042 at fc4039ab-9d04-0410-8cac-899223bdd6b0-branches%2fsamba4-libgtksamba0.install
debian/samba-gtk-frontends.install svn-v2:827 at fc4039ab-9d04-0410-8cac-899223bdd6b0-branches%2fsamba4-samba%2dgtk%2dfrontends.install
modified:
.bzr-builddeb/default.conf default.conf-20070127221815-iop0s8809kcw71wm-1
.bzrignore svn-v2:17811 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-.bzrignore
debian/changelog svn-v2:2 at fc4039ab-9d04-0410-8cac-899223bdd6b0-trunk-changelog
debian/control svn-v2:2 at fc4039ab-9d04-0410-8cac-899223bdd6b0-trunk-control
debian/rules svn-v2:2 at fc4039ab-9d04-0410-8cac-899223bdd6b0-trunk-rules
source/main.mk svn-v2:8991 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fmain.mk
=== removed file 'debian/libgtksamba-dev.install'
--- a/debian/libgtksamba-dev.install 2007-01-27 22:11:08 +0000
+++ b/debian/libgtksamba-dev.install 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-usr/include/samba-4.0/gtk-smb.h
-usr/include/samba-4.0/gtk/*.h
-usr/lib/pkgconfig/gtksamba.pc
-usr/lib/libgtksamba.so
=== removed file 'debian/libgtksamba0.install'
--- a/debian/libgtksamba0.install 2007-01-27 22:11:08 +0000
+++ b/debian/libgtksamba0.install 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/libgtksamba.so.0.*
=== removed file 'debian/samba-gtk-frontends.install'
--- a/debian/samba-gtk-frontends.install 2007-01-27 22:11:08 +0000
+++ b/debian/samba-gtk-frontends.install 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-usr/bin/gregedit
-usr/bin/gepdump
-usr/bin/gwcrontab
-usr/share/man/man1/gregedit.1
-usr/share/man/man1/gepdump.1
-usr/share/man/man1/gwcrontab.1
=== modified file '.bzr-builddeb/default.conf'
--- a/.bzr-builddeb/default.conf 2007-01-27 22:51:26 +0000
+++ b/.bzr-builddeb/default.conf 2007-02-12 23:30:59 +0000
@@ -1,3 +1,2 @@
[BUILDDEB]
merge = True
-export-upstream = svn://svn.samba.org/samba/branches/SAMBA_4_0_RELEASE
=== modified file '.bzrignore'
--- a/.bzrignore 2007-01-23 01:29:17 +0000
+++ b/.bzrignore 2007-02-12 23:30:59 +0000
@@ -162,3 +162,26 @@
source/st
source/samba.info
source/pidl/cover_db
+debian/ldb-tools
+debian/libgensec-dev
+debian/libgensec0
+debian/libldb-dev
+debian/libldb0
+debian/libparse-pidl-perl
+debian/libsamba-dev
+debian/libsamba0
+debian/libtalloc-dev
+debian/libtalloc0
+debian/libtdb-dev
+debian/libtdb0
+debian/samba
+debian/samba-clients
+debian/samba-common
+debian/samba-dev
+debian/samba-testsuite
+debian/swat
+debian/tmp
+debian/winregistry-tools
+source/dsdb/repl/drepl_service_proto.h
+build-stamp
+configure-stamp
=== modified file 'debian/changelog'
--- a/debian/changelog 2007-01-27 22:11:08 +0000
+++ b/debian/changelog 2007-02-12 23:30:59 +0000
@@ -1,4 +1,4 @@
-samba (4.0.0~~svn19515-1) UNRELEASED; urgency=low
+samba (4.0.0tp4-1) UNRELEASED; urgency=low
* New upstream versions (svn snapshots of r19515).
=== modified file 'debian/control'
--- a/debian/control 2007-01-27 22:11:08 +0000
+++ b/debian/control 2007-02-12 23:30:59 +0000
@@ -4,7 +4,7 @@
Maintainer: Jelmer Vernooij <jelmer at samba.org>
Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Steinar H. Gunderson <sesse at debian.org>
Standards-Version: 3.6.2
-Build-Depends: libgtk2.0-dev, libgconf2-dev, debhelper (>> 5.0.0), libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev, libpam0g-dev, libblkid-dev, libattr1-dev, flex, bison
+Build-Depends: debhelper (>> 5.0.0), libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev, libpam0g-dev, libblkid-dev, libattr1-dev, flex, bison
Package: samba
Architecture: any
@@ -81,27 +81,6 @@
This package contains programs for testing the reliability and speed
of SMB servers, Samba in particular.
-Package: samba-gtk-frontends
-Architecture: any
-Depends: ${shlibs:Depends}
-Section: x11
-Description: graphical Samba client utilities
- The Samba software suite is a collection of programs that
- implements the SMB protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients, as well as
- run as a domain controller for Active Directory.
- .
- These packages contain snapshot versions of Samba 4, the next-generation
- version of Samba. These should be considered _experimental_, and should
- not be used in production. In particular, no guarantees are made with
- regard to upgrades between versions.
- .
- This package contains GTK+ programs for maintaining:
- .
- * Remote SAM databases
- * Local and remote registries
- * DCE/RPC endpoints
-
Package: winregistry-tools
Architecture: any
Depends: ${shlibs:Depends}
@@ -250,22 +229,6 @@
.
This package contains the files required for development.
-Package: libgtksamba0
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: Collection of Samba-related GTK+ widgets
- A collection of GTK+ widgets useful when creating Samba-related GUI
- applications.
-
-Package: libgtksamba-dev
-Architecture: all
-Depends: libgtksamba0 (=${Source-Version})
-Description: Collection of Samba-related GTK+ widgets
- A collection of GTK+ widgets useful when creating Samba-related GUI
- applications.
- .
- This package contains the files required for development.
-
Package: libgensec-dev
Architecture: all
Depends: libgensec0 (=${Source-Version})
=== modified file 'debian/rules'
--- a/debian/rules 2007-01-27 22:11:08 +0000
+++ b/debian/rules 2007-02-12 23:30:59 +0000
@@ -3,6 +3,10 @@
SOURCEPATH=./source
+# turn DEB_BUILD_OPTIONS='foo,bar' into DEB_BUILD_OPT_FOO and DEB_BUILD_OPT_BAR
+d_b_o:=$(shell echo "$$DEB_BUILD_OPTIONS"|sed 's/[^-[:alnum:]]/ /g'|tr a-z A-Z)
+$(foreach o, $(d_b_o), $(eval DEB_BUILD_OPT_$o := 1))
+
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -13,16 +17,18 @@
--with-syslog \
--with-readline \
--with-ldap \
- --enable-dso
+ #--enable-dso
cd $(SOURCEPATH)/pidl && perl Makefile.PL verbose INSTALLDIRS=vendor PREFIX=/usr
touch $@
build: build-stamp
build-stamp: configure
dh_testdir
- $(MAKE) -C $(SOURCEPATH) pch
$(MAKE) -C $(SOURCEPATH) all
$(MAKE) -C $(SOURCEPATH)/pidl all
+ifndef DEB_BUILD_OPT_NOTEST
+ $(MAKE) -C $(SOURCEPATH) test
+endif
touch $@
clean:
=== modified file 'source/main.mk'
--- a/source/main.mk 2007-01-22 00:04:59 +0000
+++ b/source/main.mk 2007-02-12 23:30:59 +0000
@@ -284,6 +284,7 @@
-rm -f configure
-rm -f $(MANPAGES)
+check: test
test: $(DEFAULT_TEST_TARGET)
SELFTEST = builddir=$(builddir) srcdir=$(srcdir) \
More information about the samba-cvs
mailing list