[med-svn] [Git][med-team/libmems][master] 2 commits: Make sure all header files will be installed in the right dir

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libmems


Commits:
5f6ce0a6 by Andreas Tille at 2018-07-27T08:10:46+02:00
Make sure all header files will be installed in the right dir

- - - - -
a04c78d0 by Andreas Tille at 2018-07-27T08:16:43+02:00
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/patches/drop-version-number.patch


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libmems (1.6.0+4725-7) unstable; urgency=medium
+
+  * Make sure all header files will be installed in the right dir
+
+ -- Andreas Tille <tille at debian.org>  Fri, 27 Jul 2018 08:11:01 +0200
+
 libmems (1.6.0+4725-6) unstable; urgency=medium
 
   * Add missing copyright


=====================================
debian/patches/drop-version-number.patch
=====================================
--- a/debian/patches/drop-version-number.patch
+++ b/debian/patches/drop-version-number.patch
@@ -45,7 +45,7 @@ Description: Drop version number from library file name
 -
 --- a/libMems/Makefile.am
 +++ b/libMems/Makefile.am
-@@ -55,14 +55,14 @@ dmSML/util.c dmSML/sorting.c dmSML/dmsor
+@@ -55,19 +55,19 @@ dmSML/util.c dmSML/sorting.c dmSML/dmsor
  dmSML/timing.c dmSML/sml.c
  
  
@@ -63,8 +63,15 @@ Description: Drop version number from library file name
 +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)-$(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 = \
 --- a/configure.ac
 +++ b/configure.ac
 @@ -95,7 +95,7 @@ BOOST_PROGRAM_OPTIONS
@@ -83,3 +90,14 @@ Description: Drop version number from library file name
 -AC_OUTPUT(Makefile libMems/Makefile libMems-1.6.pc )
 +AC_OUTPUT(Makefile libMems/Makefile libMems.pc )
  #doc/html/Makefile  doc/man/Makefile  doc/man/man3/Makefile)
+--- a/libMems/dmSML/Makefile.am
++++ b/libMems/dmSML/Makefile.am
+@@ -12,7 +12,7 @@ alibc.c awin32aio.c buffer.c \
+ util.c sorting.c dmsort.c \
+ timing.c sml.c
+ 
+-library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)-$(GENERIC_API_VERSION)/$(GENERIC_LIBRARY_NAME)/dmSML
++library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/dmSML
+ 
+ library_include_HEADERS = $(DMSML_H)
+ 



View it on GitLab: https://salsa.debian.org/med-team/libmems/compare/e87fbb17db73c39e9f4bdfeac3bd1a36866a5a01...a04c78d06192f838c2900e5737636fbeddd834a4

-- 
View it on GitLab: https://salsa.debian.org/med-team/libmems/compare/e87fbb17db73c39e9f4bdfeac3bd1a36866a5a01...a04c78d06192f838c2900e5737636fbeddd834a4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180727/8d9de22e/attachment-0001.html>