Permalink
Browse files

Various bugfixes for 0.59

Uses debhelper version 8 Closes: #630537
Fixed minor typo in dh_make.1 Closes: #611758
Removed old clauses from license templates. Closes: #615924
Output colons line up. Closes: #622245
.la files not installed in libpackage-dev by default Closes: #620986
License files use + on version to match text. Closes: #623305
Update to policy version 3.9.2 - no changes
  • Loading branch information...
1 parent d54fa19 commit f3b6b547d2bf6cdfece5ebdf77c43b8dbc204afe Craig Small committed Jun 19, 2011
Showing with 36 additions and 42 deletions.
  1. +12 −0 debian/changelog
  2. +1 −1 debian/compat
  3. +3 −3 debian/control
  4. +11 −11 dh_make
  5. +2 −2 dh_make.1
  6. +1 −1 lib/debian/compat
  7. +0 −1 lib/debianl/package-dev.install
  8. +0 −8 lib/licenses/gpl3
  9. +3 −12 lib/licenses/lgpl2
  10. +3 −3 lib/licenses/lgpl3
View
@@ -1,3 +1,15 @@
+dh-make (0.59) unstable; urgency=low
+
+ * Uses debhelper version 8 Closes: #630537
+ * Fixed minor typo in dh_make.1 Closes: #611758
+ * Removed old clauses from license templates. Closes: #615924
+ * Output colons line up. Closes: #622245
+ * .la files not installed in libpackage-dev by default Closes: #620986
+ * License files use + on version to match text. Closes: #623305
+ * Update to policy version 3.9.2 - no changes
+
+ -- Craig Small <csmall@debian.org> Sun, 19 Jun 2011 10:28:12 +1000
+
dh-make (0.58) unstable; urgency=low
* Fixed v7/dh7 rulesformat problem Closes: #609260
View
@@ -1 +1 @@
-7
+8
View
@@ -2,14 +2,14 @@ Source: dh-make
Section: devel
Priority: optional
Maintainer: Craig Small <csmall@debian.org>
-Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 8.0.0)
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/collab-maint/dh-make.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/dh-make.git;a=summary
Package: dh-make
Architecture: all
-Depends: debhelper (>= 7), make, ${perl:Depends}, dpkg-dev, ${misc:Depends}
+Depends: debhelper (>= 8), make, ${perl:Depends}, dpkg-dev, ${misc:Depends}
Conflicts: ldap-utils (<< 2.0.0-0)
Suggests: build-essential
Description: tool that converts source archives into Debian package source
View
22 dh_make
@@ -15,8 +15,8 @@ $Getopt::Long::autoabbrev = 0;
# Some important parameters
our $DHLIB="/usr/share/debhelper/dh_make";
-our $POLICY_VERSION="3.9.1";
-our $DH_MAKE_VERSION="0.58";
+our $POLICY_VERSION="3.9.2";
+our $DH_MAKE_VERSION="0.59";
my %PACKAGE_TYPES = ( 's' => 'Single', 'l' => 'Library',
'm' => 'Multi-Binary', 'k' => 'Kernel Module',
'n' => 'Kernel Patch', 'i' => 'Independent' );
@@ -150,7 +150,7 @@ sub show_help
-f, --file <file> specify file to use as the original source archive
--createorig create orig.tar.gz file
-s, --single set package class to single
- -i, --indep set package class to arch-independent
+ -i, --indep set package class to arch-independent
-m, --multi set package class to multiple binary
-l, --library set package class to library
-k, --kmod set package class to kernel module
@@ -415,15 +415,15 @@ sub get_date
sub print_confirmation
{
# Print what we have found
- print "Maintainer name : $username\n";
- print "Email-Address : $email \n";
- print "Date : $date\n";
- print "Package Name : $package_name\n";
- print "Version : $version\n";
- print "License : $license";
+ print "Maintainer name : $username\n";
+ print "Email-Address : $email \n";
+ print "Date : $date\n";
+ print "Package Name : $package_name\n";
+ print "Version : $version\n";
+ print "License : $license";
print 'blank' if $license eq '';
print "\n";
- print "Type of Package : ";
+ print "Type of Package : ";
if (exists $PACKAGE_TYPES{$package_type})
{
print $PACKAGE_TYPES{$package_type};
@@ -543,7 +543,7 @@ foreach $orig (@ORIG)
}
our ($CONFIG_STATUS, $CONFIGURE_STAMP, $PHONY_CONFIGURE, $CONFIGURE, $DPKG_ARCH, $INSTALL, $CLEAN, $MAKE, $CDBS_CLASS );
-our $BUILD_DEPS = 'debhelper (>= 7.0.50~)';
+our $BUILD_DEPS = 'debhelper (>= 8.0.0)';
our $DH7_ADDON = '';
if ($rules_format eq "cdbs") {
$BUILD_DEPS = 'cdbs, '.$BUILD_DEPS;
View
@@ -1,4 +1,4 @@
-.TH DH_MAKE 8 2011-01-08 "Debian Project"
+.TH DH_MAKE 8 2011-06-19 "Debian Project"
.SH NAME
dh_make \- prepare Debian packaging for an original source archive
.SH SYNOPSIS
@@ -32,7 +32,7 @@ The package will generate a single binary .deb package. It is the standard
case, so if you don't know what to do, choose this.
.TP
.B Arch-Independent (i)
-The package will generate a single package that is arch-indpendent.
+The package will generate a single package that is arch-independent.
.TP
.B Multiple binary (m)
The package will generate multiple binary .deb packages from one source
View
@@ -1 +1 @@
-7
+8
@@ -2,5 +2,4 @@ usr/include/*
usr/lib/lib*.a
usr/lib/lib*.so
usr/lib/pkgconfig/*
-usr/lib/*.la
usr/share/pkgconfig/*
View
@@ -28,13 +28,5 @@ License: GPL-3.0+
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-# Please choose a license for your packaging work. If the program you package
-# uses a mainstream license, using the same license is the safest choice.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
-# If you just want it to be GPL version 3, leave the following line in.
-
-and is licensed under the GPL version 3, see above.
-
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
View
@@ -5,13 +5,13 @@ Source: <url://example.com>
Files: *
Copyright: <years> <put author's name and email here>
<years> <likewise for another author>
-License: LGPL-2.0
+License: LGPL-2.0+
Files: debian/*
Copyright: #YEAR# #USERNAME# <#EMAIL#>
-License: LGPL-2.0
+License: LGPL-2.0+
-License: LGPL-2.0
+License: LGPL-2.0+
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
@@ -28,14 +28,5 @@ License: LGPL-2.0
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in "/usr/share/common-licenses/LGPL-2".
-# Please choose a license for your packaging work. If the program you package
-# uses a mainstream license, using the same license is the safest choice.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
-# If you just want it to be GPL version 3, leave the following lines in.
-
-and is licensed under the GPL version 3,
-see "/usr/share/common-licenses/GPL-3".
-
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
View
@@ -5,13 +5,13 @@ Source: <url://example.com>
Files: *
Copyright: <years> <put author's name and email here>
<years> <likewise for another author>
-License: LGPL-3.0
+License: LGPL-3.0+
Files: debian/*
Copyright: #YEAR# #USERNAME# <#EMAIL#>
-License: LGPL-3.0
+License: LGPL-3.0+
-License: LGPL-3.0
+License: LGPL-3.0+
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either

0 comments on commit f3b6b54

Please sign in to comment.