[pkg-fgfs-crew] r211 - in /flightgear/trunk/debian: changelog control rules

[ovek at users.alioth.debian.org]

Author: ovek
Date: Mon Jul 16 06:47:14 2012
New Revision: 211

URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=211
Log:
Rewritten build rules for upstream's new cmake system.

Modified:
    flightgear/trunk/debian/changelog
    flightgear/trunk/debian/control
    flightgear/trunk/debian/rules

Modified: flightgear/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/debian/changelog?rev=211&op=diff
==============================================================================
--- flightgear/trunk/debian/changelog (original)
+++ flightgear/trunk/debian/changelog Mon Jul 16 06:47:14 2012
@@ -1,7 +1,10 @@
 flightgear (2.6.0-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
-  * New upstream release
+  * New upstream release.
+  * Depend on cmake. No longer depend on autotools-dev.
+  * Updated debian/rules for the new cmake-based build
+    system used by upstream.
+  * Added build-dependencies on libplib-dev and libudev-dev.
 
  -- Ove Kaaven <ovek at arcticnet.no>  Mon, 16 Jul 2012 06:01:36 +0200
 

Modified: flightgear/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/debian/control?rev=211&op=diff
==============================================================================
--- flightgear/trunk/debian/control (original)
+++ flightgear/trunk/debian/control Mon Jul 16 06:47:14 2012
@@ -9,8 +9,8 @@
  libglu1-mesa-dev | libglu1-xorg-dev | xlibmesa-glu-dev | libglu-dev,
  freeglut3-dev | libglut3-dev, zlib1g-dev, libjpeg8-dev | libjpeg62-dev | libjpeg-dev,
  libboost-dev, libplib-dev (>= 1.8.5), libopenscenegraph-dev (>> 3.0.0),
- libopenal-dev, libalut-dev, libsvn-dev, autotools-dev,
- simgear-dev (>= 2.4.0-1)
+ libopenal-dev, libalut-dev, libplib-dev, libsvn-dev, libudev-dev,
+ cmake (>= 2.6), simgear-dev (>= 2.6.0-1)
 Standards-Version: 3.7.3
 Homepage: http://www.flightgear.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/
@@ -18,9 +18,9 @@
 
 Package: flightgear
 Architecture: any
-Depends: ${shlibs:Depends}, fgfs-base (>= 2.4.0), ${misc:Depends}
-Recommends: fgfs-aircraft-base (>= 2.4.0), fgfs-models-base (>= 2.4.0),
- fgfs-scenery-base (>= 2.4.0)
+Depends: ${shlibs:Depends}, fgfs-base (>= 2.6.0), ${misc:Depends}
+Recommends: fgfs-aircraft-base (>= 2.6.0), fgfs-models-base (>= 2.6.0),
+ fgfs-scenery-base (>= 2.6.0)
 Description: Flight Gear Flight Simulator
  Flight Gear is a free and highly sophisticated flight simulator.
  .

Modified: flightgear/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/debian/rules?rev=211&op=diff
==============================================================================
--- flightgear/trunk/debian/rules (original)
+++ flightgear/trunk/debian/rules Mon Jul 16 06:47:14 2012
@@ -15,22 +15,31 @@
 MAKEFLAGS += -j$(NUMJOBS)
 endif
 
+CMAKE_FLAGS=-DCMAKE_INSTALL_PREFIX=/usr \
+	-DFG_DATA_DIR=/usr/share/games/flightgear \
+	-DSIMGEAR_SHARED=ON \
+	-DJPEG_FACTORY=ON \
+	-DENABLE_FGADMIN=OFF \
+	-DENABLE_LARCSIM=ON \
+	-DENABLE_UIUC_MODEL=ON \
+	-DSP_FDMS=ON
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
+
+	mkdir build
+	cd build && \
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" \
-	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
-		    --bindir=\$${prefix}/games --datadir=\$${prefix}/share/games \
-		    --with-simgear=/usr --with-multiplayer --with-threads
+	cmake .. $(CMAKE_FLAGS) -LH
+
 	touch configure-stamp
 
 build: configure-stamp build-stamp
 build-stamp: configure-stamp
 	dh_testdir
 
-	$(MAKE)
-
-	#/usr/bin/docbook-to-man debian/flightgear.sgml > flightgear.1
+	cd build && $(MAKE)
 
 	touch build-stamp
 
@@ -39,24 +48,18 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	-$(MAKE) -i clean
-	-$(MAKE) -i distclean
-	# distclean seems to not always be thorough
-	-find -name Makefile -type f -exec rm -f {} \;
-	-find -name .deps -type d -exec rm -rf {} \;
+	rm -rf build
 
 	dh_clean
-
-	# update from autotools-dev
-	cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub .
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	dh_installdirs
+	dh_prep
+#	dh_installdirs
 
-	$(MAKE) install prefix=$(CURDIR)/debian/flightgear/usr
+	cd build && \
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/flightgear
 
 # Build architecture-independent files here.
 binary-indep: build install