[SCM] Packaging for mmdb branch, master, updated. upstream/1.24.2-26-g24a0650

Picca Frédéric-Emmanuel picca at debian.org
Sat Jun 29 14:05:43 UTC 2013


The following commit has been merged in the master branch:
commit 24a06503996e1180ce96cb208eed1a1f46fec306
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Jun 29 15:41:52 2013 +0200

    remove applyed patches

diff --git a/debian/changelog b/debian/changelog
index ca83458..730311e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,7 @@ mmdb (1.25.3-1) UNRELEASED; urgency=low
     - Bump Standards-Version to 3.9.4 (nothing to do)
     - add the libmmdb0-dbg package
   * debian/patches
-    - refresh the series using gbp-pq
-    - 0001-mmdb_mmcif.cpp.patch (refreshed)
-    - 0002-forwarded-upstream-mmdb.pc-autotools-integration.patch (new)
+    - remove all patches (applyed by the upstream)
   * debian/libmmdb-dev.install
     - do not install the static library
   * debian/watch
diff --git a/debian/patches/0001-forwarded-upstream-add-the-pkgconfig-file.patch b/debian/patches/0001-forwarded-upstream-add-the-pkgconfig-file.patch
deleted file mode 100644
index c7b1850..0000000
--- a/debian/patches/0001-forwarded-upstream-add-the-pkgconfig-file.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sun, 23 Dec 2012 17:24:18 +0100
-Subject: forwarded upstream add the pkgconfig file
-
----
- Makefile.am  |    5 +++++
- configure.ac |    2 +-
- mmdb.pc.in   |   11 +++++++++++
- 3 files changed, 17 insertions(+), 1 deletion(-)
- create mode 100644 mmdb.pc.in
-
-diff --git a/Makefile.am b/Makefile.am
-index 0bab973..1748587 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -32,3 +32,8 @@ mmdb/random_n.cpp     mmdb/mmdb_atom.cpp     mmdb/mmdb_graph.cpp      \
- mmdb/mmdb_selmngr.cpp mmdb/stream_.cpp       mmdb/hybrid_36.cpp
- 
- mmdb_libmmdb_la_LDFLAGS = -no-undefined
-+
-+EXTRA_DIST = mmdb.pc.in
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = mmdb.pc
-diff --git a/configure.ac b/configure.ac
-index cbdfe51..de4bd0f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -12,4 +12,4 @@ AC_PROG_CXX
- AM_MAINTAINER_MODE dnl disable (by default) maintainer mode
- 
- AC_SEARCH_LIBS([cos], [m], [], [AC_MSG_ERROR([need math library])])
--AC_OUTPUT(Makefile)
-+AC_OUTPUT(Makefile mmdb.pc)
-diff --git a/mmdb.pc.in b/mmdb.pc.in
-new file mode 100644
-index 0000000..49867c3
---- /dev/null
-+++ b/mmdb.pc.in
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: mmdb
-+Description: Macromolecular coordinate library
-+Version: @VERSION@
-+Libs: -L${libdir} -lmmdb
-+Libs.private: -lm
-+Cflags: -I${includedir}
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4f25d5e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-forwarded-upstream-add-the-pkgconfig-file.patch

-- 
Packaging for mmdb



More information about the debian-science-commits mailing list