[SCM] Packaging for mmdb branch, master, updated. debian/1.23.2.1-0ubuntu1-21-g92f5b6e

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit 230951f905a6416aab0d6cb2ab0a6cde91e991e2
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Dec 23 17:25:12 2012 +0100

    refresh the patch series

diff --git a/debian/patches/0002-forwarded-upstream-mmdb.pc-autotools-integration.patch b/debian/patches/0001-forwarded-upstream-add-the-pkgconfig-file.patch
similarity index 53%
rename from debian/patches/0002-forwarded-upstream-mmdb.pc-autotools-integration.patch
rename to debian/patches/0001-forwarded-upstream-add-the-pkgconfig-file.patch
index 92fbbc8..c7b1850 100644
--- a/debian/patches/0002-forwarded-upstream-mmdb.pc-autotools-integration.patch
+++ b/debian/patches/0001-forwarded-upstream-add-the-pkgconfig-file.patch
@@ -1,45 +1,37 @@
 From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sun, 1 Jul 2012 19:25:09 +0200
-Subject: forwarded upstream mmdb.pc autotools integration
+Date: Sun, 23 Dec 2012 17:24:18 +0100
+Subject: forwarded upstream add the pkgconfig file
 
 ---
- Makefile.am  |    6 +++++-
+ Makefile.am  |    5 +++++
  configure.ac |    2 +-
  mmdb.pc.in   |   11 +++++++++++
- 3 files changed, 17 insertions(+), 2 deletions(-)
+ 3 files changed, 17 insertions(+), 1 deletion(-)
  create mode 100644 mmdb.pc.in
 
 diff --git a/Makefile.am b/Makefile.am
-index 0dc9959..7cc6ada 100644
+index 0bab973..1748587 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -4,10 +4,14 @@
- ACLOCAL_AMFLAGS = -I m4
+@@ -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
  
- SUBDIRS=src examples
--EXTRA_DIST = docs autogen.sh
-+EXTRA_DIST = docs autogen.sh mmdb.pc.in
+ mmdb_libmmdb_la_LDFLAGS = -no-undefined
++
++EXTRA_DIST = mmdb.pc.in
 +
 +pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfig_DATA = mmdb.pc
- 
- # Delete all files not in bzr repo, developer use only. 
- bzrclean:
- 	bzr status -S|grep '^?' |cut -f2 -d?|xargs rm -rf
- 
- ####
-+
 diff --git a/configure.ac b/configure.ac
-index e2c9540..2a168f2 100644
+index cbdfe51..de4bd0f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -16,5 +16,5 @@ AM_CONFIG_HEADER(config.h)
- 
- AM_PROG_LIBTOOL
- 
--AC_OUTPUT(Makefile src/Makefile examples/Makefile)
-+AC_OUTPUT(Makefile src/Makefile examples/Makefile mmdb.pc)
+@@ -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
diff --git a/debian/patches/series b/debian/patches/series
index 2f18a1a..4f25d5e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0002-forwarded-upstream-mmdb.pc-autotools-integration.patch
+0001-forwarded-upstream-add-the-pkgconfig-file.patch

-- 
Packaging for mmdb