[pkg-fgfs-crew] r198 - in /simgear/trunk/debian: changelog control deps.py rules sorules

Sun Jul 15 23:00:21 UTC 2012

Author: ovek
Date: Sun Jul 15 23:00:21 2012
New Revision: 198

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

Removed:
    simgear/trunk/debian/deps.py
    simgear/trunk/debian/sorules
Modified:
    simgear/trunk/debian/changelog
    simgear/trunk/debian/control
    simgear/trunk/debian/rules

Modified: simgear/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/debian/changelog?rev=198&op=diff
==============================================================================

--- simgear/trunk/debian/changelog (original)
+++ simgear/trunk/debian/changelog Sun Jul 15 23:00:21 2012
@@ -1,8 +1,16 @@
-simgear (2.6.0-1) UNRELEASED; urgency=low
-
-  * New upstream release
-
- -- Ove Kaaven <ovek at arcticnet.no>  Sun, 15 Jul 2012 10:37:42 +0200
+simgear (2.6.0-1) unstable; urgency=low
+
+  * 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, and cleaned it up a bit.
+  * Use upstream's new SIMGEAR_SHARED build option to
+    build the shared libraries. Deleted the previous
+    debian/sorules stuff.
+  * Added the "Thanks" file to debian/docs.
+  * Updated debian/watch, the mirror is now ibiblio.org.
+
+ -- Ove Kaaven <ovek at arcticnet.no>  Mon, 16 Jul 2012 00:55:25 +0200
 
 simgear (2.4.0-1.3) unstable; urgency=low
 

Modified: simgear/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/debian/control?rev=198&op=diff
==============================================================================
--- simgear/trunk/debian/control (original)
+++ simgear/trunk/debian/control Sun Jul 15 23:00:21 2012
@@ -9,13 +9,13 @@
  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
+ libopenal-dev, libalut-dev, libsvn-dev, cmake (>= 2.6)
 Standards-Version: 3.7.3
 Homepage: http://www.simgear.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/
 Vcs-Svn: svn://svn.debian.org/pkg-fgfs/simgear/trunk/
 
-Package: simgear2.4.0
+Package: simgear2.6.0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: simgear0
@@ -29,7 +29,7 @@
 Package: simgear-dev
 Architecture: any
 Section: devel
-Depends: simgear2.4.0 (= ${binary:Version}), libplib-dev, libopenscenegraph-dev, libc6-dev, ${misc:Depends}
+Depends: simgear2.6.0 (= ${binary:Version}), libplib-dev, libopenscenegraph-dev, libc6-dev, ${misc:Depends}
 Description: Simulator Construction Gear -- development files
  SimGear is a collection of libraries useful for constructing
  simulation and visualization applications such as FlightGear

Modified: simgear/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/debian/rules?rev=198&op=diff
==============================================================================
--- simgear/trunk/debian/rules (original)
+++ simgear/trunk/debian/rules Sun Jul 15 23:00:21 2012
@@ -19,13 +19,24 @@
 version := $(shell echo $(deb_version)|sed -n 's,^\(.*\)-[^-]*$$,\1,p')
 package := simgear$(version)
 
+CMAKE_FLAGS=-DCMAKE_INSTALL_PREFIX=/usr \
+    -DJPEG_FACTORY=ON
+CMAKE_SOFLAGS=-DSIMGEAR_SHARED=ON
+CMAKE_LIBFLAGS=
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
+	mkdir build-so
+	cd build-so && \
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" \
-	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
-		    --with-jpeg-factory
+	cmake .. $(CMAKE_FLAGS) $(CMAKE_SOFLAGS)
+
+	mkdir build-lib
+	cd build-lib && \
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" \
+	cmake .. $(CMAKE_FLAGS) $(CMAKE_LIBFLAGS)
 
 	touch configure-stamp
 
@@ -33,16 +44,8 @@
 build-stamp: configure-stamp
 	dh_testdir
 
-	# First build the shared libraries
-	$(MAKE) CPPFLAGS="-fPIC -pipe"
-
-	# "convert" .a to .so (yikes)
-	$(MAKE) -f debian/sorules
-
-	$(MAKE) clean
-
-	# Then build the static library without PIC
-	$(MAKE) CPPFLAGS="-pipe"
+	cd build-so && $(MAKE)
+	cd build-lib && $(MAKE)
 
 	touch build-stamp
 
@@ -51,36 +54,29 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	$(MAKE) -f debian/sorules clean
-	-$(MAKE) -i clean
-	-$(MAKE) -i distclean
-	# distclean seems to not always be thorough
-	-find -name .deps -type d -exec rm -rf {} \;
-	# regenerated during build
-	-rm -f simgear/version.h
+	rm -rf build-so
+	rm -rf build-lib
 
 	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
 
-	# Install static libraries and include files
-	$(MAKE) install prefix=$(CURDIR)/debian/simgear-dev/usr
+	# Install libraries and headers
+	cd build-so && \
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	cd build-lib && \
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 	# Install shared libraries
-	install -d debian/$(package)/usr/lib
-	find simgear -name 'lib*.so.*' -exec \
-	 install -m 755 {} $(CURDIR)/debian/$(package)/usr/lib \;
-	(cd debian/$(package)/usr/lib && for ii in `ls lib*.so.*`; do \
-	 ln -s $$ii `echo $$ii|sed 's/\\.so\\..*/.so/'`; done)
-	mv debian/$(package)/usr/lib/lib*.so debian/simgear-dev/usr/lib
-
+	dh_install -p$(package) --autodest debian/tmp/usr/lib/*/*.so.*
+	dh_install -psimgear-dev --autodest debian/tmp/usr/lib/*/*.so
+	# Install static libraries
+	dh_install -psimgear-dev --autodest debian/tmp/usr/lib/*/*.a
+	# Install headers
+	dh_install -psimgear-dev --autodest debian/tmp/usr/include
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -91,27 +87,14 @@
 	dh_testdir
 	dh_testroot
 
-#	dh_installdebconf	
 	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installinit
-	dh_installcron
-#	dh_installmanpages
-	dh_installinfo
-#	dh_undocumented
 	dh_installchangelogs ChangeLog
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-	# You may want to make some executables suid here.
-#	dh_suidregister
 	dh_makeshlibs -V
 	dh_installdeb
-#	dh_perl
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums


