[gtkdataboxmm] 01/02: Mass commit due to several changes in parallel:
Andreas Tille
tille at debian.org
Thu Nov 24 14:07:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch debian
in repository gtkdataboxmm.
commit fb5af291cc1a34399a0dc605b0cf2d204949e309
Author: Andreas Tille <tille at debian.org>
Date: Thu Nov 24 14:47:57 2016 +0100
Mass commit due to several changes in parallel:
* hardening=+all
* use NEWS file as upstream changelog
* switch from cdbs to dh + d-shlibs
* Do not add version number to library name and rename library package
to follow usual policy as per d-shlibs
* Add missing Build-Depends: graphviz, xsltproc
---
debian/changelog | 6 +++
debian/compat | 2 +-
debian/control | 16 ++++--
debian/libgtkdataboxmm-0.9-0.install | 1 -
debian/libgtkdataboxmm-0.9.install | 1 -
debian/libgtkdataboxmm-dev.install | 4 --
debian/libgtkdataboxmm-doc.install | 2 +-
debian/patches/create_static_lib.patch | 15 ++++++
.../enable_versionless_development_lib.patch | 58 ++++++++++++++++++++++
debian/patches/series | 2 +
debian/rules | 44 ++++++++++------
11 files changed, 123 insertions(+), 28 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e7c5b21..4b27f79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ gtkdataboxmm (0.9.4-4) UNRELEASED; urgency=medium
* cme fix dpkg-control
* Change b-d from libgtkdatabox-0.9.2-0-dev to libgtkdatabox-dev
Closes: #845348
+ * hardening=+all
+ * use NEWS file as upstream changelog
+ * switch from cdbs to dh + d-shlibs
+ * Do not add version number to library name and rename library package
+ to follow usual policy as per d-shlibs
+ * Add missing Build-Depends: graphviz, xsltproc
-- Andreas Tille <tille at debian.org> Thu, 24 Nov 2016 08:25:21 +0100
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 5c3d8ee..5137cd1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,17 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
Uploaders: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Section: libs
Priority: optional
-Build-Depends: cdbs,
- debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
+ d-shlibs,
dh-autoreconf,
mm-common,
libgtkdatabox-dev,
libgtkmm-2.4-dev,
libglibmm-2.4-dev,
doxygen,
- gnome-pkg-tools
+ gnome-pkg-tools,
+ graphviz,
+ xsltproc
Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/gtkdataboxmm.git
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/gtkdataboxmm.git
@@ -23,7 +25,7 @@ Multi-Arch: foreign
Section: libdevel
Depends: ${shlibs:Depends},
${misc:Depends},
- libgtkdataboxmm-0.9-0 (= ${binary:Version}),
+ libgtkdataboxmm0 (= ${binary:Version}),
libgtkdatabox-dev,
libgtkmm-2.4-dev,
libglibmm-2.4-dev
@@ -53,12 +55,16 @@ Description: C++ bindings for GtkDatabox - documentation and examples
.
This package contains the documentation and example files.
-Package: libgtkdataboxmm-0.9-0
+Package: libgtkdataboxmm0
Architecture: any
+Section: libs
Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libgtkdataboxmm-0.9-0
+Provides: libgtkdataboxmm-0.9-0
+Replaces: libgtkdataboxmm-0.9-0
Description: C++ bindings for GtkDatabox - shared library
GtkDatabox is a widget for live display of large amounts of fluctuating
numerical data. Data presentation (e.g. on linear or logarithmic scales, as
diff --git a/debian/libgtkdataboxmm-0.9-0.install b/debian/libgtkdataboxmm-0.9-0.install
deleted file mode 100644
index cdae829..0000000
--- a/debian/libgtkdataboxmm-0.9-0.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*/lib*.so.*
diff --git a/debian/libgtkdataboxmm-0.9.install b/debian/libgtkdataboxmm-0.9.install
deleted file mode 100644
index cdae829..0000000
--- a/debian/libgtkdataboxmm-0.9.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*/lib*.so.*
diff --git a/debian/libgtkdataboxmm-dev.install b/debian/libgtkdataboxmm-dev.install
deleted file mode 100644
index 220be9c..0000000
--- a/debian/libgtkdataboxmm-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/*/lib*.so
-debian/tmp/usr/lib/*/gtkdataboxmm-0.9/include/*.h
-debian/tmp/usr/lib/*/pkgconfig/*
diff --git a/debian/libgtkdataboxmm-doc.install b/debian/libgtkdataboxmm-doc.install
index b61fb16..2feda53 100644
--- a/debian/libgtkdataboxmm-doc.install
+++ b/debian/libgtkdataboxmm-doc.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/doc/gtkdataboxmm-0.9/reference/ usr/share/doc/libgtkdataboxmm-doc/
+debian/tmp/usr/share/doc/gtkdataboxmm/reference/ usr/share/doc/libgtkdataboxmm-doc/
debian/tmp/usr/share/devhelp/*
diff --git a/debian/patches/create_static_lib.patch b/debian/patches/create_static_lib.patch
new file mode 100644
index 0000000..82d4680
--- /dev/null
+++ b/debian/patches/create_static_lib.patch
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 24 Nov 2016 08:25:21 +0100
+Description: Create static lib in addition to shared lib
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,7 +37,7 @@ MM_INIT_MODULE([gtkdataboxmm-0.9])
+ AC_SUBST([GTKDATABOXMM_SO_VERSION], [0:2:0])
+
+ AC_PROG_CXX
+-AC_DISABLE_STATIC
++# AC_DISABLE_STATIC
+ AC_LIBTOOL_WIN32_DLL
+ AC_PROG_LIBTOOL
+
diff --git a/debian/patches/enable_versionless_development_lib.patch b/debian/patches/enable_versionless_development_lib.patch
new file mode 100644
index 0000000..eda7393
--- /dev/null
+++ b/debian/patches/enable_versionless_development_lib.patch
@@ -0,0 +1,58 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 24 Nov 2016 08:25:21 +0100
+Description: d-shlibsmove expects package name libgtkdataboxmm-0.9-dev
+ due to the build target name containing this name. This patch drops
+ the version from the target name.
+
+--- a/gtkdatabox/gtkdataboxmm/Makefile.am
++++ b/gtkdatabox/gtkdataboxmm/Makefile.am
+@@ -16,7 +16,7 @@
+ ## You should have received a copy of the GNU Lesser General Public License
+ ## along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+-lib_LTLIBRARIES = libgtkdataboxmm- at GTKDATABOXMM_API_VERSION@.la
++lib_LTLIBRARIES = libgtkdataboxmm.la
+
+ include $(srcdir)/../src/filelist.am
+ include $(srcdir)/filelist.am
+@@ -27,6 +27,6 @@ local_cppflags = $(binding_includes) $(b
+ AM_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS) $(GTKDATABOXMM_CFLAGS)
+ AM_CXXFLAGS = $(GTKDATABOXMM_WXXFLAGS)
+
+-libgtkdataboxmm_ at GTKDATABOXMM_API_VERSION@_la_SOURCES = $(binding_sources)
+-libgtkdataboxmm_ at GTKDATABOXMM_API_VERSION@_la_LDFLAGS = -no-undefined -version-info $(GTKDATABOXMM_SO_VERSION)
+-libgtkdataboxmm_ at GTKDATABOXMM_API_VERSION@_la_LIBADD = $(GTKDATABOXMM_LIBS)
++libgtkdataboxmm_la_SOURCES = $(binding_sources)
++libgtkdataboxmm_la_LDFLAGS = -no-undefined -version-info $(GTKDATABOXMM_SO_VERSION)
++libgtkdataboxmm_la_LIBADD = $(GTKDATABOXMM_LIBS)
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -21,7 +21,7 @@ AUTOMAKE_OPTIONS = subdir-objects
+ check_PROGRAMS = example/example
+
+ local_includes = -I$(top_builddir)/gtkdatabox $(if $(srcdir:.=),-I$(top_srcdir)/gtkdatabox)
+-local_libs = $(top_builddir)/gtkdatabox/gtkdataboxmm/libgtkdataboxmm-$(GTKDATABOXMM_API_VERSION).la
++local_libs = $(top_builddir)/gtkdatabox/gtkdataboxmm/libgtkdataboxmm.la
+
+ AM_CPPFLAGS = -I$(top_builddir) $(local_includes) $(GTHREAD_CFLAGS) $(GTKDATABOXMM_CFLAGS)
+ AM_CXXFLAGS = $(GTKDATABOXMM_WXXFLAGS)
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,7 +31,7 @@ AM_MAINTAINER_MODE
+ AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
+
+ MM_PREREQ([0.9])
+-MM_INIT_MODULE([gtkdataboxmm-0.9])
++MM_INIT_MODULE([gtkdataboxmm])
+
+ # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+ AC_SUBST([GTKDATABOXMM_SO_VERSION], [0:2:0])
+--- a/gtkdatabox/gtkdataboxmm.pc.in
++++ b/gtkdatabox/gtkdataboxmm.pc.in
+@@ -15,5 +15,5 @@ Description: C++ binding for gtkdatabox
+ Version: @GTKDATABOXMM_VERSION@
+ URL: http://www.gtkmm.org/
+ Requires: @GTKDATABOXMM_MODULES@
+-Libs: -L${libdir} -lgtkdataboxmm- at GTKDATABOXMM_API_VERSION@
++Libs: -L${libdir} -lgtkdataboxmm
+ Cflags: -I${includedir}/@GTKDATABOXMM_MODULE_NAME@ -I${libdir}/@GTKDATABOXMM_MODULE_NAME@/include
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..38c4dba
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+enable_versionless_development_lib.patch
+create_static_lib.patch
diff --git a/debian/rules b/debian/rules
index bb8e77d..ac43f10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,38 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/utils.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-SHARED_PKG := $(shell sed -rn 's/^Package:[[:space:]]*(libgtkdataboxmm-[0-9\.]+-[0-9][0-9a-z]*)[[:space:]]*$$/\1/p' debian/control)
-SHVER = 0.9
-# Most of the docs aren't necessary
-DEB_INSTALL_DOCS_ALL = NEWS
+%:
+ dh $@ --with autoreconf
-DEB_INSTALL_EXAMPLES_libgtkdataboxmm-doc += -XMakefile -X.deps -X.libs -X.o
+override_dh_installchangelogs:
+ dh_installchangelogs NEWS
-DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"
+override_dh_installexamples:
+ dh_installexamples -XMakefile -X.deps -X.libs -X.o
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+override_dh_auto_build-indep:
+ dh_auto_build -i
+ $(MAKE) -C $(CURDIR)/doc all
-DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+override_dh_install:
+ dh_install
+ # Call d-shlibmove to comply with library packaging guide
+ d-shlibmove --commit \
+ --multiarch \
+ --devunversioned \
+ --exclude-la \
+ --override s/libatkmm-1.6-1-dev/libatkmm-1.6-dev/ \
+ --override s/libcairomm-1.0-1-dev/libcairomm-1.0-dev/ \
+ --override s/libgdkmm-2.4-1-dev/libglibmm-2.4-dev/ \
+ --override s/libgiomm-2.4-1-dev/libglibmm-2.4-dev/ \
+ --override s/libglibmm-2.4-1-dev/libglibmm-2.4-dev/ \
+ --override s/libgtkdatabox-0.9.3-0-dev/libgtkdatabox-dev/ \
+ --override s/libgtkmm-2.4-1-dev/libgtkmm-2.4-dev/ \
+ --override s/libpangomm-1.4-1-dev/libpangomm-1.4-dev/ \
+ --override s/libsigc-2.0-0-dev/libsigc++-2.0-dev/ \
+ --movedev "debian/tmp/usr/include" usr \
+ --movedev "debian/tmp/usr/lib/*/pkgconfig/*.pc" usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
+ debian/tmp/usr/lib/*/*.so
-build/libgtkdataboxmm-doc::
- $(MAKE) -C $(CURDIR)/doc all
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gtkdataboxmm.git
More information about the debian-science-commits
mailing list