[mw-devel] MW3 r1301 - in trunk: . debian-template src src/server src/webclient
welshbyte at sucs.org
welshbyte at sucs.org
Wed Nov 28 19:38:23 GMT 2012
Author: welshbyte
Date: 2012-11-28 19:38:23 +0000 (Wed, 28 Nov 2012)
New Revision: 1301
Added:
trunk/debian-template/mw3.dirs
trunk/debian-template/mw3.install
trunk/debian-template/postrm
Removed:
trunk/debian-template/dirs
Modified:
trunk/Makefile
trunk/Makefile.common
trunk/debian-template/compat
trunk/debian-template/control
trunk/debian-template/postinst
trunk/debian-template/rules
trunk/mwserv.init
trunk/src/Makefile
trunk/src/server/Makefile
trunk/src/webclient/Makefile
Log:
Update .deb building bits
- Remove the -s from `install' runs in the src/ Makefiles to stop stripping our binaries
- Add a new -dbg deb package
- Update to debhelper compat level 7 and make use of the new magic in the rules file
- Add mw3.install to tell it what files to install in the mw3 package
- Rename dirs to mw3.dirs
- Stop lintian complaining about the init script
- Etc.
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-11-28 19:28:38 UTC (rev 1300)
+++ trunk/Makefile 2012-11-28 19:38:23 UTC (rev 1301)
@@ -46,7 +46,7 @@
deb: export
$(MAKE) -C $(TMPDIR)/$(MWVERSION) $@
- mv $(TMPDIR)/mw3_$(VERSION)*.deb $(CURDIR)/
+ mv $(TMPDIR)/mw3{,-dbg}_$(VERSION)*.deb $(CURDIR)/
rm -rf $(TMPDIR)/$(MWVERSION)
else
# A temp dir doesn't exist so create it and invoke this makefile again
Modified: trunk/Makefile.common
===================================================================
--- trunk/Makefile.common 2012-11-28 19:28:38 UTC (rev 1300)
+++ trunk/Makefile.common 2012-11-28 19:38:23 UTC (rev 1301)
@@ -3,7 +3,6 @@
VERSION_MAJOR = 2
VERSION_MINOR = 17
-ifeq ($(VERSION_TWEAK),)
ifeq ($(SVNVER),exported)
# mw.rev is created after an export so we can rely on it to provide the svn rev here
VERSION_TWEAK = $(shell cat $(SRCROOT)/mw.rev)
@@ -13,13 +12,12 @@
endif
VERSION_TWEAK = $(SVNVER)
endif
-endif
VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_TWEAK)
MWVERSION = mw3-$(VERSION)
-prefix ?= /usr/local
+prefix ?= /usr
libdir ?= $(prefix)/lib
bindir ?= $(prefix)/bin
datadir ?= $(prefix)/share
Modified: trunk/debian-template/compat
===================================================================
--- trunk/debian-template/compat 2012-11-28 19:28:38 UTC (rev 1300)
+++ trunk/debian-template/compat 2012-11-28 19:38:23 UTC (rev 1301)
@@ -1 +1 @@
-5
+7
Modified: trunk/debian-template/control
===================================================================
--- trunk/debian-template/control 2012-11-28 19:28:38 UTC (rev 1300)
+++ trunk/debian-template/control 2012-11-28 19:38:23 UTC (rev 1301)
@@ -2,7 +2,7 @@
Section: misc
Priority: extra
Maintainer: Milliways Developers <mw-devel at lists.sucs.org>
-Build-Depends: cdbs, debhelper (>= 5), libreadline-dev (>=5), libcurl4-dev | libcurl-dev, libmozjs-dev, libsqlite3-dev
+Build-Depends: debhelper (>= 8), libreadline-dev (>=5), libcurl4-dev | libcurl-dev, libmozjs-dev, libsqlite3-dev, libjansson-dev
Standards-Version: 3.7.2
Package: mw3
@@ -16,9 +16,7 @@
Architecture: any
Section: debug
Priority: extra
-Depends: debhelper (>= 5),
- mw3 (= ${binary:Version}),
- ${misc:Depends}
+Depends: debhelper (>= 5), mw3 (= ${binary:Version}), ${misc:Depends}
Description: debugging symbols for mw3
Milliways III talker
.
Deleted: trunk/debian-template/dirs
===================================================================
--- trunk/debian-template/dirs 2012-11-28 19:28:38 UTC (rev 1300)
+++ trunk/debian-template/dirs 2012-11-28 19:38:23 UTC (rev 1301)
@@ -1,5 +0,0 @@
-usr/bin
-usr/lib/mw
-var/log/mw
-var/lib/mw
-var/run/mw
Copied: trunk/debian-template/mw3.dirs (from rev 1299, trunk/debian-template/dirs)
===================================================================
--- trunk/debian-template/mw3.dirs (rev 0)
+++ trunk/debian-template/mw3.dirs 2012-11-28 19:38:23 UTC (rev 1301)
@@ -0,0 +1,5 @@
+usr/bin
+usr/lib/mw
+var/log/mw
+var/lib/mw
+var/run/mw
Added: trunk/debian-template/mw3.install
===================================================================
--- trunk/debian-template/mw3.install (rev 0)
+++ trunk/debian-template/mw3.install 2012-11-28 19:38:23 UTC (rev 1301)
@@ -0,0 +1,4 @@
+usr/bin/mw
+usr/lib/mw/*
+usr/share/locale/*
+etc/init.d/mwserv
Modified: trunk/debian-template/postinst
===================================================================
--- trunk/debian-template/postinst 2012-11-28 19:28:38 UTC (rev 1300)
+++ trunk/debian-template/postinst 2012-11-28 19:38:23 UTC (rev 1301)
@@ -20,6 +20,8 @@
--ingroup mw mw
fi
+update-rc.d mwserv defaults
+
chown -R mw:mw /usr/lib/mw
chown mw:mw /usr/bin/mw
chown mw:mw /usr/lib/mw/mwpoll
Added: trunk/debian-template/postrm
===================================================================
--- trunk/debian-template/postrm (rev 0)
+++ trunk/debian-template/postrm 2012-11-28 19:38:23 UTC (rev 1301)
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+if [ "$1" = purge ]; then
+ update-rc.d mwserv remove
+fi
Modified: trunk/debian-template/rules
===================================================================
--- trunk/debian-template/rules 2012-11-28 19:28:38 UTC (rev 1300)
+++ trunk/debian-template/rules 2012-11-28 19:38:23 UTC (rev 1301)
@@ -1,55 +1,9 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- touch configure-stamp
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
- dh_auto_build -- prefix=/usr
- touch $@
+%:
+ dh $@
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- $(MAKE) clean
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- dh_auto_install -- prefix=/usr
- rm -f $(CURDIR)/debian/mw3/usr/lib/mw/COPYING
- rm -f $(CURDIR)/debian/mw3/usr/lib/mw/LICENSE
- rm -f $(CURDIR)/debian/mw3/usr/lib/mw/README
- rm -f $(CURDIR)/debian/mw3/usr/lib/mw/INSTALL
-
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_link
- dh_strip --dbg-package=mw3-dbg
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
-
-.PHONY: override_dh_strip
override_dh_strip:
dh_strip --dbg-package=mw3-dbg
Modified: trunk/mwserv.init
===================================================================
--- trunk/mwserv.init 2012-11-28 19:28:38 UTC (rev 1300)
+++ trunk/mwserv.init 2012-11-28 19:38:23 UTC (rev 1301)
@@ -1,8 +1,8 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: mw
-# Required-Start:
-# Required-Stop:
+# Required-Start: $remote_fs
+# Required-Stop: $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Milliways comms server
Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile 2012-11-28 19:28:38 UTC (rev 1300)
+++ trunk/src/Makefile 2012-11-28 19:38:23 UTC (rev 1301)
@@ -70,7 +70,7 @@
$(CC) $(LDFLAGS) -o $@ $^
install: mw
- install -Ds mw $(DESTDIR)$(bindir)/mw
+ install -D mw $(DESTDIR)$(bindir)/mw
install -d $(DESTDIR)$(LOGDIR)
install -d $(DESTDIR)$(MSGDIR)
install -d $(DESTDIR)$(STATEDIR)
Modified: trunk/src/server/Makefile
===================================================================
--- trunk/src/server/Makefile 2012-11-28 19:28:38 UTC (rev 1300)
+++ trunk/src/server/Makefile 2012-11-28 19:38:23 UTC (rev 1301)
@@ -53,7 +53,7 @@
-rm -f *.o *.d mwserv
install: mwserv
- install -Ds mwserv $(DESTDIR)$(HOMEPATH)/mwserv
+ install -D mwserv $(DESTDIR)$(HOMEPATH)/mwserv
ifndef TESTDIR
test:
Modified: trunk/src/webclient/Makefile
===================================================================
--- trunk/src/webclient/Makefile 2012-11-28 19:28:38 UTC (rev 1300)
+++ trunk/src/webclient/Makefile 2012-11-28 19:38:23 UTC (rev 1301)
@@ -53,7 +53,7 @@
-rm -f *.o *.d mwpoll
install: mwpoll
- install -Ds mwpoll $(DESTDIR)$(HOMEPATH)/mwpoll
+ install -D mwpoll $(DESTDIR)$(HOMEPATH)/mwpoll
ifndef TESTDIR
test:
More information about the mw-devel
mailing list