[med-svn] [g2] 07/08: DEP3
Andreas Tille
tille at debian.org
Tue Nov 7 08:37:59 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository g2.
commit b36eaa138615b81815ff9f562e3f8f62ab17c5c4
Author: Andreas Tille <tille at debian.org>
Date: Tue Nov 7 11:33:30 2017 +0100
DEP3
---
debian/changelog | 1 +
debian/patches/020_makefile_pl_in.diff | 4 ++
debian/patches/030_makefile_in.diff | 4 ++
debian/patches/fix_linker_libs.diff | 4 ++
debian/patches/fix_pod2man_errors.diff | 4 ++
debian/patches/stabelise_makefile.diff | 116 ---------------------------------
6 files changed, 17 insertions(+), 116 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bf802aa..2b29518 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ g2 (0.72-7) UNRELEASED; urgency=medium
* Drop explicit autoreconf which is default in debhelper 10
* DEP5
* hardening=+all
+ * DEP3
-- Andreas Tille <tille at debian.org> Tue, 07 Nov 2017 09:05:43 +0100
diff --git a/debian/patches/020_makefile_pl_in.diff b/debian/patches/020_makefile_pl_in.diff
index 28617c5..89fb65c 100644
--- a/debian/patches/020_makefile_pl_in.diff
+++ b/debian/patches/020_makefile_pl_in.diff
@@ -1,3 +1,7 @@
+Author: Andreas Tille
+Last-Update: 2011-02-23 13:11:43 +0000
+Description: Fix -L path and add missing include directives
+
--- a/g2_perl/Makefile.PL.in
+++ b/g2_perl/Makefile.PL.in
@@ -4,7 +4,7 @@ use ExtUtils::MakeMaker;
diff --git a/debian/patches/030_makefile_in.diff b/debian/patches/030_makefile_in.diff
index e5590fc..0848d2c 100644
--- a/debian/patches/030_makefile_in.diff
+++ b/debian/patches/030_makefile_in.diff
@@ -1,3 +1,7 @@
+Author: Andreas Tille
+Last-Update: 2011-02-23 13:11:43 +0000
+Description: Fix clean, build and install targets
+
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,7 @@ ARFLAGS = -cr
diff --git a/debian/patches/fix_linker_libs.diff b/debian/patches/fix_linker_libs.diff
index 1bcb0e8..4584461 100644
--- a/debian/patches/fix_linker_libs.diff
+++ b/debian/patches/fix_linker_libs.diff
@@ -1,3 +1,7 @@
+Author: Andreas Tille
+Last-Update: 2013-11-10 07:26:19 +0000
+Description: Add missing libs for linker
+
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ case "$host" in
diff --git a/debian/patches/fix_pod2man_errors.diff b/debian/patches/fix_pod2man_errors.diff
index a85cb33..38446b7 100644
--- a/debian/patches/fix_pod2man_errors.diff
+++ b/debian/patches/fix_pod2man_errors.diff
@@ -1,3 +1,7 @@
+Author: Andreas Tille
+Last-Update: 2013-11-10 07:26:19 +0000
+Description: Fix manpage
+
--- a/g2_perl/G2.pm
+++ b/g2_perl/G2.pm
@@ -148,8 +148,12 @@ a second window showing a zoom of a mor
diff --git a/debian/patches/stabelise_makefile.diff b/debian/patches/stabelise_makefile.diff
deleted file mode 100644
index 13c45bf..0000000
--- a/debian/patches/stabelise_makefile.diff
+++ /dev/null
@@ -1,116 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -9,8 +9,8 @@ G2_VERSION = 0.72
- #
- # g2 installation directories
- #
--LIBDIR = /usr/local/lib
--INCDIR = /usr/local/include
-+LIBDIR = /usr/lib
-+INCDIR = /usr/include
-
-
- #LIBDIR = $(HOME)/local/lib
-@@ -21,8 +21,8 @@ INCDIR = /usr/local/include
- #
- SHELL = /bin/sh
-
--CC = gcc
--CFLAGS = -I./src -O2 -I/usr/local/include -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DLINUX=1 -DDO_PS=1 -DDO_FIG=1 -DDO_X11=1 -DDO_XDBE=1 -DDO_GD=1 -DDO_GIF=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1
-+CC = x86_64-linux-gnu-gcc
-+CFLAGS = -I./src -Wall -g -O2 -Wl,-z,defs -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DLINUX=1 -DDO_PS=1 -DDO_FIG=1 -DDO_X11=1 -DDO_XDBE=1 -DDO_GD=1 -DDO_GIF=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1
- INSTALL = /usr/bin/install -c
- INSTALL_DATA = ${INSTALL} -m 644
- FIND = find
-@@ -32,7 +32,7 @@ ARFLAGS = -cr
- RANLIB = ranlib
- LD = ld
- LDFLAGS =
--
-+LN_S = ln -s
-
- BASE_DIR = ./src
- BASE_SRC = $(BASE_DIR)/g2_device.c $(BASE_DIR)/g2_ui_control.c \
-@@ -79,33 +79,40 @@ INS = $(BASE_INS) $(PS_INS) $(FIG_INS)
- # major rule
- #
- .c.o:
-- $(CC) $(CFLAGS) -c $< -o $@
-+ $(CC) $(CFLAGS) $(PICFLAG) -c $< -o $@
-
-
- all: libg2.a
- test -d ./include || mkdir ./include
- cp $(INS) ./include/
-
--shared: libg2.so.0.$(G2_VERSION)
-+shared: libg2.so.$(RVERSION)
- @echo
-
-
- libg2.a: $(OBJ)
- $(AR) $(ARFLAGS) libg2.a $(OBJ)
- test ! -n "$(RANLIB)" || $(RANLIB) $@
-+ $(LN_S) -f libg2.a libg2.$(RVERSION).a
-
--libg2.so.0.$(G2_VERSION): $(OBJ)
-- ld -shared -soname libg2.so.0 -o $@ $(OBJ)
-+libg2.so.$(RVERSION): $(OBJ)
-+ x86_64-linux-gnu-gcc -Wl,-soname,$@ -shared $(OBJ) -lc -lm -lX11 -lgd -o $@
-+ test ! -f libg2.so && $(LN_S) $@ libg2.so
-+ test ! -f libg2.so.$(MVERSION) && $(LN_S) $@ libg2.so.$(MVERSION)
-
--libg2.so: libg2.so.0.$(G2_VERSION)
-- ln -f -s libg2.so.0.$(G2_VERSION) $@
-+libg2.so: libg2.so.$(RVERSION)
-+ ln -f -s libg2.so.$(RVERSION) $@
-
- install: libg2.a
-- test -d $(LIBDIR) || mkdir -p $(LIBDIR)
-- test -d $(INCDIR) || mkdir -p $(INCDIR)
-- $(INSTALL_DATA) libg2.a $(LIBDIR)
-+ test -d $(prefix)$(LIBDIR) || mkdir -p $(prefix)$(LIBDIR)
-+ test -d $(prefix)$(INCDIR) || mkdir -p $(prefix)$(INCDIR)
-+ $(INSTALL_DATA) libg2.a $(prefix)$(LIBDIR)
-+ test -f libg2.so.$(RVERSION) && \
-+ $(INSTALL_DATA) libg2.so.$(RVERSION) $(prefix)$(LIBDIR) && \
-+ $(LN_S) libg2.so.$(RVERSION) $(prefix)$(LIBDIR)/libg2.so.$(MVERSION) && \
-+ $(LN_S) libg2.so.$(RVERSION) $(prefix)$(LIBDIR)/libg2.so
- for IFILE in $(INS); do \
-- $(INSTALL_DATA) $$IFILE $(INCDIR); \
-+ $(INSTALL_DATA) $$IFILE $(prefix)$(INCDIR); \
- done
-
- release: clean doc
-@@ -119,10 +126,10 @@ doc:
-
-
- clean:
-- -(cd ./demo ; make clean)
-+ #(cd ./demo ; make clean)
- -(cd ./g2_python ; make clean)
- -rm -f $(OBJ)
-- -rm -f libg2.a config.cache config.log Makefile.bak config.status
-+ -rm -f libg2.a config.cache config.log config.status
- -rm -f ./include/*.h
- -$(FIND) . -name "*~" -exec rm -f {} \;
- -(cd ./g2_perl ; make clean)
-@@ -131,10 +138,15 @@ clean:
- -rm -f ./g2_perl/test.jpg
- -rm -f ./g2_perl/test.fig
- -rm -f ./g2_perl/Makefile.old
-- -rm -f ./libg2.so.0.$(G2_VERSION)
-- -rm -f libg2.$(G2_VERSION).a
-+ -rm -f ./libg2.so.$(RVERSION)
-+ -rm -f ./libg2.so.$(MVERSION)
-+ -rm -f ./libg2.$(RVERSION).a
-+ -rm -f ./libg2.$(MVERSION).a
-+ -rm -f libg2.so
- -rm -f a.out
-- -rm -fr doc/html/ doc/latex/ doc/g2_refman.ps doc/g2_refman.pdf
-+
-+doc_clean:
-+ -rm -fr doc/latex/ doc/g2_refman.ps doc/g2_refman.pdf
-
- demo: libg2.a
- (cd ./demo ; make)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/g2.git
More information about the debian-med-commit
mailing list