tags 627419 + pending
thanks
Dear maintainer,
I've prepared an NMU for pennmush (versioned as 1.8.2p8-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards.
diff -u pennmush-1.8.2p8/debian/changelog pennmush-1.8.2p8/debian/changelog
--- pennmush-1.8.2p8/debian/changelog
+++ pennmush-1.8.2p8/debian/changelog
@@ -1,3 +1,13 @@
+pennmush (1.8.2p8-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Link with libm. (Closes: #627419)
+ Thanks to Colin Watson <cjwat...@ubuntu.com> for the patch.
+ * debian/control: Add ${misc:Depends}.
+ * Use system libpcre3.
+
+ -- Ansgar Burchardt <ans...@debian.org> Thu, 29 Dec 2011 13:32:02 +0100
+
pennmush (1.8.2p8-1) unstable; urgency=low
* New upstream release
diff -u pennmush-1.8.2p8/debian/control pennmush-1.8.2p8/debian/control
--- pennmush-1.8.2p8/debian/control
+++ pennmush-1.8.2p8/debian/control
@@ -2,7 +2,7 @@
Section: games
Priority: optional
Maintainer: Ervin Hearn III <nol...@korongil.net>
-Build-Depends: debhelper (>= 5.0.0), binutils (>= 2.12.90.0.1-4), libssl-dev
(>= 0.9.6c-2.woody.3), locales, libmysqlclient15-dev
+Build-Depends: debhelper (>= 5.0.0), binutils (>= 2.12.90.0.1-4), libssl-dev
(>= 0.9.6c-2.woody.3), locales, libmysqlclient15-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
@@ -11,7 +11,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
@@ -29,7 +29,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
@@ -47,7 +47,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
@@ -72,7 +72,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
diff -u pennmush-1.8.2p8/debian/rules pennmush-1.8.2p8/debian/rules
--- pennmush-1.8.2p8/debian/rules
+++ pennmush-1.8.2p8/debian/rules
@@ -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)
only in patch2:
unchanged:
--- pennmush-1.8.2p8.orig/src/Makefile.SH
+++ pennmush-1.8.2p8/src/Makefile.SH
@@ -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)
@@ -111,7 +111,7 @@
netmud: $(O_FILES)
@echo "Making netmud."
-mv -f netmud netmud~
- $(CC) $(LDFLAGS) $(CCFLAGS) -o netmud $(O_FILES) $(LIBS)
+ $(CC) $(LDFLAGS) $(CCFLAGS) -o netmud $(O_FILES) $(LIBS) -lm
# By default, db.c initially allocates enough space for 5000 objects, then
# grows the space if needed. To change this value, include
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
