Permalink
Browse files

Various 0.60 fixes

  * add --with autotools-dev in rules when using autotools-dev Closes: #633347
  * Refer to dh not debhelper(1) in man page Closes: #640822
  * Minor envioment typo in xml manpage Closes: #639630
  * Permit package version 0 Closes: #638276
  * Added avoid more restrictive license recommendation Closes: #598411
  • Loading branch information...
1 parent cf6ea56 commit ac337ed9ec0b307fd731364e4590e209c2feeac3 Craig Small committed Feb 19, 2012
View
@@ -2,8 +2,13 @@ dh-make (0.60) unstable; urgency=low
* Added logname check Closes: #646924
* emacsen-install uses symlinks Closes: #653854
+ * add --with autotools-dev in rules when using autotools-dev Closes: #633347
+ * Refer to dh not debhelper(1) in man page Closes: #640822
+ * Minor envioment typo in xml manpage Closes: #639630
+ * Permit package version 0 Closes: #638276
+ * Added avoid more restrictive license recommendation Closes: #598411
- -- Craig Small <csmall@debian.org> Mon, 23 Jan 2012 22:49:20 +1100
+ -- Craig Small <csmall@debian.org> Sun, 19 Feb 2012 15:04:09 +1100
dh-make (0.59) unstable; urgency=low
View
@@ -353,7 +353,7 @@ sub get_package
$main::forced_package_name = $1;
$forced_package_version = $2;
}
- if ( ($forced_package_version)
+ if ( ($forced_package_version ne "")
|| (
($main::forced_package_name) &&
($pwd =~ /.*\/($main::forced_package_name)-([0-9][0-9a-zA-Z+.~-]*)$/)
@@ -616,6 +616,7 @@ if (-x "./configure" )
$CLEAN="[ ! -f Makefile ] || \$(MAKE) distclean\n".
"\trm -f config.sub config.guess";
$BUILD_DEPS .= ', autotools-dev';
+ $DH7_ADDON .= ' --with autotools-dev';
} elsif (-f 'CMakeLists.txt') {
$CDBS_CLASS="include /usr/share/cdbs/1/class/cmake.mk";
$CONFIG_STATUS="builddir/Makefile";
View
@@ -79,7 +79,7 @@ environment variables \fB$DEBFULLNAME\fR, \fB$LOGNAME\fR is used to
find a name in the \fI/etc/passwd\fR file, and through NIS, YP
and LDAP.
-The e-mail address can either be specified with the -fB\-\-email\fR option
+The e\-mail address can either be specified with the -fB\-\-email\fR option
or
.B dh_make
will attempt to find it. It will first check the environment variables
@@ -251,7 +251,7 @@ dh_make \-\-email contact@example.com \-\-copyright=bsd \\
.B dh_make
may not detect your username and email address correctly when using sudo.
.SH SEE ALSO
-.BR dpkg (1), dpkg\-buildpackage (1), debhelper (1), make\-kpkg (1), debhelper (7)
+.BR dpkg (1), dpkg\-buildpackage (1), dh (1), make\-kpkg (1), debhelper (7)
.P
You may also want to read the Debian Policy (in
\fI/usr/share/doc/debian\-policy \fR) and the New Maintainers' Guide (in
@@ -220,7 +220,7 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
</variablelist>
</refsect1>
<refsect1 id="environment">
- <title>ENVIONMENT</title>
+ <title>ENVIRONMENT</title>
<variablelist>
<varlistentry>
<term><envar>FOO_CONF</envar></term>
View
@@ -29,3 +29,5 @@ License: Apache-2.0
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
View
@@ -24,3 +24,5 @@ License: Artistic
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
View
@@ -34,3 +34,5 @@ License: GPL-2+
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
View
@@ -38,3 +38,5 @@ License: BSD-3-Clause
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
View
@@ -30,3 +30,5 @@ License: GPL-2.0+
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
View
@@ -30,3 +30,5 @@ License: GPL-3.0+
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
View
@@ -30,3 +30,5 @@ License: LGPL-2.0+
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
View
@@ -30,3 +30,5 @@ License: LGPL-3.0+
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
View
@@ -52,3 +52,5 @@ License: GPL-2.0+
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.

0 comments on commit ac337ed

Please sign in to comment.