Merge lp:~logan/ubuntu/raring/pennmush/debian-merge into lp:ubuntu/raring/pennmush

[Logan Rosen]

[Daniel Holbach (dholbach)]

Good work.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-24 00:03:31 +0000
+++ debian/changelog	2012-11-28 07:09:19 +0000
@@ -1,3 +1,22 @@
+pennmush (1.8.2p8-1.1ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Set DH_OPTIONS in binary-indep and binary-arch to avoid duplicated work
+      (which caused a build failure in the presence of pkgbinarymangler).
+    - Build-Depends on libmysqlclient-dev instead of libmysqlclient15-dev.
+
+ -- Logan Rosen <[e-mail]>  Wed, 28 Nov 2012 01:54:29 -0500
+
+pennmush (1.8.2p8-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Link with libm. (Closes: #627419)
+    Thanks to Colin Watson <[e-mail]> for the patch.
+  * debian/control: Add ${misc:Depends}.
+  * Use system libpcre3.
+
+ -- Ansgar Burchardt <[e-mail]>  Thu, 29 Dec 2011 13:32:02 +0100
+
 pennmush (1.8.2p8-1ubuntu3) precise; urgency=low
 
   * Rebuild for libmysqlclient transition
 
=== modified file 'debian/control'
--- debian/control	2011-05-20 13:54:48 +0000
+++ debian/control	2012-11-28 07:09:19 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Ervin Hearn III <[e-mail]>
-Build-Depends: debhelper (>= 5.0.0), binutils (>= 2.12.90.0.1-4), libssl-dev (>= 0.9.6c-2.woody.3), locales, libmysqlclient-dev
+Build-Depends: debhelper (>= 5.0.0), binutils (>= 2.12.90.0.1-4), libssl-dev (>= 0.9.6c-2.woody.3), locales, libmysqlclient-dev, libpcre3-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.pennmush.org/1.8.2/trunk/
 Vcs-Browser: http://dev.pennmush.org/browser/1.8.2/trunk
@@ -12,7 +12,7 @@
 Package: pennmush
 Architecture: any
 Replaces: pennmush-mysql
-Depends: ${shlibs:Depends}, locales, pennmush-common (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, locales, pennmush-common (= ${source:Version})
 Suggests: perl
 Conflicts: pennmush-mysql
 Description: text-based multi-user virtual world server
@@ -30,7 +30,7 @@
 
 Package: pennmush-common
 Architecture: all
-Depends: ${shlibs:Depends}, locales
+Depends: ${misc:Depends}, ${shlibs:Depends}, locales
 Recommends: pennmush | pennmush-mysql, pennmush-i18n
 Suggests: perl
 Description: common files for the PennMUSH virtual world server
@@ -48,7 +48,7 @@
 
 Package: pennmush-i18n
 Architecture: all
-Depends: ${shlibs:Depends}, locales, pennmush-common (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, locales, pennmush-common (= ${source:Version})
 Recommends: pennmush | pennmush-mysql
 Suggests: perl
 Description: i18n support files for the PennMUSH virtual world server
@@ -73,7 +73,7 @@
 Package: pennmush-mysql
 Architecture: any
 Replaces: pennmush
-Depends: ${shlibs:Depends}, locales, pennmush-common (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, locales, pennmush-common (= ${source:Version})
 Suggests: perl
 Conflicts: pennmush
 Description: text-based multi-user virtual world server with MySQL support
 
=== modified file 'debian/rules'
--- debian/rules	2011-05-24 11:17:39 +0000
+++ debian/rules	2012-11-28 07:09:19 +0000
@@ -31,6 +31,13 @@
 
 build: build-pennmush build-pennmush-common build-pennmush-i18n build-pennmush-mysql 
 
+define use-system-pcre
+  rm $@/hdrs/pcre.h $@/src/pcre.c
+  sed -i 's,#include "pcre.h",#include <pcre.h>,' $@/src/*.c
+  sed -i s,../hdrs/pcre.h,, $@/src/Makefile.SH
+  sed -i 's, pcre.[co],,' $@/src/Makefile.SH
+endef
+
 build-pennmush:
 
 	dh_testdir
@@ -44,6 +51,7 @@
 	cp -r hints build-pennmush
 	cp options.h options.h.dist confmagic.h config.over config_h.SH \
 	Configure Patchlevel Makefile.SH build-pennmush
+	$(use-system-pcre)
 	(cd build-pennmush && ./Configure $(COMMON_CFG) -D no_mysql && \
 	rm -f hdrs/switches.h src/switchinc.c && $(MAKE) update && $(MAKE) all \
 	&& mv src/netmud game/netmush)
@@ -63,6 +71,7 @@
 	cp -r hints build-pennmush-common
 	cp options.h options.h.dist confmagic.h config.over config_h.SH \
 	Configure Patchlevel Makefile.SH build-pennmush-common
+	$(use-system-pcre)
 	(cd build-pennmush-common && ./Configure $(COMMON_CFG) -D no_mysql && \
 	rm -f hdrs/switches.h src/switchinc.c && $(MAKE) update)
 
@@ -94,6 +103,7 @@
 	cp -r hints build-pennmush-mysql
 	cp options.h options.h.dist confmagic.h config.over config_h.SH \
 	Configure Patchlevel Makefile.SH build-pennmush-mysql
+	$(use-system-pcre)
 	(cd build-pennmush-mysql && ./Configure $(COMMON_CFG) && \
 	rm -f hdrs/switches.h src/switchinc.c && $(MAKE) update && $(MAKE) all \
 	&& mv src/netmud game/netmush)
 
=== modified file 'src/Makefile.SH'
--- src/Makefile.SH	2011-05-20 13:54:48 +0000
+++ src/Makefile.SH	2012-11-28 07:09:19 +0000
@@ -49,7 +49,7 @@
 LINTFILT=egrep -v '(possible pointer|long assign|not yet im|:$$)'
 
 # Libs
-LIBS=$(CLIBS) $(RLIBS) $(ILIBS)
+LIBS=$(CLIBS) $(RLIBS) $(ILIBS) -lpcre
 
 CFLAGS=$(CCFLAGS) $(RDEFS) $(IDEFS)