[med-svn] [libmems] 05/05: Add patch to really drop explicit version in package names but do not activate the patch due to transition freeze# Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libmems.

commit 51707b9b24a747cdc5265d808a97decb7c79f133
Author: Andreas Tille <tille at debian.org>
Date:   Tue Nov 8 17:33:45 2016 +0100

    Add patch to really drop explicit version in package names but do not activate the patch due to transition freeze# Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,
---
 debian/changelog                                |  7 ++---
 debian/control                                  |  4 +--
 debian/patches/automake_drop_version_info.patch | 35 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 debian/rules                                    |  2 +-
 5 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 38d6cde..34cb62d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-libmems (1.6.0+4725-4) UNRELEASED; urgency=medium
+libmems (1.6.0+4725-4) unstable; urgency=medium
 
   * Use fake watch file
   * Add missing include so that BOOST_WORKAROUND is defined (thanks to
     (Graham Inggs <ginggs at debian.org> for the patch)
     Closes: #843628
-  * Drop version in devel package
+  * Add patch to really drop explicit version in package names but do not
+    activate the patch due to transition freeze
 
- -- Andreas Tille <tille at debian.org>  Tue, 08 Nov 2016 14:11:21 +0100
+ -- Andreas Tille <tille at debian.org>  Tue, 08 Nov 2016 14:16:07 +0100
 
 libmems (1.6.0+4725-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 8b2dad0..8d5163e 100644
--- a/debian/control
+++ b/debian/control
@@ -17,15 +17,13 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libmems.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/libmems.git
 Homepage: http://sourceforge.net/p/mauve/code/HEAD/tree/libMems/trunk/
 
-Package: libmems-dev
+Package: libmems-1.6-dev
 Architecture: any
 Section: libdevel
 Depends: libmems-1.6-1v5 (= ${binary:Version}),
          ${misc:Depends},
          ${devlibs:Depends}
 Provides: libmems-1.6-dev
-Conflicts: libmems-1.6-dev
-Replaces: libmems-1.6-dev
 Description: development library to support DNA string matching and comparative genomics
  libMems is a freely available software development library to support DNA
  string matching and comparative genomics. Among other things, libMems
diff --git a/debian/patches/automake_drop_version_info.patch b/debian/patches/automake_drop_version_info.patch
new file mode 100644
index 0000000..fa05d68
--- /dev/null
+++ b/debian/patches/automake_drop_version_info.patch
@@ -0,0 +1,35 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Updated: Tue, 08 Nov 2016 14:16:07 +0100
+Description: This patch *really* enables droping the version
+ from package names but it is not activated here since this might
+ be considered a "transition" and we are in transition freeze.
+
+--- a/libMems/Makefile.am
++++ b/libMems/Makefile.am
+@@ -55,19 +55,19 @@ dmSML/util.c dmSML/sorting.c dmSML/dmsor
+ dmSML/timing.c dmSML/sml.c
+ 
+ 
+-libmems_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)-$(GENERIC_API_VERSION)/$(GENERIC_LIBRARY_NAME)
++libmems_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)
+ libmems_include_HEADERS = $(LIBMEMS_H) 
+ 
+ # build libraries with gcc (no suffix)
+-lib_LTLIBRARIES = libMems-1.6.la
+-libMems_1_6_la_SOURCES = $(LIBMEMS_SRC) $(HOMOLOGYHMM_SRC) $(DMSML_SRC)
+-libMems_1_6_la_LIBADD = @DEPS_LIBS@ @BOOST_FILESYSTEM_LIBS@ @BOOST_IOSTREAMS_LIBS@  @BOOST_SYSTEM_LIBS@
+-libMems_1_6_la_LDFLAGS= -version-info $(GENERIC_LIBRARY_VERSION)  
++lib_LTLIBRARIES = libMems.la
++libMems_la_SOURCES = $(LIBMEMS_SRC) $(HOMOLOGYHMM_SRC) $(DMSML_SRC)
++libMems_la_LIBADD = @DEPS_LIBS@ @BOOST_FILESYSTEM_LIBS@ @BOOST_IOSTREAMS_LIBS@  @BOOST_SYSTEM_LIBS@
++libMems_la_LDFLAGS= -version-info @GENERIC_LIBRARY_VERSION@
+ 
+-homologyhmm_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)-$(GENERIC_API_VERSION)/$(GENERIC_LIBRARY_NAME)/HomologyHMM
++homologyhmm_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/HomologyHMM
+ homologyhmm_include_HEADERS = $(HOMOLOGYHMM_H)
+ 
+-dmsml_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)-$(GENERIC_API_VERSION)/$(GENERIC_LIBRARY_NAME)/dmSML
++dmsml_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/dmSML
+ dmsml_include_HEADERS = $(DMSML_H)
+ 
+ EXTRA_DIST = \
diff --git a/debian/patches/series b/debian/patches/series
index b425d6b..b861c07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ pkg-config-directive.patch
 04_add_dependend_libs_to_link_command.patch
 05_gcc-6.patch
 boost1.62.patch
+# automake_drop_version_info.patch
diff --git a/debian/rules b/debian/rules
index fbc0d19..f7ba3b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ override_dh_install:
 	            --v5 \
 		    --devunversioned \
 		    --exclude-la \
-		    --movedev debian/tmp/usr/include/* usr/include \
+		    --movedev debian/tmp/usr/include usr \
 		    --movedev "debian/tmp/usr/lib/*/pkgconfig/*.pc" usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
 		    debian/tmp/usr/lib/*/*.so
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libmems.git