Skip to content
Browse files

fixes 544392, 562713 546716

  • Loading branch information...
1 parent 580bac6 commit a5dbf183931ebf8d94665bd912538b30d5c3d2bf csmall committed
Showing with 82 additions and 51 deletions.
  1. +5 −7 debian/changelog
  2. +27 −1 dh_make
  3. +7 −5 lib/licenses/apache
  4. +7 −5 lib/licenses/artistic
  5. +6 −4 lib/licenses/blank
  6. +7 −7 lib/licenses/bsd
  7. +3 −4 lib/licenses/gpl2
  8. +2 −2 lib/licenses/gpl3
  9. +9 −8 lib/licenses/lgpl2
  10. +9 −8 lib/licenses/lgpl3
View
12 debian/changelog
@@ -1,14 +1,12 @@
-dh-make (0.52) UNRELEASED; urgency=low
-
- * Fixed enviornment typo in manpage Closes:554392
-
- -- Craig Small <csmall@debian.org> Thu, 05 Nov 2009 11:24:21 +1100
-
dh-make (0.51) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * Fixed environment typo in manpage Closes:554392
+ * Put debian/source/format Closes: #562713
+ * Fixed minor typo in gpl2 license template Closes: #546716
+ * Canoncialize layout of license files Closes: #560593
- -- Craig Small <csmall@debian.org> Fri, 11 Sep 2009 07:48:53 +1000
+ -- Craig Small <csmall@debian.org> Fri, 08 Jan 2010 00:41:27 +1100
dh-make (0.50) unstable; urgency=low
View
28 dh_make
@@ -16,7 +16,7 @@ $Getopt::Long::autoabbrev = 0;
# Some important parameters
our $DHLIB="/usr/share/debhelper/dh_make";
our $POLICY_VERSION="3.8.3";
-our $DH_MAKE_VERSION="0.50";
+our $DH_MAKE_VERSION="0.51";
my %PACKAGE_TYPES = ( 's' => 'Single', 'l' => 'Library', 'm' => 'Multi-Binary',
'k' => 'Kernel Module', 'b' => 'cdbs', 'n' => 'Kernel Patch');
@@ -97,6 +97,28 @@ sub process_file(@)
close OUT;
}
+sub output_source_format
+{
+ my $outfile = "source/format";
+
+ if ( $main::overlay eq "" )
+ {
+ if ( $main::add_missing && -f $outfile) {
+ print "File $outfile exists, skipping.\n";
+ return;
+ }
+ }
+
+ open OUT, ">$outfile" or die "Unable to open file $outfile for writing: $! \n";
+ if ($main::debian_native) {
+ print OUT "3.0 (quilt)\n";
+ } else {
+ print OUT "3.0 (native)\n";
+ }
+ close OUT;
+}
+
+
sub show_version
{
print "dh_make - prepare Debian packaging for an original source archive, version $main::DH_MAKE_VERSION\n\n";
@@ -689,6 +711,7 @@ if ( $add_missing )
if ( ! -d 'debian')
{
mkdir 'debian', 0755 or die "Unable to make debian subdirectory: $! \n";
+ mkdir 'debian/source', 0755 or die "Unable to make debian/source subdirectory: $! \n";
} else {
print "You already have a debian/ subdirectory in the source tree.\n";
print "dh_make will not try to overwrite anything.\n";
@@ -704,6 +727,9 @@ die "Unable to find dh_make's template directory: $! \n";
if ( ! $no_defaults )
{
+ # Source format
+ output_source_format();
+
# General Files
@filenames= split / |\n/, qx{(cd $DHLIB/debian && ls)};
foreach $filename (@filenames)
View
12 lib/licenses/apache
@@ -2,7 +2,9 @@ This work was packaged for Debian by:
#USERNAME# <#EMAIL#> on #DATE#
-It was downloaded from <url://example.com>
+It was downloaded from:
+
+ <url://example.com>
Upstream Author(s):
@@ -11,7 +13,7 @@ Upstream Author(s):
Copyright:
- <Copyright (C) YYYY Name OfAuthor>
+ <Copyright (C) YYYY Firstname Lastname>
<likewise for another author>
License:
@@ -29,7 +31,7 @@ License:
limitations under the License.
On Debian systems, the complete text of the Apache version 2.0 license
-can be found in `/usr/share/common-licenses/Apache-2.0'.
+can be found in "/usr/share/common-licenses/Apache-2.0".
The Debian packaging is:
@@ -41,8 +43,8 @@ The Debian packaging is:
# 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'.
+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
12 lib/licenses/artistic
@@ -2,7 +2,9 @@ This work was packaged for Debian by:
#USERNAME# <#EMAIL#> on #DATE#
-It was downloaded from <url://example.com>
+It was downloaded from:
+
+ <url://example.com>
Upstream Author(s):
@@ -11,7 +13,7 @@ Upstream Author(s):
Copyright:
- <Copyright (C) YYYY Name OfAuthor>
+ <Copyright (C) YYYY Firstname Lastname>
<likewise for another author>
License:
@@ -24,7 +26,7 @@ License:
OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
On Debian systems, the complete text of the Artistic License
-can be found in `/usr/share/common-licenses/Artistic'.
+can be found in "/usr/share/common-licenses/Artistic".
The Debian packaging is:
@@ -36,8 +38,8 @@ The Debian packaging is:
# 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'.
+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
10 lib/licenses/blank
@@ -2,7 +2,9 @@ This work was packaged for Debian by:
#USERNAME# <#EMAIL#> on #DATE#
-It was downloaded from <url://example.com>
+It was downloaded from:
+
+ <url://example.com>
Upstream Author(s):
@@ -11,7 +13,7 @@ Upstream Author(s):
Copyright:
- <Copyright (C) YYYY Name OfAuthor>
+ <Copyright (C) YYYY Firstname Lastname>
<likewise for another author>
License:
@@ -28,8 +30,8 @@ The Debian packaging is:
# 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'.
+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
14 lib/licenses/bsd
@@ -2,7 +2,9 @@ This work was packaged for Debian by:
#USERNAME# <#EMAIL#> on #DATE#
-It was downloaded from <url://example.com>
+It was downloaded from:
+
+ <url://example.com>
Upstream Author(s):
@@ -11,7 +13,7 @@ Upstream Author(s):
Copyright:
- <Copyright (C) YYYY Name OfAuthor>
+ <Copyright (C) YYYY Firstname Lastname>
<likewise for another author>
License:
@@ -32,7 +34,7 @@ License:
SUCH DAMAGE.
On Debian systems, the complete text of the BSD License can be
-found in `/usr/share/common-licenses/BSD'.
+found in "/usr/share/common-licenses/BSD".
The Debian packaging is:
@@ -44,10 +46,8 @@ The Debian packaging is:
# 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'.
-
-
+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
7 lib/licenses/gpl2
@@ -13,7 +13,7 @@ Upstream Author(s):
Copyright:
- <Copyright (C) YYYY Firtname Lastname>
+ <Copyright (C) YYYY Firstname Lastname>
<likewise for another author>
License:
@@ -35,11 +35,10 @@ License:
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ along with this program. If not, see <http://www.gnu.org/licenses/>
On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
The Debian packaging is:
View
4 lib/licenses/gpl3
@@ -29,10 +29,10 @@ License:
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
On Debian systems, the complete text of the GNU General
-Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
The Debian packaging is:
View
17 lib/licenses/lgpl2
@@ -2,7 +2,9 @@ This work was packaged for Debian by:
#USERNAME# <#EMAIL#> on #DATE#
-It was downloaded from <url://example.com>
+It was downloaded from:
+
+ <url://example.com>
Upstream Author(s):
@@ -11,7 +13,7 @@ Upstream Author(s):
Copyright:
- <Copyright (C) YYYY Name OfAuthor>
+ <Copyright (C) YYYY Firstname Lastname>
<likewise for another author>
License:
@@ -26,12 +28,11 @@ License:
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+Public License can be found in "/usr/share/common-licenses/LGPL-2".
The Debian packaging is:
@@ -43,8 +44,8 @@ The Debian packaging is:
# 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'.
+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
17 lib/licenses/lgpl3
@@ -2,7 +2,9 @@ This work was packaged for Debian by:
#USERNAME# <#EMAIL#> on #DATE#
-It was downloaded from <url://example.com>
+It was downloaded from:
+
+ <url://example.com>
Upstream Author(s):
@@ -11,7 +13,7 @@ Upstream Author(s):
Copyright:
- <Copyright (C) YYYY Name OfAuthor>
+ <Copyright (C) YYYY Firstname Lastname>
<likewise for another author>
License:
@@ -26,12 +28,11 @@ License:
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL-3'.
+Public License can be found in "/usr/share/common-licenses/LGPL-3".
The Debian packaging is:
@@ -43,8 +44,8 @@ The Debian packaging is:
# 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'.
+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.

0 comments on commit a5dbf18

Please sign in to comment.
Something went wrong with that request. Please try again.