Ubuntu
pennmush package

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

  1. Raring (13.04)
  2. debian-merge
  3. Merge into raring
Proposed by Logan Rosen
Status: Merged
Merged at revision: 15
Proposed branch: lp:~logan/ubuntu/raring/pennmush/debian-merge
Merge into: lp:ubuntu/raring/pennmush
Diff against target: 129 lines (+35/-6)
4 files modified
debian/changelog (+19/-0)
debian/control (+5/-5)
debian/rules (+10/-0)
src/Makefile.SH (+1/-1)
To merge this branch: bzr merge lp:~logan/ubuntu/raring/pennmush/debian-merge
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Ubuntu branches Pending
Review via email: mp+136581@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-11-24 00:03:31 +0000
3+++ debian/changelog 2012-11-28 07:09:19 +0000
4@@ -1,3 +1,22 @@
5+pennmush (1.8.2p8-1.1ubuntu1) raring; urgency=low
6+
7+ * Merge from Debian unstable. Remaining changes:
8+ - Set DH_OPTIONS in binary-indep and binary-arch to avoid duplicated work
9+ (which caused a build failure in the presence of pkgbinarymangler).
10+ - Build-Depends on libmysqlclient-dev instead of libmysqlclient15-dev.
11+
12+ -- Logan Rosen <logatronico@gmail.com> Wed, 28 Nov 2012 01:54:29 -0500
13+
14+pennmush (1.8.2p8-1.1) unstable; urgency=low
15+
16+ * Non-maintainer upload.
17+ * Link with libm. (Closes: #627419)
18+ Thanks to Colin Watson <cjwatson@ubuntu.com> for the patch.
19+ * debian/control: Add ${misc:Depends}.
20+ * Use system libpcre3.
21+
22+ -- Ansgar Burchardt <ansgar@debian.org> Thu, 29 Dec 2011 13:32:02 +0100
23+
24 pennmush (1.8.2p8-1ubuntu3) precise; urgency=low
25
26 * Rebuild for libmysqlclient transition
27
28=== modified file 'debian/control'
29--- debian/control 2011-05-20 13:54:48 +0000
30+++ debian/control 2012-11-28 07:09:19 +0000
31@@ -3,7 +3,7 @@
32 Priority: optional
33 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
34 XSBC-Original-Maintainer: Ervin Hearn III <noltar@korongil.net>
35-Build-Depends: debhelper (>= 5.0.0), binutils (>= 2.12.90.0.1-4), libssl-dev (>= 0.9.6c-2.woody.3), locales, libmysqlclient-dev
36+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
37 Standards-Version: 3.7.3
38 Vcs-Svn: svn://svn.pennmush.org/1.8.2/trunk/
39 Vcs-Browser: http://dev.pennmush.org/browser/1.8.2/trunk
40@@ -12,7 +12,7 @@
41 Package: pennmush
42 Architecture: any
43 Replaces: pennmush-mysql
44-Depends: ${shlibs:Depends}, locales, pennmush-common (= ${source:Version})
45+Depends: ${misc:Depends}, ${shlibs:Depends}, locales, pennmush-common (= ${source:Version})
46 Suggests: perl
47 Conflicts: pennmush-mysql
48 Description: text-based multi-user virtual world server
49@@ -30,7 +30,7 @@
50
51 Package: pennmush-common
52 Architecture: all
53-Depends: ${shlibs:Depends}, locales
54+Depends: ${misc:Depends}, ${shlibs:Depends}, locales
55 Recommends: pennmush | pennmush-mysql, pennmush-i18n
56 Suggests: perl
57 Description: common files for the PennMUSH virtual world server
58@@ -48,7 +48,7 @@
59
60 Package: pennmush-i18n
61 Architecture: all
62-Depends: ${shlibs:Depends}, locales, pennmush-common (= ${source:Version})
63+Depends: ${misc:Depends}, ${shlibs:Depends}, locales, pennmush-common (= ${source:Version})
64 Recommends: pennmush | pennmush-mysql
65 Suggests: perl
66 Description: i18n support files for the PennMUSH virtual world server
67@@ -73,7 +73,7 @@
68 Package: pennmush-mysql
69 Architecture: any
70 Replaces: pennmush
71-Depends: ${shlibs:Depends}, locales, pennmush-common (= ${source:Version})
72+Depends: ${misc:Depends}, ${shlibs:Depends}, locales, pennmush-common (= ${source:Version})
73 Suggests: perl
74 Conflicts: pennmush
75 Description: text-based multi-user virtual world server with MySQL support
76
77=== modified file 'debian/rules'
78--- debian/rules 2011-05-24 11:17:39 +0000
79+++ debian/rules 2012-11-28 07:09:19 +0000
80@@ -31,6 +31,13 @@
81
82 build: build-pennmush build-pennmush-common build-pennmush-i18n build-pennmush-mysql
83
84+define use-system-pcre
85+ rm $@/hdrs/pcre.h $@/src/pcre.c
86+ sed -i 's,#include "pcre.h",#include <pcre.h>,' $@/src/*.c
87+ sed -i s,../hdrs/pcre.h,, $@/src/Makefile.SH
88+ sed -i 's, pcre.[co],,' $@/src/Makefile.SH
89+endef
90+
91 build-pennmush:
92
93 dh_testdir
94@@ -44,6 +51,7 @@
95 cp -r hints build-pennmush
96 cp options.h options.h.dist confmagic.h config.over config_h.SH \
97 Configure Patchlevel Makefile.SH build-pennmush
98+ $(use-system-pcre)
99 (cd build-pennmush && ./Configure $(COMMON_CFG) -D no_mysql && \
100 rm -f hdrs/switches.h src/switchinc.c && $(MAKE) update && $(MAKE) all \
101 && mv src/netmud game/netmush)
102@@ -63,6 +71,7 @@
103 cp -r hints build-pennmush-common
104 cp options.h options.h.dist confmagic.h config.over config_h.SH \
105 Configure Patchlevel Makefile.SH build-pennmush-common
106+ $(use-system-pcre)
107 (cd build-pennmush-common && ./Configure $(COMMON_CFG) -D no_mysql && \
108 rm -f hdrs/switches.h src/switchinc.c && $(MAKE) update)
109
110@@ -94,6 +103,7 @@
111 cp -r hints build-pennmush-mysql
112 cp options.h options.h.dist confmagic.h config.over config_h.SH \
113 Configure Patchlevel Makefile.SH build-pennmush-mysql
114+ $(use-system-pcre)
115 (cd build-pennmush-mysql && ./Configure $(COMMON_CFG) && \
116 rm -f hdrs/switches.h src/switchinc.c && $(MAKE) update && $(MAKE) all \
117 && mv src/netmud game/netmush)
118
119=== modified file 'src/Makefile.SH'
120--- src/Makefile.SH 2011-05-20 13:54:48 +0000
121+++ src/Makefile.SH 2012-11-28 07:09:19 +0000
122@@ -49,7 +49,7 @@
123 LINTFILT=egrep -v '(possible pointer|long assign|not yet im|:$$)'
124
125 # Libs
126-LIBS=$(CLIBS) $(RLIBS) $(ILIBS)
127+LIBS=$(CLIBS) $(RLIBS) $(ILIBS) -lpcre
128
129 CFLAGS=$(CCFLAGS) $(RDEFS) $(IDEFS)
130

Subscribers

People subscribed via source and target branches

to all changes: