[doris] 08/14: Update debian/rules

Antonio Valentino a_valentino-guest at moszumanska.debian.org
Mon Aug 7 17:57:35 UTC 2017 

This is an automated email from the git hooks/post-receive script.

a_valentino-guest pushed a commit to branch master
in repository doris.

commit 9d28bfe4f8b66a147c9e98acad71877cf0097af1
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Aug 6 21:53:26 2017 +0200

    Update debian/rules
---
 debian/changelog |  3 +++
 debian/rules     | 82 ++++++++++++++++++++++++--------------------------------
 2 files changed, 38 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 26cd0d4..2bc803a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ doris (5.0.3~beta+dfsg-1) UNRELEASED; urgency=medium
   * debiam/patches
     - drop 0005-compatibility-with-gcc-4.8.x.patch (applied upstream)
     - refresh remaining patches
+  * debiam/rules
+    - update to new directory layout
+    - dropped get-orig-source target (implemented via uscan)
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 21 Jan 2017 15:48:04 +0100
 
diff --git a/debian/rules b/debian/rules
index 44b7096..49a3a35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,37 +24,39 @@ CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
 COMMON_FLAGS = -O3 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 EXTRA_FLAGS = -Wno-deprecated -D__USE_FFTW_LIBRARY__ -D__USE_LAPACK_LIBRARY__ -D__X86PROCESSOR__
 
-DH_OPTIONS=--sourcedirectory=src
 
 %:
 	dh $@
 
 override_dh_auto_configure:
-	rm -f src/Makefile
-	src/configure < /dev/null
-	mv Makefile src
+	if [ ! -f doris_core/Makefile.bak ]; then \
+		mv doris_core/Makefile doris_core/Makefile.bak; \
+	fi
+	rm -f doris_core/Makefile
+	doris_core/configure < /dev/null
+	mv Makefile doris_core
 
 override_dh_auto_build:
-	dh_auto_build --sourcedirectory=SARtools -- CFLAGS="$(CXXFLAGS) $(COMMON_FLAGS)"
-	dh_auto_build --sourcedirectory=ENVISAT_TOOLS -- CFLAGS="$(CFLAGS) $(COMMON_FLAGS)"
-	dh_auto_build --sourcedirectory=src -- CFLAGS="$(CXXFLAGS) $(COMMON_FLAGS) $(EXTRA_FLAGS)"
+	dh_auto_build --sourcedirectory=sar_tools -- CFLAGS="$(CXXFLAGS) $(COMMON_FLAGS)"
+	dh_auto_build --sourcedirectory=envisat_tools -- CFLAGS="$(CFLAGS) $(COMMON_FLAGS)"
+	dh_auto_build --sourcedirectory=doris_core -- CFLAGS="$(CXXFLAGS) $(COMMON_FLAGS) $(EXTRA_FLAGS)"
 
 override_dh_auto_install:
 	install -D --mode=0755 debian/doris.sh debian/doris/usr/bin/doris
 
-	dh_auto_install --sourcedirectory=SARtools -- INSTALL_DIR=../debian/doris/usr/lib/doris
-	install -D --mode=0644 SARtools/README \
-		debian/doris/usr/share/doc/doris/README_SARtools.txt
+	dh_auto_install --sourcedirectory=sar_tools -- INSTALL_DIR=../debian/doris/usr/lib/doris
+	install -D --mode=0644 sar_tools/README \
+		debian/doris/usr/share/doc/doris/README_sar_tools.txt
 
