[mw-devel] MW3 r1299 - in trunk: . debian-template

[arthur at sucs.org]

Author: arthur
Date: 2012-11-28 17:11:50 +0000 (Wed, 28 Nov 2012)
New Revision: 1299

Modified:
   trunk/Makefile
   trunk/Makefile.common
   trunk/debian-template/control
   trunk/debian-template/rules
Log:
try to make it build a dbg package (needs fixing)


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2012-11-28 16:04:21 UTC (rev 1298)
+++ trunk/Makefile	2012-11-28 17:11:50 UTC (rev 1299)
@@ -59,8 +59,8 @@
 clean:
 	$(MAKE) -C src $@
 	$(MAKE) -C po $@
-	$(MAKE) -C src/webclient $@
-	$(MAKE) -C src/server $@
+	$(MAKE) -C src/webclient $@ SRCROOT=$(SRCROOT)
+	$(MAKE) -C src/server $@ SRCROOT=$(SRCROOT)
 
 version:
 	@echo $(VERSION)

Modified: trunk/Makefile.common
===================================================================
--- trunk/Makefile.common	2012-11-28 16:04:21 UTC (rev 1298)
+++ trunk/Makefile.common	2012-11-28 17:11:50 UTC (rev 1299)
@@ -3,6 +3,7 @@
 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)
@@ -12,6 +13,7 @@
 endif
 VERSION_TWEAK = $(SVNVER)
 endif
+endif
 
 VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_TWEAK)
 

Modified: trunk/debian-template/control
===================================================================
--- trunk/debian-template/control	2012-11-28 16:04:21 UTC (rev 1298)
+++ trunk/debian-template/control	2012-11-28 17:11:50 UTC (rev 1299)
@@ -11,3 +11,15 @@
 Description: Milliways III talker and BBS
  An integrated talker and BBS (bulletin board system) with a peer-to-peer
  architecture, intended to be used over telnet, ssh or similar.
+
+Package: mw3-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: debhelper (>= 5),
+    mw3 (= ${binary:Version}),
+        ${misc:Depends}
+Description: debugging symbols for mw3
+ Milliways III talker
+ .
+ This package contains the debugging symbols for mw3.

Modified: trunk/debian-template/rules
===================================================================
--- trunk/debian-template/rules	2012-11-28 16:04:21 UTC (rev 1298)
+++ trunk/debian-template/rules	2012-11-28 17:11:50 UTC (rev 1299)
@@ -24,10 +24,10 @@
 	dh_clean -k 
 	dh_installdirs
 	dh_auto_install -- prefix=/usr
-	rm $(CURDIR)/debian/mw3/usr/lib/mw/COPYING
-	rm $(CURDIR)/debian/mw3/usr/lib/mw/LICENSE
-	rm $(CURDIR)/debian/mw3/usr/lib/mw/README
-	rm $(CURDIR)/debian/mw3/usr/lib/mw/INSTALL
+	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
 
@@ -37,7 +37,7 @@
 	dh_installchangelogs 
 	dh_installdocs
 	dh_link
-	dh_strip
+	dh_strip --dbg-package=mw3-dbg
 	dh_compress
 	dh_fixperms
 	dh_installdeb
@@ -49,3 +49,7 @@
 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
+