[med-svn] r15175 - trunk/packages/libg2/trunk/debian/patches
Andreas Tille
tille at alioth.debian.org
Sun Nov 10 07:26:19 UTC 2013
Author: tille
Date: 2013-11-10 07:26:19 +0000 (Sun, 10 Nov 2013)
New Revision: 15175
Modified:
trunk/packages/libg2/trunk/debian/patches/010_configure_in.diff
trunk/packages/libg2/trunk/debian/patches/020_makefile_pl_in.diff
trunk/packages/libg2/trunk/debian/patches/030_makefile_in.diff
trunk/packages/libg2/trunk/debian/patches/do_not_remove_files_from_orig_source.diff
trunk/packages/libg2/trunk/debian/patches/fix_linker_libs.diff
trunk/packages/libg2/trunk/debian/patches/fix_pod2man_errors.diff
trunk/packages/libg2/trunk/debian/patches/stabelise_makefile.diff
Log:
Refresh patches
Modified: trunk/packages/libg2/trunk/debian/patches/010_configure_in.diff
===================================================================
--- trunk/packages/libg2/trunk/debian/patches/010_configure_in.diff 2013-11-10 07:23:07 UTC (rev 15174)
+++ trunk/packages/libg2/trunk/debian/patches/010_configure_in.diff 2013-11-10 07:26:19 UTC (rev 15175)
@@ -1,8 +1,6 @@
-Index: g2-0.72/configure.in
-===================================================================
---- g2-0.72.orig/configure.in 2009-04-27 12:27:14.000000000 -0400
-+++ g2-0.72/configure.in 2009-04-27 12:28:31.000000000 -0400
-@@ -13,11 +13,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -13,11 +13,11 @@ PRODUCT=g2
#
AC_CANONICAL_HOST
case "$host" in
@@ -17,7 +15,7 @@
AC_DEFINE(LINUX);;
*-aix*)
LD_SHARED='ld'
-@@ -59,8 +59,8 @@
+@@ -59,8 +59,8 @@ AC_CHECK_LIB(dl, dlopen, have_dl=yes, ha
# and add /usr/local to include and lib path and add -lm (for testing)
#
AC_PATH_XTRA
Modified: trunk/packages/libg2/trunk/debian/patches/020_makefile_pl_in.diff
===================================================================
--- trunk/packages/libg2/trunk/debian/patches/020_makefile_pl_in.diff 2013-11-10 07:23:07 UTC (rev 15174)
+++ trunk/packages/libg2/trunk/debian/patches/020_makefile_pl_in.diff 2013-11-10 07:26:19 UTC (rev 15175)
@@ -1,8 +1,6 @@
-Index: g2-0.72/g2_perl/Makefile.PL.in
-===================================================================
---- g2-0.72.orig/g2_perl/Makefile.PL.in 2009-04-27 12:29:27.000000000 -0400
-+++ g2-0.72/g2_perl/Makefile.PL.in 2009-04-27 12:30:55.000000000 -0400
-@@ -4,7 +4,7 @@
+--- a/g2_perl/Makefile.PL.in
++++ b/g2_perl/Makefile.PL.in
+@@ -4,7 +4,7 @@ use ExtUtils::MakeMaker;
WriteMakefile(
'NAME' => 'G2',
'VERSION_FROM' => 'G2.pm', # finds $VERSION
Modified: trunk/packages/libg2/trunk/debian/patches/030_makefile_in.diff
===================================================================
--- trunk/packages/libg2/trunk/debian/patches/030_makefile_in.diff 2013-11-10 07:23:07 UTC (rev 15174)
+++ trunk/packages/libg2/trunk/debian/patches/030_makefile_in.diff 2013-11-10 07:26:19 UTC (rev 15175)
@@ -1,8 +1,6 @@
-Index: g2-0.72/Makefile.in
-===================================================================
---- g2-0.72.orig/Makefile.in 2009-04-27 12:37:16.000000000 -0400
-+++ g2-0.72/Makefile.in 2009-04-27 12:57:08.000000000 -0400
-@@ -32,7 +32,7 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -32,7 +32,7 @@ ARFLAGS = -cr
RANLIB = @RANLIB@
LD = ld
LDFLAGS = @LDFLAGS@
@@ -11,7 +9,7 @@
BASE_DIR = ./src
BASE_SRC = $(BASE_DIR)/g2_device.c $(BASE_DIR)/g2_ui_control.c \
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ INS = $(BASE_INS) $(PS_INS) $(FIG_INS)
# major rule
#
.c.o:
@@ -20,7 +18,7 @@
all: libg2.a
-@@ -93,19 +93,26 @@
+@@ -93,19 +93,26 @@ shared: libg2. at LD_SHARED_EXT@
libg2.a: $(OBJ)
$(AR) $(ARFLAGS) libg2.a $(OBJ)
test ! -n "$(RANLIB)" || $(RANLIB) $@
@@ -52,7 +50,7 @@
done
release: clean doc
-@@ -132,8 +139,13 @@
+@@ -132,8 +139,13 @@ clean:
-rm -f ./g2_perl/test.fig
-rm -f ./g2_perl/Makefile.old
-rm -f ./libg2. at LD_SHARED_EXT@
Modified: trunk/packages/libg2/trunk/debian/patches/do_not_remove_files_from_orig_source.diff
===================================================================
--- trunk/packages/libg2/trunk/debian/patches/do_not_remove_files_from_orig_source.diff 2013-11-10 07:23:07 UTC (rev 15174)
+++ trunk/packages/libg2/trunk/debian/patches/do_not_remove_files_from_orig_source.diff 2013-11-10 07:26:19 UTC (rev 15175)
@@ -3,9 +3,9 @@
Description: Upstream clean target removes files which are provided
in downloadable source tarball. Just keep these files
---- g2-0.72.orig/Makefile.in
-+++ g2-0.72/Makefile.in
-@@ -126,10 +126,10 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -126,10 +126,10 @@ doc:
clean:
@@ -18,7 +18,7 @@
-rm -f ./include/*.h
-$(FIND) . -name "*~" -exec rm -f {} \;
-(cd ./g2_perl ; make clean)
-@@ -146,7 +146,7 @@
+@@ -146,7 +146,7 @@ clean:
-rm -f a.out
doc_clean:
@@ -27,14 +27,3 @@
demo: libg2.a
(cd ./demo ; make)
---- g2-0.72.orig/Makefile
-+++ g2-0.72/Makefile
-@@ -134,7 +134,7 @@
- -rm -f ./libg2.so.0.$(G2_VERSION)
- -rm -f libg2.$(G2_VERSION).a
- -rm -f a.out
-- -rm -fr doc/html/ doc/latex/ doc/g2_refman.ps doc/g2_refman.pdf
-+ -rm -fr doc/latex/ doc/g2_refman.ps doc/g2_refman.pdf
-
- demo: libg2.a
- (cd ./demo ; make)
Modified: trunk/packages/libg2/trunk/debian/patches/fix_linker_libs.diff
===================================================================
--- trunk/packages/libg2/trunk/debian/patches/fix_linker_libs.diff 2013-11-10 07:23:07 UTC (rev 15174)
+++ trunk/packages/libg2/trunk/debian/patches/fix_linker_libs.diff 2013-11-10 07:26:19 UTC (rev 15175)
@@ -1,6 +1,6 @@
---- g2-0.72.orig/configure.in
-+++ g2-0.72/configure.in
-@@ -16,7 +16,7 @@
+--- a/configure.in
++++ b/configure.in
+@@ -16,7 +16,7 @@ case "$host" in
*-linux* | *-k*bsd*-gnu)
LD_SHARED='ld'
LD_SHARED_FLAGS='-shared -soname libg2.so.0'
Modified: trunk/packages/libg2/trunk/debian/patches/fix_pod2man_errors.diff
===================================================================
--- trunk/packages/libg2/trunk/debian/patches/fix_pod2man_errors.diff 2013-11-10 07:23:07 UTC (rev 15174)
+++ trunk/packages/libg2/trunk/debian/patches/fix_pod2man_errors.diff 2013-11-10 07:26:19 UTC (rev 15175)
@@ -1,6 +1,6 @@
---- g2-0.72.orig/g2_perl/G2.pm
-+++ g2-0.72/g2_perl/G2.pm
-@@ -148,8 +148,12 @@
+--- a/g2_perl/G2.pm
++++ b/g2_perl/G2.pm
+@@ -148,8 +148,12 @@ a second window showing a zoom of a mor
Drawing in both windows is performed by one single command to the virtual
device.
@@ -13,7 +13,7 @@
=item C<>
C<G2::Device::attach(dev)> I<object method>
-@@ -226,8 +230,11 @@
+@@ -226,8 +230,11 @@ C<G2::Device::clear( dev)> I<object meth
C<G2::Device::set_background(color)> I<object method>
@@ -25,7 +25,7 @@
=item C<move>
-@@ -335,6 +342,8 @@
+@@ -335,6 +342,8 @@ C<G2::Device::set_QP(d, enum QPshape sha
C<G2::Device::plot_QP(x, y)> I<object method>
Modified: trunk/packages/libg2/trunk/debian/patches/stabelise_makefile.diff
===================================================================
--- trunk/packages/libg2/trunk/debian/patches/stabelise_makefile.diff 2013-11-10 07:23:07 UTC (rev 15174)
+++ trunk/packages/libg2/trunk/debian/patches/stabelise_makefile.diff 2013-11-10 07:26:19 UTC (rev 15175)
@@ -1,6 +1,6 @@
---- g2-0.72.orig/Makefile
-+++ g2-0.72/Makefile
-@@ -9,8 +9,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -9,8 +9,8 @@ G2_VERSION = 0.72
#
# g2 installation directories
#
@@ -11,7 +11,7 @@
#LIBDIR = $(HOME)/local/lib
-@@ -21,8 +21,8 @@
+@@ -21,8 +21,8 @@ INCDIR = /usr/local/include
#
SHELL = /bin/sh
@@ -22,7 +22,7 @@
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
FIND = find
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ ARFLAGS = -cr
RANLIB = ranlib
LD = ld
LDFLAGS =
@@ -31,7 +31,7 @@
BASE_DIR = ./src
BASE_SRC = $(BASE_DIR)/g2_device.c $(BASE_DIR)/g2_ui_control.c \
-@@ -79,33 +79,40 @@
+@@ -79,33 +79,40 @@ INS = $(BASE_INS) $(PS_INS) $(FIG_INS)
# major rule
#
.c.o:
@@ -82,7 +82,7 @@
done
release: clean doc
-@@ -119,10 +126,10 @@
+@@ -119,10 +126,10 @@ doc:
clean:
@@ -95,7 +95,7 @@
-rm -f ./include/*.h
-$(FIND) . -name "*~" -exec rm -f {} \;
-(cd ./g2_perl ; make clean)
-@@ -131,10 +138,15 @@
+@@ -131,10 +138,15 @@ clean:
-rm -f ./g2_perl/test.jpg
-rm -f ./g2_perl/test.fig
-rm -f ./g2_perl/Makefile.old
More information about the debian-med-commit
mailing list