[SCM] whitedune/master: Clean up

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4856e29fbb84982b42b12d24738417826909e70c
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Jan 9 21:00:32 2016 +0100

    Clean up

diff --git a/debian/control b/debian/control
index 1e68fee..c51173b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,7 @@ Build-Depends:
  debhelper (>= 9),
  flex,
  gawk,
- libgl1-mesa-dev,
- libgl1-mesa-dev | libgl-dev | freeglut3-dev,
+ libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev,
  libjpeg-dev,
  libmotif-dev,
@@ -32,7 +31,7 @@ Depends:
 Recommends: xfonts-100dpi | xfonts-100dpi-transcoded | xfonts-75dpi | xfonts-75dpi-transcoded
 Suggests:
  whitedune-docs,
-  x-www-browser
+ x-www-browser
 Description: graphical VRML97/X3D viewer, editor, 3D modeller and animation tool
  Whitedune can read VRML97 files, display and let the user change the
  scenegraph and all fields of all nodes.
diff --git a/debian/rules b/debian/rules
index cf155b3..f94f17e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,12 +11,15 @@ DESTDIR?=$(CURDIR)/debian/${package}/usr
 
 config.status: configure
 	dh_testdir
-	./configure $(shell env DEB_LDFLAGS_MAINT_APPEND="-Wl,-z,defs -Wl,--as-needed" dpkg-buildflags --export=cmdline) \
- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr --mandir=/usr/share/man  --infodir=/usr/share/info \
- --without-usrlocalinclude \
- --without-usrlocallib \
-
+	./configure \
+		$(shell env DEB_LDFLAGS_MAINT_APPEND="-Wl,-z,defs -Wl,--as-needed" dpkg-buildflags --export=cmdline) \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--without-usrlocalinclude \
+		--without-usrlocallib
 
 configure:
 	-${MAKE} bootstrap
@@ -28,9 +31,10 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 
+build: build-arch build-indep
+build-arch: build-stamp
 
-
-build: build-stamp
+build-indep:
 
 build-stamp:  config.status
 	dh_testdir
@@ -43,11 +47,15 @@ build-stamp:  config.status
 
 generated_files?=\
  configure \
- docs/export_example_c++/Makefile docs/export_example_c/Makefile \
+ docs/export_example_c++/Makefile \
+ docs/export_example_c/Makefile \
  docs/export_example_java/Makefile \
  src/Makefile \
  src/SDLjoystick/Makefile \
- src/swt/motif/Makefile src/swt/rc/Makefile src/swt/tests/Makefile test/Makefile \
+ src/swt/motif/Makefile \
+ src/swt/rc/Makefile \
+ src/swt/tests/Makefile \
+ test/Makefile \
  #}
 
 clean:
@@ -58,7 +66,7 @@ clean:
 	rm -f ${generated_files}
 	dh_clean
 
-install: build
+install: build-arch
 	dh_testdir
 	dh_testroot
 	dh_prep
@@ -69,21 +77,14 @@ install: build
 	install -m 644 ./desktop/fvwm2/mini-dune.xpm \
 	  ${DESTDIR}/share/pixmaps/${package}.xpm
 
-# Build architecture-independent files here.
-install-indep:
-	echo "$@"
-#	mkdir -p ${CURDIR}/debian/${package}-doc/usr/share/doc/${package}-doc/
-#	cp -rf docs/* \
-#	 ${CURDIR}/debian/${package}-doc/usr/share/doc/${package}-doc/
-
 # find docs -type f > debian/${package}-doc.docs
-binary-indep: install-indep
+binary-indep:
 	dh_testdir -i
 	dh_testroot -i
-	dh_install -i  # --sourcedir=$(tmpdir)
+	dh_install -i
 	dh_installdocs -i
 	dh_installexamples -i
-	dh_installchangelogs -i 
+	dh_installchangelogs -i
 	dh_link -i
 	dh_compress -i
 	dh_fixperms -i

-- 
whitedune packaging