[Pkg-mongodb-maintainers] [pkg-mongodb] 128/394: Switch to CDBS, use dh_installman, dh_lintian, remove unused manpage, add gbp.conf to filter out debian/* files from upstream tarball. Explain that in README.source.
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Wed Sep 21 13:58:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
apoikos pushed a commit to branch master
in repository pkg-mongodb.
commit 7d5b872c129822f56f480e890411e75870292a76
Author: Jérémy Lal <kapouer at melix.org>
Date: Thu Feb 24 08:06:56 2011 +0800
Switch to CDBS, use dh_installman, dh_lintian, remove unused manpage, add gbp.conf to filter out debian/* files from upstream tarball. Explain that in README.source.
---
debian/README.source | 13 +++
debian/gbp.conf | 6 +
debian/{ => manpages}/mongo.1 | 0
debian/{ => manpages}/mongod.1 | 0
debian/{ => manpages}/mongodump.1 | 0
debian/{ => manpages}/mongoexport.1 | 0
debian/{ => manpages}/mongofiles.1 | 0
debian/{ => manpages}/mongoimport.1 | 0
debian/{ => manpages}/mongorestore.1 | 0
debian/{ => manpages}/mongos.1 | 0
debian/{ => manpages}/mongosniff.1 | 0
debian/{ => manpages}/mongostat.1 | 0
debian/mongodb-clients.install | 11 --
...s.lintian => mongodb-clients.lintian-overrides} | 0
debian/mongodb-clients.manpages | 8 ++
debian/mongodb-server.install | 5 +-
...er.lintian => mongodb-server.lintian-overrides} | 0
debian/mongodb-server.manpages | 2 +
debian/mongoimportjson.1 | 45 -------
debian/rules | 130 ++-------------------
20 files changed, 40 insertions(+), 180 deletions(-)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..f57974e
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,13 @@
+gbp
+===
+
+Use of git-import-orig is highly encouraged.
+
+
+debian/gbp.conf
+===============
+
+debian/* files from upstream tarball are filtered out because the merge is really
+difficult to maintain.
+It is up to the maintainer to check manually for upstream changes in debian dir,
+especially man pages.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..fdda625
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,6 @@
+[DEFAULT]
+pristine-tar = True
+
+[git-import-orig]
+filter = debian/*
+filter-pristine-tar = True
diff --git a/debian/mongo.1 b/debian/manpages/mongo.1
similarity index 100%
rename from debian/mongo.1
rename to debian/manpages/mongo.1
diff --git a/debian/mongod.1 b/debian/manpages/mongod.1
similarity index 100%
rename from debian/mongod.1
rename to debian/manpages/mongod.1
diff --git a/debian/mongodump.1 b/debian/manpages/mongodump.1
similarity index 100%
rename from debian/mongodump.1
rename to debian/manpages/mongodump.1
diff --git a/debian/mongoexport.1 b/debian/manpages/mongoexport.1
similarity index 100%
rename from debian/mongoexport.1
rename to debian/manpages/mongoexport.1
diff --git a/debian/mongofiles.1 b/debian/manpages/mongofiles.1
similarity index 100%
rename from debian/mongofiles.1
rename to debian/manpages/mongofiles.1
diff --git a/debian/mongoimport.1 b/debian/manpages/mongoimport.1
similarity index 100%
rename from debian/mongoimport.1
rename to debian/manpages/mongoimport.1
diff --git a/debian/mongorestore.1 b/debian/manpages/mongorestore.1
similarity index 100%
rename from debian/mongorestore.1
rename to debian/manpages/mongorestore.1
diff --git a/debian/mongos.1 b/debian/manpages/mongos.1
similarity index 100%
rename from debian/mongos.1
rename to debian/manpages/mongos.1
diff --git a/debian/mongosniff.1 b/debian/manpages/mongosniff.1
similarity index 100%
rename from debian/mongosniff.1
rename to debian/manpages/mongosniff.1
diff --git a/debian/mongostat.1 b/debian/manpages/mongostat.1
similarity index 100%
rename from debian/mongostat.1
rename to debian/manpages/mongostat.1
diff --git a/debian/mongodb-clients.install b/debian/mongodb-clients.install
index ed4208b..6c0c01c 100644
--- a/debian/mongodb-clients.install
+++ b/debian/mongodb-clients.install
@@ -5,14 +5,3 @@ usr/bin/mongofiles
usr/bin/mongoimport
usr/bin/mongorestore
usr/bin/mongostat
-usr/share/lintian/overrides/mongodb-clients
-usr/share/man/man1/mongo.1
-usr/share/man/man1/mongodump.1
-usr/share/man/man1/mongoexport.1
-usr/share/man/man1/mongofiles.1
-usr/share/man/man1/mongoimport.1
-usr/share/man/man1/mongoimportjson.1
-usr/share/man/man1/mongorestore.1
-usr/share/man/man1/mongosniff.1
-usr/share/man/man1/mongostat.1
-
diff --git a/debian/mongodb-clients.lintian b/debian/mongodb-clients.lintian-overrides
similarity index 100%
rename from debian/mongodb-clients.lintian
rename to debian/mongodb-clients.lintian-overrides
diff --git a/debian/mongodb-clients.manpages b/debian/mongodb-clients.manpages
new file mode 100644
index 0000000..1e0e2f1
--- /dev/null
+++ b/debian/mongodb-clients.manpages
@@ -0,0 +1,8 @@
+debian/manpages/mongo.1
+debian/manpages/mongodump.1
+debian/manpages/mongoexport.1
+debian/manpages/mongofiles.1
+debian/manpages/mongoimport.1
+debian/manpages/mongorestore.1
+debian/manpages/mongosniff.1
+debian/manpages/mongostat.1
diff --git a/debian/mongodb-server.install b/debian/mongodb-server.install
index 4b08534..043cb52 100644
--- a/debian/mongodb-server.install
+++ b/debian/mongodb-server.install
@@ -1,6 +1,3 @@
-etc
+debian/mongodb.conf etc
usr/bin/mongod
usr/bin/mongos
-usr/share/lintian/overrides/mongodb-server
-usr/share/man/man1/mongod.1
-usr/share/man/man1/mongos.1
diff --git a/debian/mongodb-server.lintian b/debian/mongodb-server.lintian-overrides
similarity index 100%
rename from debian/mongodb-server.lintian
rename to debian/mongodb-server.lintian-overrides
diff --git a/debian/mongodb-server.manpages b/debian/mongodb-server.manpages
new file mode 100644
index 0000000..ac4a0fc
--- /dev/null
+++ b/debian/mongodb-server.manpages
@@ -0,0 +1,2 @@
+debian/manpages/mongod.1
+debian/manpages/mongos.1
diff --git a/debian/mongoimportjson.1 b/debian/mongoimportjson.1
deleted file mode 100644
index 5f3f450..0000000
--- a/debian/mongoimportjson.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.\" Documentation for the MongoDB shell
-.TH MONGOIMPORTJSON "1" "June 2009" "10gen" "Mongo Database"
-.SH "NAME"
-mongoimportjson \- the Mongo import tool
-.SH "SYNOPSIS"
-\fBmongoimportjson [\fIOPTIONS\fR]\fR
-.SH "DESCRIPTION"
-.PP
-\fBmongoimportjson\fR
-is a tool to import JSON documents into MongoDB. This utility takes a single file that contains one JSON string per line and inserts it. A databaase and collection must be specified.
-.SH "OPTIONS"
-.TP
-.B \-\-help
-show usage information
-.TP
-.B \-h, \-\-host HOST
-server to connect to (default HOST=localhost)
-.TP
-.B \-d, \-\-db DATABASE
-database to use
-.TP
-.B \-c, \-\-c COLLECTION
-collection to use
-.TP
-.B \-\-file FILE
-file from which to import
-.TP
-.B \-\-dbpath PATH
-directly access mongod data files in this path, instead of connecting to a mongod instance
-.TP
-.B \-\-idbefore
-create id index before importing
-.TP
-.B \-\-id
-create id index after importing (recommended)
-.TP
-.B \-\-drop
-drop collection before importing
-.SH "COPYRIGHT"
-.PP
-Copyright 2007\-2009 10gen
-.SH "SEE ALSO"
-For more information, please refer to the MongoDB wiki, available at http://www.mongodb.org.
-.SH "AUTHOR"
-Kristina Chodorow
diff --git a/debian/rules b/debian/rules
index 61118b1..974a844 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,129 +1,19 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/scons.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
-# debug and nostrip is effectively equivalent for current version of scons
-# build system in current mongodb revision
-DEB_SCONS_FLAGS :=
+DEB_DH_INSTALLINIT_ARGS = --name=mongodb
+
+DEB_SCONS_OPTIONS :=
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- DEB_SCONS_FLAGS := --d=DEBUGBUILD
+ DEB_SCONS_OPTIONS := --d=DEBUGBUILD
endif
ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- DEB_SCONS_FLAGS := --d=DEBUGBUILD
+ DEB_SCONS_OPTIONS := --d=DEBUGBUILD
endif
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- scons $(DEB_SCONS_FLAGS)
- #docbook-to-man debian/mongodb.sgml > mongodb.1
-
- #run regression tests
- scons --smokedbprefix=$(CURDIR)/debian/tmp-test smoke
- rm -rf $(CURDIR)/debian/tmp-test
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- rm -rf $(CURDIR)/debian/tmp
- # FIXME: scons freaks out at the presence of target files
- # under debian/tmp.
- scons -c
- rm -f config.log
- rm -f mongo
- rm -f mongod
- rm -f mongoimportjson
- rm -f mongoexport
- rm -f mongorestore
- rm -f mongodump
- rm -f mongofiles
- rm -f .sconsign.dblite
- rm -f libmongoclient.a
- rm -rf client/*.o
- rm -rf tools/*.o
- rm -rf shell/*.o
- rm -rf .sconf_temp
- rm -f buildscripts/*.pyc
- rm -f *.pyc
- rm -f buildinfo.cpp
- rm -rf debian/tmp-test
- rm -f debian/mongodb.upstart
- dh_clean debian/files
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- scons --prefix=$(CURDIR)/debian/tmp/usr --full install
-
- mkdir -p $(CURDIR)/debian/tmp/usr/share/lintian/overrides/
- install -m 644 $(CURDIR)/debian/mongodb-server.lintian \
- $(CURDIR)/debian/tmp/usr/share/lintian/overrides/mongodb-server
- install -m 644 $(CURDIR)/debian/mongodb-clients.lintian \
- $(CURDIR)/debian/tmp/usr/share/lintian/overrides/mongodb-clients
-
- mkdir -p $(CURDIR)/debian/tmp/etc
- install -m 644 $(CURDIR)/debian/mongodb.conf \
- $(CURDIR)/debian/tmp/etc/mongodb.conf
-
- mkdir -p $(CURDIR)/debian/tmp/usr/share/man/man1
- install -m 644 $(CURDIR)/debian/*.1 \
- $(CURDIR)/debian/tmp/usr/share/man/man1
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
- dh_installinit -pmongodb-server --name=mongodb
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+DEB_SCONS_INSTALL_OPTIONS += --prefix=$(CURDIR)/debian/tmp/usr --full
+DEB_SCONS_CHECK_TARGET = --smokedbprefix=$(CURDIR)/debian/tmp-test smoke
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mongodb/pkg-mongodb.git
More information about the Pkg-mongodb-maintainers
mailing list