[med-svn] [Git][med-team/libgclib][master] 4 commits: Avoid Makefile from upstream

[Steffen Möller]

Steffen Möller pushed to branch master at Debian Med / libgclib


Commits:
e3357d66 by Steffen Moeller at 2020-08-09T22:18:31+02:00
Avoid Makefile from upstream

- - - - -
0748c2bc by Steffen Moeller at 2020-08-09T22:19:05+02:00
New upstream version 0.11.10+ds
- - - - -
223496d0 by Steffen Moeller at 2020-08-09T22:19:06+02:00
Update upstream source from tag 'upstream/0.11.10+ds'

Update to upstream version '0.11.10+ds'
with Debian dir b2130d03eaf4c85ac94b4cd507a1450e6a373813
- - - - -
7c7155bd by Steffen Moeller at 2020-08-09T22:37:12+02:00
Allow invocation of clean without Makefile

- - - - -


5 changed files:

- − Makefile
- debian/changelog
- debian/copyright
- debian/rules
- debian/watch


Changes:

=====================================
Makefile deleted
=====================================
@@ -1,117 +0,0 @@
-INCDIRS := -I. -I${GDIR} -I${BAM}
-
-CXX   := $(if $(CXX),$(CXX),g++)
-
-LINKER  := $(if $(LINKER),$(LINKER),g++)
-
-LDFLAGS := $(if $(LDFLAGS),$(LDFLAGS),-g)
-
-LIBS    := 
-
-
-# A simple hack to check if we are on Windows or not (i.e. are we using mingw32-make?)
-ifeq ($(findstring mingw32, $(MAKE)), mingw32)
-WINDOWS=1
-endif
-
-# Compiler settings
-TLIBS = 
-# Non-windows systems need pthread
-ifndef WINDOWS
-TLIBS += -lpthread
-endif
-
-
-
-DMACH := $(shell ${CXX} -dumpmachine)
-
-# MinGW32 GCC 4.5 link problem fix
-ifdef WINDOWS
-DMACH := windows
-ifeq ($(findstring 4.5.,$(shell g++ -dumpversion)), 4.5.)
-LDFLAGS += -static-libstdc++ -static-libgcc
-endif
-endif
-
-# Misc. system commands
-ifdef WINDOWS
-RM = del /Q
-else
-RM = rm -f
-endif
-
-# File endings
-ifdef WINDOWS
-EXE = .exe
-else
-EXE =
-endif
-
-CC      := ${CXX}
-
-BASEFLAGS  := -Wall -Wextra ${INCDIRS} $(MARCH) \
- -D_REENTRANT -fno-exceptions -fno-rtti
-
-GCCVER5 := $(shell expr `${CXX} -dumpversion | cut -f1 -d.` \>= 5)
-ifeq "$(GCCVER5)" "1"
- BASEFLAGS += -Wno-implicit-fallthrough
-endif
-
-GCCVER8 := $(shell expr `${CXX} -dumpversion | cut -f1 -d.` \>= 8)
-ifeq "$(GCCVER8)" "1"
-  BASEFLAGS += -Wno-class-memaccess
-endif
-
-#add the link-time optimization flag if gcc version > 4.5
-GCC_VERSION:=$(subst ., ,$(shell gcc -dumpversion))
-GCC_MAJOR:=$(word 1,$(GCC_VERSION))
-GCC_MINOR:=$(word 2,$(GCC_VERSION))
-#GCC_SUB:=$(word 3,$(GCC_VERSION))
-GCC_SUB:=x
-
-GCC45OPTS :=
-GCC45OPTMAIN :=
-
-ifneq (,$(filter %release %nodebug, $(MAKECMDGOALS)))
-  # -- release build
-  CXXFLAGS := $(if $(CXXFLAGS),$(CXXFLAGS),-g -O3)
-  CXXFLAGS += -DNDEBUG $(BASEFLAGS)
-  ifeq ($(shell expr $(GCC_MAJOR).$(GCC_MINOR) '>=' 4.5),1)
-    CXXFLAGS += -flto
-    GCC45OPTS := -flto
-    GCC45OPTMAIN := -fwhole-program
-  endif
-else
-  # -- debug build
-  CXXFLAGS := $(if $(CXXFLAGS),$(CXXFLAGS),-g -O0)
-  ifneq (, $(findstring darwin, $(DMACH)))
-      CXXFLAGS += -gdwarf-3
-  endif
-  CXXFLAGS += -DDEBUG -D_DEBUG -DGDEBUG $(BASEFLAGS)
-endif
-
-%.o : %.cpp
-	${CXX} ${CXXFLAGS} -c $< -o $@
-
-
-.PHONY : all
-all:    htest
-#mdtest
-nodebug: all
-release: all
-debug: all
-
-OBJS := GBase.o GStr.o GArgs.o GResUsage.o
-
-version: ; @echo "GCC Version is: "$(GCC_MAJOR)":"$(GCC_MINOR)":"$(GCC_SUB)
-	@echo "> GCC Opt. string is: "$(GCC45OPTS)
-htest:  $(OBJS) htest.o GHash.hh
-	${LINKER} ${LDFLAGS} $(GCC45OPTS) $(GCC45OPTMAIN) -o $@ ${filter-out %.a %.so, $^} ${LIBS}
-mdtest: $(OBJS) mdtest.o
-	${LINKER} ${LDFLAGS} $(GCC45OPTS) $(GCC45OPTMAIN) -o $@ ${filter-out %.a %.so, $^} ${LIBS}
-# target for removing all object files
-
-.PHONY : clean
-clean:: 
-	@${RM} $(OBJS) *.o mdtest$(EXE) htest$(EXE)
-	@${RM} core.*


=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-libgclib (0.11.10-1) unstable; urgency=medium
+libgclib (0.11.10+ds-1) unstable; urgency=medium
 
   * New upstream version
 


=====================================
debian/copyright
=====================================
@@ -1,6 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: gclib
 Source: https://github.com/gpertea/gclib/releases
+Files-Excluded: Makefile
 
 Files: *
 Copyright: 2001-2019 Geo Pertea


=====================================
debian/rules
=====================================
@@ -32,6 +32,12 @@ override_dh_installexamples:
 	dh_installexamples
 	chmod a-x debian/$(DEB_SOURCE)-dev/usr/share/doc/$(DEB_SOURCE)-dev/examples/*
 
+override_dh_auto_clean:
+	if [ -r Makefile -a -r Makefile.am ]; then dh_auto_clean; fi
+	rm -f Makefile Makefile.in aclocal.m4 config.h.in configure debian/autoreconf.after debian/autoreconf.before
+	find . -name "*.o" -delete
+
+
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	./mdtest 7TEST^BCT


=====================================
debian/watch
=====================================
@@ -1,4 +1,4 @@
 version=4
 
-opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
+opts="repack,compression=gz,dversionmangle=auto,repacksuffix=+ds,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
   https://github.com/gpertea/gclib/releases .*/archive/v?@ANY_VERSION@\.tar\.gz



View it on GitLab: https://salsa.debian.org/med-team/libgclib/-/compare/e0b1d55eb4fa76c581e0457239f20138bf87c281...7c7155bd1e44d250a35e9e319aa6f7ac6a7bbe39

-- 
View it on GitLab: https://salsa.debian.org/med-team/libgclib/-/compare/e0b1d55eb4fa76c581e0457239f20138bf87c281...7c7155bd1e44d250a35e9e319aa6f7ac6a7bbe39
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200809/04ad4fba/attachment-0001.html>