-	dh_auto_install --sourcedirectory=ENVISAT_TOOLS -- INSTALL_DIR=../debian/doris/usr/lib/doris
+	dh_auto_install --sourcedirectory=envisat_tools -- INSTALL_DIR=../debian/doris/usr/lib/doris
 	rm -f debian/doris/usr/lib/doris/*.csh
-	install -D --mode=0755 ENVISAT_TOOLS/envisat_dump_header2doris.csh \
+	install -D --mode=0755 envisat_tools/envisat_dump_header2doris.csh \
 		debian/doris/usr/share/doris/bin/envisat_dump_header2doris.csh
-	install -D --mode=0644 ENVISAT_TOOLS/README \
-		debian/doris/usr/share/doc/doris/README_ENVISAT_TOOLS.txt
+	install -D --mode=0644 envisat_tools/README \
+		debian/doris/usr/share/doc/doris/README_envisat_tools.txt
 
-	#dh_auto_install --sourcedirectory=src -- INSTALLDIR=../debian/doris/usr/lib/doris
-	install -D --mode=0755 src/doris debian/doris/usr/lib/doris
+	#dh_auto_install --sourcedirectory=doris_core -- INSTALLDIR=../debian/doris/usr/lib/doris
+	install -D --mode=0755 doris_core/doris debian/doris/usr/lib/doris
 	cp -R bin debian/doris/usr/share/doris
 	chmod 0755 debian/doris/usr/share/doris/*
 	rm -f debian/doris/usr/share/doris/bin/README*
@@ -63,43 +65,29 @@ override_dh_auto_install:
 	install -D --mode=0644 bin/README_CSK.txt \
 		debian/doris/usr/share/doc/doris/README_CSK.txt
 
-	cp -R editor_support debian/doris/usr/share/doris
-	chmod 0644 debian/doris/usr/share/doris/editor_support/README
+	dh_auto_install -- INSTALLDIR=../debian/doris/usr/lib/doris
 
 	install -D --mode=0644 debian/overrides debian/doris/usr/share/lintian/overrides/doris
-	
+
 	dh_python2
 
 override_dh_auto_clean:
 	dh_auto_clean
-	$(MAKE) -C SARtools cleaner
-	#$(MAKE) -C ENVISAT_TOOLS cleaner
-	rm -f ENVISAT_TOOLS/*.o ENVISAT_TOOLS/envisat_dump_header \
-	      ENVISAT_TOOLS/envisat_dump_data ENVISAT_TOOLS/envisat_dump_HH \
-	      ENVISAT_TOOLS/envisat_dump_VV
-	rm -f ENVISAT_TOOLS/envisat_dump_header
-	rm -f ENVISAT_TOOLS/envisat_dump_data
-	if [ -f src/Makefile ]; then \
-		$(MAKE) -C src cleaner;\
-		rm -f src/Makefile;\
+	$(MAKE) -C sar_tools cleaner
+	#$(MAKE) -C envisat_tools cleaner
+	rm -f envisat_tools/*.o ENVISAT_TOOLS/envisat_dump_header \
+	      envisat_tools/envisat_dump_data ENVISAT_TOOLS/envisat_dump_HH \
+	      envisat_tools/envisat_dump_VV
+	rm -f envisat_tools/envisat_dump_header
+	rm -f envisat_tools/envisat_dump_data
+	if [ -f doris_core/Makefile ]; then \
+		$(MAKE) -C doris_core cleaner;\
+		if [ -f doris_core/Makefile.bak ]; then \
+			rm -f doris_core/Makefile;\
+			mv doris_core/Makefile.bak doris_core/Makefile;\
+		fi \
 	fi
 
-# Grab the version before +dfsg
-UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
-get-orig-source:
-	uscan --force-download --download-current-version --no-symlink --destdir=.
-	rm -rf doris_v$(DEB_UPSTREAM_VERSION).orig
-	tar xfz doris_v$(UPSTREAM_VERSION).tar.gz
-	mv `find . -type d -name 'doris_v*'` doris_v$(UPSTREAM_VERSION).orig
-	rm -rf \$(find doris_v$(UPSTREAM_VERSION).orig -d -name '.viminfo')
-	rm -f doris_v$(UPSTREAM_VERSION).orig/src/triangle.*
-	rm -f doris_v$(UPSTREAM_VERSION).orig/src/Makefile
-	rm -rf doris_v$(UPSTREAM_VERSION).orig/ENVISAT_TOOLS/epr_api-?.?
-	GZIP=--best tar -cz --owner root --group root --mode a+rX \
-                    -f doris_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.gz \
-                    doris_v$(UPSTREAM_VERSION).orig
-	rm -r doris_v$(UPSTREAM_VERSION).orig
-
-.PHONY: get-orig-source override_dh_auto_configure override_dh_auto_build \
+
+.PHONY: override_dh_auto_configure override_dh_auto_build \
         override_dh_auto_install override_dh_auto_clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/doris.git

More information about the Pkg-grass-devel mailing list