[ug] 02/03: Drop patches (applied upstream).

Ansgar Burchardt ansgar at moszumanska.debian.org
Sun Jun 15 09:20:51 UTC 2014


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

ansgar pushed a commit to annotated tag debian/3.11.0-1
in repository ug.

commit 5dcf09dbafc63269bd74faf57ce7ebb65d6d82d2
Author: Ansgar Burchardt <ansgar at 43-1.org>
Date:   Sun Jun 15 11:10:42 2014 +0200

    Drop patches (applied upstream).
---
 debian/patches/buildsystem.diff | 10 ----------
 debian/patches/repack.diff      | 27 ---------------------------
 debian/patches/series           |  3 ---
 debian/patches/soname.diff      | 39 ---------------------------------------
 4 files changed, 79 deletions(-)

diff --git a/debian/patches/buildsystem.diff b/debian/patches/buildsystem.diff
deleted file mode 100644
index 0fef8fe..0000000
--- a/debian/patches/buildsystem.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -23,5 +23,7 @@
- # don't follow the full GNU-standard
- AUTOMAKE_OPTIONS = foreign 1.7
- 
-+ACLOCAL_AMFLAGS = -I m4
-+
- # possibly use the same compiler for distcheck
- # DISTCHECK_CONFIGURE_FLAGS = CXX="$(CXX)" CC="$(CC)"
diff --git a/debian/patches/repack.diff b/debian/patches/repack.diff
deleted file mode 100644
index 7fb31ed..0000000
--- a/debian/patches/repack.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/dev/Makefile.am
-+++ b/dev/Makefile.am
-@@ -5,13 +5,7 @@
- # mif (MacOS)
- # nif (NeXT)
- 
--SUBDIRS = ppm meta ps . sif xif rif $(EXTRADIR)
--
--if MACOS
--  EXTRADIR = mif
--else
--  EXTRADIR =
--endif
-+SUBDIRS = ppm meta ps . sif xif rif
- 
- noinst_LTLIBRARIES = libdevices.la
- 
---- a/configure.ac
-+++ b/configure.ac
-@@ -214,7 +214,6 @@
- AC_CONFIG_FILES([Makefile
-                  dev/Makefile
- 		 dev/meta/Makefile
--		 dev/mif/Makefile
- 		 dev/ppm/Makefile
- 		 dev/ps/Makefile
- 		 dev/rif/Makefile
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f894bc5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-buildsystem.diff
-soname.diff
-repack.diff
diff --git a/debian/patches/soname.diff b/debian/patches/soname.diff
deleted file mode 100644
index e317e34..0000000
--- a/debian/patches/soname.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/dev/sif/Makefile.am
-+++ b/dev/sif/Makefile.am
-@@ -4,6 +4,7 @@
- 
- lib_LTLIBRARIES = libdevS.la
- libdevS_la_SOURCES = sif.c
-+libdevS_la_LDFLAGS = -release $(PACKAGE_VERSION)
- libdevS_la_LIBADD = ../libdevices.la
- 
- # for the plugin-stuff later:
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -32,6 +32,7 @@
- 
- libugS2_la_SOURCES = ../initug.c
- libugS2_la_CPPFLAGS = $(UG_2DFLAGS)
-+libugS2_la_LDFLAGS = -release $(PACKAGE_VERSION)
- libugS2_la_LIBADD = $(2DLIBS) ../dom/std/libdomS2.la
- if PARALLEL
-   libugS2_la_LIBADD += ../parallel/libparallel2.la
-@@ -39,10 +40,12 @@
- 
- libugL2_la_SOURCES = ../initug.c
- libugL2_la_CPPFLAGS = $(UG_2DFLAGS)
-+libugL2_la_LDFLAGS = -release $(PACKAGE_VERSION)
- libugL2_la_LIBADD = $(2DLIBS) ../dom/lgm/libdomL2.la
- 
- libugS3_la_SOURCES = ../initug.c
- libugS3_la_CPPFLAGS = $(UG_3DFLAGS)
-+libugS3_la_LDFLAGS = -release $(PACKAGE_VERSION)
- libugS3_la_LIBADD = $(3DLIBS) ../dom/std/libdomS3.la
- if PARALLEL
-   libugS3_la_LIBADD += ../parallel/libparallel3.la
-@@ -50,4 +53,5 @@
- 
- libugL3_la_SOURCES = ../initug.c
- libugL3_la_CPPFLAGS = $(UG_3DFLAGS)
-+libugL3_la_LDFLAGS = -release $(PACKAGE_VERSION)
- libugL3_la_LIBADD = $(3DLIBS) ../dom/lgm/libdomL3.la

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ug.git



More information about the debian-science-commits mailing list