Author: ceros-guest
Date: 2008-01-17 20:23:15 +0000 (Thu, 17 Jan 2008)
New Revision: 5438
Modified:
packages/trunk/ogreal/debian/patches/fix_typo.diff
packages/trunk/ogreal/debian/patches/makefile_modifications.diff
packages/trunk/ogreal/debian/patches/series
packages/trunk/ogreal/debian/rules
Log:
Fixing fix_typo patch. Fix debian/rules to specify confflags and to use new
patch.
Modified: packages/trunk/ogreal/debian/patches/fix_typo.diff
===================================================================
--- packages/trunk/ogreal/debian/patches/fix_typo.diff 2008-01-17 20:06:47 UTC
(rev 5437)
+++ packages/trunk/ogreal/debian/patches/fix_typo.diff 2008-01-17 20:23:15 UTC
(rev 5438)
@@ -1,5 +1,7 @@
---- ./Demos/Basic_Demo/Listener.cpp~ 2007-10-11 11:55:59.000000000 -0400
-+++ ./Demos/Basic_Demo/Listener.cpp 2007-10-10 14:58:38.000000000 -0400
+Index: Fixing typo (s/numKeyboards/numKeyBoards/g)
+===================================================================
+--- ./Demos/Basic_Demo/Listener.cpp~ 2008-01-17 12:57:06.000000000 -0500
++++ ./Demos/Basic_Demo/Listener.cpp 2008-01-17 12:57:20.000000000 -0500
@@ -38,7 +38,7 @@
mMouse =
static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, true));
mMouse->setEventCallback(this);
@@ -10,8 +12,8 @@
mKeyboard =
static_cast<OIS::Keyboard*>(mInputManager->createInputObject(OIS::OISKeyboard,
true));
mKeyboard->setEventCallback(this);
---- ./Demos/Directional_Demo/Listener.cpp~ 2007-10-11 11:55:59.000000000
-0400
-+++ ./Demos/Directional_Demo/Listener.cpp 2007-10-10 14:58:05.000000000
-0400
+--- ./Demos/Directional_Demo/Listener.cpp~ 2008-01-17 12:57:06.000000000
-0500
++++ ./Demos/Directional_Demo/Listener.cpp 2008-01-17 12:57:20.000000000
-0500
@@ -40,7 +40,7 @@
mMouse =
static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, true));
mMouse->setEventCallback(this);
@@ -21,9 +23,9 @@
{
mKeyboard =
static_cast<OIS::Keyboard*>(mInputManager->createInputObject(OIS::OISKeyboard,
true));
mKeyboard->setEventCallback(this);
---- ./Demos/Doppler_Demo/Listener.cpp~ 2007-10-11 11:56:00.000000000 -0400
-+++ ./Demos/Doppler_Demo/Listener.cpp 2007-10-10 14:57:55.000000000 -0400
-@@ -123,7 +123,7 @@
+--- ./Demos/Doppler_Demo/Listener.cpp~ 2008-01-17 12:57:06.000000000 -0500
++++ ./Demos/Doppler_Demo/Listener.cpp 2008-01-17 12:57:20.000000000 -0500
+@@ -125,7 +125,7 @@
mMouse =
static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, true));
mMouse->setEventCallback(this);
}
@@ -32,8 +34,8 @@
{
mKeyboard =
static_cast<OIS::Keyboard*>(mInputManager->createInputObject(OIS::OISKeyboard,
true));
mKeyboard->setEventCallback(this);
---- ./Demos/MultiChannel_Demo/Listener.cpp~ 2007-10-11 11:56:00.000000000
-0400
-+++ ./Demos/MultiChannel_Demo/Listener.cpp 2007-10-10 14:57:39.000000000
-0400
+--- ./Demos/ManySources_Demo/Listener.cpp~ 2008-01-17 12:57:06.000000000
-0500
++++ ./Demos/ManySources_Demo/Listener.cpp 2008-01-17 12:57:20.000000000
-0500
@@ -38,7 +38,7 @@
mMouse =
static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, true));
mMouse->setEventCallback(this);
@@ -43,3 +45,25 @@
{
mKeyboard =
static_cast<OIS::Keyboard*>(mInputManager->createInputObject(OIS::OISKeyboard,
true));
mKeyboard->setEventCallback(this);
+--- ./Demos/MultiChannel_Demo/Listener.cpp~ 2008-01-17 12:57:06.000000000
-0500
++++ ./Demos/MultiChannel_Demo/Listener.cpp 2008-01-17 12:57:20.000000000
-0500
+@@ -38,7 +38,7 @@
+ mMouse =
static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, true));
+ mMouse->setEventCallback(this);
+ }
+- if(mInputManager->numKeyboards() > 0)
++ if(mInputManager->numKeyBoards() > 0)
+ {
+ mKeyboard =
static_cast<OIS::Keyboard*>(mInputManager->createInputObject(OIS::OISKeyboard,
true));
+ mKeyboard->setEventCallback(this);
+--- ./Demos/PlayPen/Listener.cpp~ 2008-01-17 12:57:06.000000000 -0500
++++ ./Demos/PlayPen/Listener.cpp 2008-01-17 12:57:20.000000000 -0500
+@@ -38,7 +38,7 @@
+ mMouse =
static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, true));
+ mMouse->setEventCallback(this);
+ }
+- if(mInputManager->numKeyboards() > 0)
++ if(mInputManager->numKeyBoards() > 0)
+ {
+ mKeyboard =
static_cast<OIS::Keyboard*>(mInputManager->createInputObject(OIS::OISKeyboard,
true));
+ mKeyboard->setEventCallback(this);
Modified: packages/trunk/ogreal/debian/patches/makefile_modifications.diff
===================================================================
--- packages/trunk/ogreal/debian/patches/makefile_modifications.diff
2008-01-17 20:06:47 UTC (rev 5437)
+++ packages/trunk/ogreal/debian/patches/makefile_modifications.diff
2008-01-17 20:23:15 UTC (rev 5438)
@@ -1,3 +1,5 @@
+Index: Some makefile modifications for making Debian packages.
+===================================================================
--- ./Demos/Basic_Demo/Makefile.am~ 2008-01-17 12:57:06.000000000 -0500
+++ ./Demos/Basic_Demo/Makefile.am 2008-01-17 12:57:20.000000000 -0500
@@ -1,5 +1,5 @@
Modified: packages/trunk/ogreal/debian/patches/series
===================================================================
--- packages/trunk/ogreal/debian/patches/series 2008-01-17 20:06:47 UTC (rev
5437)
+++ packages/trunk/ogreal/debian/patches/series 2008-01-17 20:23:15 UTC (rev
5438)
@@ -1 +1,2 @@
makefile_modifications.diff
+fix_typo.diff
Modified: packages/trunk/ogreal/debian/rules
===================================================================
--- packages/trunk/ogreal/debian/rules 2008-01-17 20:06:47 UTC (rev 5437)
+++ packages/trunk/ogreal/debian/rules 2008-01-17 20:23:15 UTC (rev 5438)
@@ -4,28 +4,38 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# From the autotools-dev documentation section "Calling GNU configure properly"
+# Full path to doc is </usr/share/doc/autotools-dev/README.Debian.gz>.
+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
CFLAGS += -Wall -g
-
+# Supporting 'noopt' option. 'nostrip' option not provided as this package
+# creates debugging packages.
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
-from-dos:
+fromdos:
dh_testdir
fromdos -e Demos/Basic_Demo/Listener.cpp
fromdos -e Demos/Directional_Demo/Listener.cpp
fromdos -e Demos/Doppler_Demo/Listener.cpp
+ fromdos -e Demos/ManySources_Demo/Listener.cpp
fromdos -e Demos/MultiChannel_Demo/Listener.cpp
+ fromdos -e Demos/PlayPen/Listener.cpp
touch fromdos-stamp
-patch: from-dos patch-stamp
+patch: fromdos patch-stamp
patch-stamp:
dh_testdir
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
@@ -35,12 +45,13 @@
configure-stamp:
dh_testdir
# Modified bootstrapping from upstream, declares everything obsolete.
+ rm -rf autom4te.cache
libtoolize --force --copy
aclocal
autoheader -f
automake --add-missing --force-missing --copy --foreign
autoconf -f
- ./configure --prefix=/usr CFLAGS=$(CFLAGS)
+ ./configure --prefix=/usr $(confflags) CFLAGS=$(CFLAGS)
touch configure-stamp
build: configure build-stamp
@@ -49,28 +60,29 @@
$(MAKE)
touch build-stamp
-clean: clean-stamp unpatch to-dos
+clean: clean-stamp unpatch todos
clean-stamp:
dh_testdir
dh_testroot
[ ! -f Makefile ] || $(MAKE) clean distclean
dh_clean
- [ ! -d autom4te.cache ] || rm -r autom4te.cache
[ ! -f configure-stamp ] || rm configure-stamp
[ ! -f build-stamp ] || rm build-stamp
unpatch:
dh_testdir
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
- rm -f patch-stamp
+ [ ! -f patch-stamp ] || rm patch-stamp
-to-dos:
+todos:
dh_testdir
dh_testroot
todos -e Demos/Basic_Demo/Listener.cpp
todos -e Demos/Directional_Demo/Listener.cpp
todos -e Demos/Doppler_Demo/Listener.cpp
+ todos -e Demos/ManySources_Demo/Listener.cpp
todos -e Demos/MultiChannel_Demo/Listener.cpp
+ todos -e Demos/PlayPen/Listener.cpp
[ ! -f fromdos-stamp ] || rm fromdos-stamp
install: build
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
