Commit 6583bfca authored by Craig Small's avatar Craig Small

Merge branch 'master' of ssh://git.debian.org/git/collab-maint/dh-make

Conflicts:
	debian/changelog
parents f18fe5df 2fdc171c
dh-make (1.20140617) unstable; urgency=medium
[ Craig Small ]
* New numbering scheme
* Updated to standards version 3.9.5 Closes: #748336
* fix lintian "vcs-field-not-canonical" warning Closes: #750005
......@@ -8,6 +9,11 @@ dh-make (1.20140617) unstable; urgency=medium
* Added misc:depends to library control Closes: #702835
* Update template to use dh compat 9 Closes: #730741
[ Paul Wise ]
* Add files named like NEWS.md to the docs too
* Use multi-arch paths in the library template
* Do not distribute static libraries by default since they lead to the
possiblity of GPL violation and are not needed in most cases.
-- Craig Small <csmall@debian.org> Tue, 17 Jun 2014 22:00:05 +1000
dh-make (0.63) unstable; urgency=low
......
......@@ -562,7 +562,7 @@ if (! $debian_native)
}
}
# Figure out where documentation is
our @DOCS= split / |\n/, qx(ls -1 N[Ee][Ww][Ss] *[Ff][Aa][Qq]* *.[Tt][Xx][Tt] README* *.README [rR]eadme* *.[rR]eadme [Bb][Uu][Gg][Ss] *[tT][oO][dD][oO]* 2>/dev/null | egrep -v '^CMakeLists?.txt');
our @DOCS= split / |\n/, qx(ls -1 N[Ee][Ww][Ss]* *[Ff][Aa][Qq]* *.[Tt][Xx][Tt] README* *.README [rR]eadme* *.[rR]eadme [Bb][Uu][Gg][Ss]* *[tT][oO][dD][oO]* 2>/dev/null | egrep -v '^CMakeLists?.txt');
# What are our info files
our @INFOS= split / |\n/, qx(find . -regex '.*\\.info\\(-[0-9]+\\)?');
# Figure out where is the first changelog, assign other similar files to docs
......
......@@ -21,7 +21,7 @@ include /usr/share/dpkg/default.mk
%:
dh $@ #DH7_ADDON#
# debmake generated override targets
# dh_make generated override targets
# This is example for Cmake (See http://bugs.debian.org/641051 )
#override_dh_auto_configure:
# dh_auto_configure -- \
......
usr/include/*
usr/lib/lib*.a
usr/lib/lib*.so
usr/lib/pkgconfig/*
usr/lib/*/lib*.so
usr/lib/*/pkgconfig/*
usr/share/pkgconfig/*
usr/lib/lib*.so.*
usr/lib/*/lib*.so.*
......@@ -21,7 +21,7 @@ include /usr/share/dpkg/default.mk
%:
dh $@ #DH7_ADDON#
# debmake generated override targets
# dh_make generated override targets
# This is example for Cmake (See http://bugs.debian.org/641051 )
#override_dh_auto_configure:
# dh_auto_configure -- \
......
......@@ -21,7 +21,7 @@ include /usr/share/dpkg/default.mk
%:
dh $@ #DH7_ADDON#
# debmake generated override targets
# dh_make generated override targets
# This is example for Cmake (See http://bugs.debian.org/641051 )
#override_dh_auto_configure:
# dh_auto_configure -- \
......
......@@ -21,7 +21,7 @@ include /usr/share/dpkg/default.mk
%:
dh $@ #DH7_ADDON#
# debmake generated override targets
# dh_make generated override targets
# This is example for Cmake (See http://bugs.debian.org/641051 )
#override_dh_auto_configure:
# dh_auto_configure -- \
......
......@@ -21,7 +21,7 @@ include /usr/share/dpkg/default.mk
%:
dh $@ #DH7_ADDON#
# debmake generated override targets
# dh_make generated override targets
# This is example for Cmake (See http://bugs.debian.org/641051 )
#override_dh_auto_configure:
# dh_auto_configure -- \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment