From: <z-...@us...> - 2011-07-20 12:49:56
|
Revision: 9579 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9579&view=rev Author: z-man Date: 2011-07-20 12:49:45 +0000 (Wed, 20 Jul 2011) Log Message: ----------- Merging branch 0.2.8 from revision 9575 to 9578: ------------------------------------------------------------------------ r9578 | z-man | 2011-07-20 14:37:57 +0200 (Wed, 20 Jul 2011) | 2 lines Patching uninstaller out of ubuntu build. ------------------------------------------------------------------------ Revision Links: -------------- http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9575&view=rev Modified Paths: -------------- armagetronad/trunk/build/WorkMakefile Added Paths: ----------- armagetronad/trunk/build/patches/ armagetronad/trunk/build/patches/ubuntu.patch Removed Paths: ------------- armagetronad/trunk/build/patches/ubuntu.patch Property Changed: ---------------- armagetronad/trunk/ Property changes on: armagetronad/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9575 + /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9578 Modified: armagetronad/trunk/build/WorkMakefile =================================================================== --- armagetronad/trunk/build/WorkMakefile 2011-07-20 12:37:57 UTC (rev 9578) +++ armagetronad/trunk/build/WorkMakefile 2011-07-20 12:49:45 UTC (rev 9579) @@ -363,6 +363,7 @@ # adapt the following line as ubuntu releases get updated bzr pull -d ../ubuntu || bzr branch lp:ubuntu/armagetronad ../ubuntu cp -ax ../ubuntu/debian $(UBUNTUSOURCEDIR)$*/debian + patch -p0 -d $(UBUNTUSOURCEDIR)$* < patches/ubuntu.patch # rebrand package # for f in ../ubuntu/debian/*; do sed -e "s/armagetronad/${PACKAGE}/g" < $$f | sed -e "s/${PACKAGE}\./armagetronad./g" > $(UBUNTUSOURCEDIR)/debian/$$(echo $$f | sed -e s,../ubuntu/debian/,, -e "s/armagetronad/${PACKAGE}/"); done for f in ../ubuntu/debian/*; do sed -e "s/armagetronad/${PACKAGE}/g" < $$f | sed -e "s/${PACKAGE}\.net/armagetronad.net/g" > $(UBUNTUSOURCEDIR)$*/debian/$$(echo $$f | sed -e s,../ubuntu/debian/,, -e "s/armagetronad/${PACKAGE}/"); done Deleted: armagetronad/trunk/build/patches/ubuntu.patch =================================================================== --- armagetronad/branches/0.2.8/build/patches/ubuntu.patch 2011-07-20 12:37:57 UTC (rev 9578) +++ armagetronad/trunk/build/patches/ubuntu.patch 2011-07-20 12:49:45 UTC (rev 9579) @@ -1,13 +0,0 @@ -=== modified file 'debian/rules' ---- debian/rules 2009-11-27 12:17:04 +0000 -+++ debian/rules 2011-07-20 12:30:54 +0000 -@@ -33,7 +33,7 @@ - endif - - # Special options to ./configure for client and server builds. --SHARED_OPTS := --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc --disable-etc --datadir=/usr/share --disable-games --bindir=/usr/games --enable-binreloc CXXFLAGS="$(CFLAGS)" CFLAGS="$(CFLAGS)" -+SHARED_OPTS := --disable-uninstall --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc --disable-etc --datadir=/usr/share --disable-games --bindir=/usr/games --enable-binreloc CXXFLAGS="$(CFLAGS)" CFLAGS="$(CFLAGS)" - SERVER_OPTS := --disable-glout --disable-useradd --disable-init - CLIENT_OPTS := --enable-glout - - Copied: armagetronad/trunk/build/patches/ubuntu.patch (from rev 9578, armagetronad/branches/0.2.8/build/patches/ubuntu.patch) =================================================================== --- armagetronad/trunk/build/patches/ubuntu.patch (rev 0) +++ armagetronad/trunk/build/patches/ubuntu.patch 2011-07-20 12:49:45 UTC (rev 9579) @@ -0,0 +1,13 @@ +=== modified file 'debian/rules' +--- debian/rules 2009-11-27 12:17:04 +0000 ++++ debian/rules 2011-07-20 12:30:54 +0000 +@@ -33,7 +33,7 @@ + endif + + # Special options to ./configure for client and server builds. +-SHARED_OPTS := --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc --disable-etc --datadir=/usr/share --disable-games --bindir=/usr/games --enable-binreloc CXXFLAGS="$(CFLAGS)" CFLAGS="$(CFLAGS)" ++SHARED_OPTS := --disable-uninstall --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc --disable-etc --datadir=/usr/share --disable-games --bindir=/usr/games --enable-binreloc CXXFLAGS="$(CFLAGS)" CFLAGS="$(CFLAGS)" + SERVER_OPTS := --disable-glout --disable-useradd --disable-init + CLIENT_OPTS := --enable-glout + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |