tags 817585 patch tags 817585 pending thanks
Hi,
I did make a QA upload and Herbert sponsored upload to 1-day/delay queue.
Feel free to cancel this upload if needed.
The debian/changelog is:
* QA upload.
* Migrated to DebSrc 3.0.
* debian/clean:
- Created to remove Makefile after building.
* debian/control:
- Update DH level from 4 to 9. (Closes: #817585)
- Added Homepage field.
- Added the ${misc:Depends} variable to provide the right install
dependencies.
- Bumped Standards-Version to 3.9.8.
- Set correct priority to optional.
- Using dh-autoreconf now.
* debian/copyright:
- Migrated to 1.0 format.
- Updated all information.
* debian/dirs: unnecessary. Removed.
* debian/patches (quilt):
- mmake_2.3-6.diff.gz splited:
-mmake-output-file.diff:
~ Renamed to mmake-output-file.patch.
~ Added a header.
-fix-manpage.patch:
~ fixes a few typo in manpage.
-all the Makefile file was being provided by patch until previous
revision. Now, using dh-autoreconf, it's being generated
at build time
* debian/rules:
- Updated to new (reduced) format.
- Created override_dh_auto_install to fix Makefile patch.
* debian/watch:
- Bumped to version 4.
I attached a debdiff.
cheers,
--
Giovani Ferreira
http://softwarelivre.org/jova2
0x78494EF72375A66C
diff -Nru mmake-2.3/debian/changelog mmake-2.3/debian/changelog
--- mmake-2.3/debian/changelog 2016-07-09 22:15:32.000000000 -0300
+++ mmake-2.3/debian/changelog 2016-07-08 13:58:42.000000000 -0300
@@ -1,3 +1,39 @@
+mmake (2.3-7) unstable; urgency=medium
+
+ * QA upload.
+ * Migrated to DebSrc 3.0.
+ * debian/clean:
+ - Created to remove Makefile after building.
+ * debian/control:
+ - Update DH level from 4 to 9. (Closes: #817585)
+ - Added Homepage field.
+ - Added the ${misc:Depends} variable to provide the right install
+ dependencies.
+ - Bumped Standards-Version to 3.9.8.
+ - Set correct priority to optional.
+ - Using dh-autoreconf now.
+ * debian/copyright:
+ - Migrated to 1.0 format.
+ - Updated all information.
+ * debian/dirs: unnecessary. Removed.
+ * debian/patches (quilt):
+ - mmake_2.3-6.diff.gz splited:
+ -mmake-output-file.diff:
+ ~ Renamed to mmake-output-file.patch.
+ ~ Added a header.
+ -fix-manpage.patch:
+ ~ fixes a few typo in manpage.
+ -all the Makefile file was being provided by patch until previous
+ revision. Now, using dh-autoreconf, it's being generated
+ at build time
+ * debian/rules:
+ - Updated to new (reduced) format.
+ - Created override_dh_auto_install to fix Makefile patch.
+ * debian/watch:
+ - Bumped to version 4.
+
+ -- Giovani Augusto Ferreira <giov...@riseup.net> Sat, 02 Jul 2016 13:33:20
-0300
+
mmake (2.3-6) unstable; urgency=high
* QA upload
diff -Nru mmake-2.3/debian/clean mmake-2.3/debian/clean
--- mmake-2.3/debian/clean 1969-12-31 21:00:00.000000000 -0300
+++ mmake-2.3/debian/clean 2016-07-05 15:06:44.000000000 -0300
@@ -0,0 +1 @@
+Makefile
diff -Nru mmake-2.3/debian/compat mmake-2.3/debian/compat
--- mmake-2.3/debian/compat 2016-07-09 22:15:32.000000000 -0300
+++ mmake-2.3/debian/compat 2016-07-02 13:51:26.000000000 -0300
@@ -1 +1 @@
-4
+9
diff -Nru mmake-2.3/debian/control mmake-2.3/debian/control
--- mmake-2.3/debian/control 2016-07-09 22:15:32.000000000 -0300
+++ mmake-2.3/debian/control 2016-07-03 23:43:08.000000000 -0300
@@ -1,14 +1,15 @@
Source: mmake
Section: devel
-Priority: extra
+Priority: optional
Maintainer: Debian QA Group <packa...@qa.debian.org>
-Standards-Version: 3.7.3
-Build-Depends: debhelper
+Standards-Version: 3.9.8
+Homepage: http://www.tildeslash.com/mmake/
+Build-Depends: debhelper (>=9), dh-autoreconf
Build-Depends-Indep: default-jdk
Package: mmake
Architecture: all
-Depends: perl, java-common, findutils (>= 4.0)
+Depends: findutils (>= 4.0), java-common, perl, ${misc:Depends}
Recommends: default-jdk | java-compiler
Description: Makefile generator for Java programs
mmake will generate a master Makefile for your Java programs.
diff -Nru mmake-2.3/debian/copyright mmake-2.3/debian/copyright
--- mmake-2.3/debian/copyright 2016-07-09 22:15:32.000000000 -0300
+++ mmake-2.3/debian/copyright 2016-07-02 20:35:00.000000000 -0300
@@ -1,26 +1,34 @@
-This package was debianized by John Goerzen jgoer...@complete.org on
-Mon, 12 Oct 1998 12:10:22 -0500.
-
-It was downloaded from http://www.tildeslash.com/mmake/
-
-Upstream Author:
- Jan-Henrik Haukeland <h...@tildeslash.com>
-
-Copyright 1998-2004 Jan Henrik Haukeland.
-
-License:
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the Free
- Software Foundation; either version 2, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License with
- your Debian GNU system, in /usr/share/common-licenses/GPL, or with the
- Debian GNU source package as the file GNUGPL.TXT. If not, write to the
- Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301, USA.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-name: mmake
+Upstream-Source: http://www.tildeslash.com/mmake/
+
+Files: *
+Copyright: 1998-2004 Jan-Henrik Haukeland <h...@tildeslash.com>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 1998-2004 John Goerzen <jgoer...@complete.org>
+ 1999 Raphael Hertzog <rhert...@hrnet.fr>
+ 2004 Ola Lundqvist <o...@debian.org>
+ 2004-2008 Thomas Bushnell, BSG <t...@debian.org>
+ 2009 Michael Banck <mba...@debian.org>
+ 2015 Dominic Hargreaves <d...@earth.li>
+ 2016 Giovani Augusto Ferreira <giov...@riseup.net>
+License: GPL-2+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ 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/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff -Nru mmake-2.3/debian/dirs mmake-2.3/debian/dirs
--- mmake-2.3/debian/dirs 2016-07-09 22:15:32.000000000 -0300
+++ mmake-2.3/debian/dirs 1969-12-31 21:00:00.000000000 -0300
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/man/man1
-usr/share/doc/mmake
diff -Nru mmake-2.3/debian/docs mmake-2.3/debian/docs
--- mmake-2.3/debian/docs 2016-07-09 22:15:32.000000000 -0300
+++ mmake-2.3/debian/docs 2016-07-02 20:35:00.000000000 -0300
@@ -1 +1 @@
-README
+README
diff -Nru mmake-2.3/debian/patches/fix-manpage.patch
mmake-2.3/debian/patches/fix-manpage.patch
--- mmake-2.3/debian/patches/fix-manpage.patch 1969-12-31 21:00:00.000000000
-0300
+++ mmake-2.3/debian/patches/fix-manpage.patch 2016-07-07 21:31:30.000000000
-0300
@@ -0,0 +1,27 @@
+Description: - Fix a few typos in Manpage replacing a direct change in upstream
+ source code.
+Author: Thomas Bushnell, BSG <t...@debian.org>
+Reviewed-by: Giovani Agusuto Ferreira <giov...@riseup.net>
+Last-Update: 2016-07-02
+Index: mmake-2.3/mmake.1
+===================================================================
+--- mmake-2.3.orig/mmake.1
++++ mmake-2.3/mmake.1
+@@ -137,7 +137,7 @@
+ .SH "SYNOPSIS"
+ .IX Header "SYNOPSIS"
+ .Vb 1
+-\& mmake [ -d | -v ]
++\& mmake [ \-d | \-v ]
+ .Ve
+ .SH "DESCRIPTION"
+ .IX Header "DESCRIPTION"
+@@ -270,7 +270,7 @@ of the source files that you want to pre
+ <filename>.java to <filename>.xjava. The Makefile has a rule to build
+ \&.class files from .xjava files.
+ .PP
+-It is \fBnot\fR necesarry to change every file from .java to .xjava. The
++It is \fBnot\fR necessary to change every file from .java to .xjava. The
+ Makefile will work well and consistently in an environment of both
+ \&.java and .xjava files. (E.g. 'make clean' will only remove .java
+ files that were created from a .xjava file. Other java files will, of
diff -Nru mmake-2.3/debian/patches/mmake-output-file.diff
mmake-2.3/debian/patches/mmake-output-file.diff
--- mmake-2.3/debian/patches/mmake-output-file.diff 2016-07-09
22:15:32.000000000 -0300
+++ mmake-2.3/debian/patches/mmake-output-file.diff 1969-12-31
21:00:00.000000000 -0300
@@ -1,29 +0,0 @@
---- /usr/bin/mmake 2002-02-13 09:15:59.000000000 -0500
-+++ mmake 2003-07-03 11:24:38.000000000 -0400
-@@ -212,7 +212,7 @@
- =cut
-
- use strict;
--use vars qw($opt_d $opt_v);
-+use vars qw($opt_d $opt_v $opt_o);
- use Getopt::Std;
- require 5.000; # Need this perl version at least
-
-@@ -235,13 +235,16 @@
- my $toplevel= ""; # Defined if toplevel java files
-
- # Parse command line options
--getopts("dv") || die "Usage: $PROG [ -d | -v ]\n";
-+getopts("dvo:") || die "Usage: $PROG [ -d | -v ]\n";
-
- if ( defined $opt_v ) {
- print "This is mmake, version $VERSION\n";
- exit(0);
- }
-
-+if ( defined $opt_o ) {
-+ $M = $opt_o;
-+}
-
- # ---------------------
- # Assign macro defaults
diff -Nru mmake-2.3/debian/patches/mmake-output-file.patch
mmake-2.3/debian/patches/mmake-output-file.patch
--- mmake-2.3/debian/patches/mmake-output-file.patch 1969-12-31
21:00:00.000000000 -0300
+++ mmake-2.3/debian/patches/mmake-output-file.patch 2016-07-05
15:33:28.000000000 -0300
@@ -0,0 +1,35 @@
+Description: - Allow output of other file than Makefile.
+Author: Matt Zimmerman <m...@debian.org>
+Reviewed-by: Giovani Agusuto Ferreira <giov...@riseup.net>
+Last-Update: 2016-07-02
+Index: mmake-2.3/mmake.in
+===================================================================
+--- mmake-2.3.orig/mmake.in
++++ mmake-2.3/mmake.in
+@@ -224,7 +224,7 @@ Jan-Henrik Haukeland <h...@tildeslash.co
+ =cut
+
+ use strict;
+-use vars qw($opt_d $opt_v);
++use vars qw($opt_d $opt_v $opt_o);
+ use Getopt::Std;
+ require 5.000; # Need this perl version at least
+
+@@ -248,13 +248,16 @@ my @resources= (); # Array
+ my $toplevel= ""; # Defined if toplevel java files
+
+ # Parse command line options
+-getopts("dv") || die "Usage: $PROG [ -d | -v ]\n";
++getopts("dvo:") || die "Usage: $PROG [ -d | -v ]\n";
+
+ if ( defined $opt_v ) {
+ print "This is mmake, version $VERSION\n";
+ exit(0);
+ }
+
++if ( defined $opt_o ) {
++ $M = $opt_o;
++}
+
+ # ---------------------
+ # Assign macro defaults
diff -Nru mmake-2.3/debian/patches/series mmake-2.3/debian/patches/series
--- mmake-2.3/debian/patches/series 1969-12-31 21:00:00.000000000 -0300
+++ mmake-2.3/debian/patches/series 2016-07-02 18:12:37.000000000 -0300
@@ -0,0 +1,2 @@
+mmake-output-file.patch
+fix-manpage.patch
diff -Nru mmake-2.3/debian/rules mmake-2.3/debian/rules
--- mmake-2.3/debian/rules 2016-07-09 22:15:32.000000000 -0300
+++ mmake-2.3/debian/rules 2016-07-05 15:12:55.000000000 -0300
@@ -1,83 +1,8 @@
#!/usr/bin/make -f
-# MAde with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Cristoph Lameter.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@ --with autoreconf
-build: build-stamp
-build-stamp:
- dh_testdir
-
- # Add here commands to compile the package.
- ./configure --prefix=/usr
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- -rm -f build-stamp install-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) clean
- -rm `find . -name "*~"`
-
- dh_clean
-
-install: install-stamp
-install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/mmake.
- # $(MAKE) install DESTDIR=`pwd`/debian/mmake
-
- cp mmake debian/mmake/usr/bin
- cp README debian/mmake/usr/share/doc/mmake
- cp -r tildeslash debian/mmake/usr/share/doc/mmake
- chmod 0755 debian/mmake/usr/bin/mmake
- cp mmake.1* debian/mmake/usr/share/man/man1
- # pod2man mmake | gzip -9 > debian/mmake/usr/share/man/man1/mmake.1.gz
- chmod -R go-w debian/mmake
-
- touch install-stamp
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-# Build architecture-independent files here.
-binary-indep: build install
-# dh_testversion
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installexamples
- dh_installmenu
-# dh_installemacsen
-# dh_installinit
- dh_installcron
- dh_installmanpages
-# dh_undocumented
- dh_installchangelogs
- dh_strip
- dh_compress
- dh_fixperms
-# dh_suidregister
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
-# dh_makeshlibs
- dh_md5sums
- dh_builddeb
-
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+override_dh_auto_install:
+ dh_auto_install -- BINDIR=debian/mmake/usr/bin \
+ MANDIR=debian/mmake/usr/share/man/man1
diff -Nru mmake-2.3/debian/source/format mmake-2.3/debian/source/format
--- mmake-2.3/debian/source/format 1969-12-31 21:00:00.000000000 -0300
+++ mmake-2.3/debian/source/format 2016-07-02 15:48:11.000000000 -0300
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru mmake-2.3/debian/watch mmake-2.3/debian/watch
--- mmake-2.3/debian/watch 2016-07-09 22:15:32.000000000 -0300
+++ mmake-2.3/debian/watch 2016-07-02 13:56:55.000000000 -0300
@@ -1,2 +1,2 @@
-version=3
+version=4
http://www.tildeslash.com/mmake/dist/mmake-(.*).tar.gz
diff -Nru mmake-2.3/Makefile mmake-2.3/Makefile
--- mmake-2.3/Makefile 2016-07-09 22:15:32.000000000 -0300
+++ mmake-2.3/Makefile 1969-12-31 21:00:00.000000000 -0300
@@ -1,77 +0,0 @@
-#
-# SYNOPSIS
-# make {install|clean|uninstall}
-#
-# AUTHOR:
-# Jan-Henrik Haukeland, <h...@tildeslash.com>
-#
-# CVS INFO
-# $Id: Makefile.in,v 1.3 2001/02/10 21:57:42 hauk Exp $
-
-
-
-# Programs (with common options):
-SHELL = /bin/sh
-RM = /bin/rm -f
-
-
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m $(MODE_PROGS)
-INSTALL_FILE = $(INSTALL) -m $(MODE_FILES)
-INSTALL_DIR = $(INSTALL) -m $(MODE_DIRS) -d
-
-# Install modes
-MODE_PROGS = 555
-MODE_FILES = 444
-MODE_DIRS = 755
-
-
-# ------------------------------------------------------------------- #
-prefix = /usr
-exec_prefix = /usr
-
-BINDIR = ${exec_prefix}/bin
-MANDIR = ${prefix}/man/man1
-
-# ------------------------------------------------------------------- #
-
-# Name of program to build
-PROG = mmake
-MAN_OBJS= mmake.1
-
-# ------------------------------------------------------------------- #
-
-define check-exit
-|| exit 1
-
-endef
-
-# -------
-# Targets
-# -------
-.PHONY: clean install uninstall
-
-default:
- @echo "Run 'make install' to install mmake in $(BINDIR)"
-
-clean::
- $(RM) *~ \#* $(PROG)
-
-# remove configure files
-clean::
- $(RM) config.cache config.log config.status
-
-install:: $(PROG)
- $(INSTALL_DIR) $(BINDIR) $(check-exit)
- $(INSTALL_DIR) $(MANDIR) $(check-exit)
- $(INSTALL_PROG) $(PROG) $(BINDIR) $(check-exit)
- $(foreach file, $(MAN_OBJS), \
- $(INSTALL_FILE) $(file) $(MANDIR)/$(file) \
- $(check-exit))
-
-uninstall::
- $(RM) $(BINDIR)/$(PROG) $(check-exit)
- $(foreach file, $(MAN_OBJS), \
- $(RM) $(MANDIR)/$(file) \
- $(check-exit))
-
diff -Nru mmake-2.3/mmake.1 mmake-2.3/mmake.1
--- mmake-2.3/mmake.1 2016-07-09 22:15:32.000000000 -0300
+++ mmake-2.3/mmake.1 2004-04-02 00:20:56.000000000 -0300
@@ -137,7 +137,7 @@
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
.Vb 1
-\& mmake [ \-d | \-v ]
+\& mmake [ -d | -v ]
.Ve
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
diff -Nru mmake-2.3/mmake.in mmake-2.3/mmake.in
--- mmake-2.3/mmake.in 2016-07-09 22:15:32.000000000 -0300
+++ mmake-2.3/mmake.in 2004-04-02 00:13:35.000000000 -0300
@@ -224,7 +224,7 @@
=cut
use strict;
-use vars qw($opt_d $opt_v $opt_o);
+use vars qw($opt_d $opt_v);
use Getopt::Std;
require 5.000; # Need this perl version at least
@@ -248,16 +248,13 @@
my $toplevel= ""; # Defined if toplevel java files
# Parse command line options
-getopts("dvo:") || die "Usage: $PROG [ -d | -v ]\n";
+getopts("dv") || die "Usage: $PROG [ -d | -v ]\n";
if ( defined $opt_v ) {
print "This is mmake, version $VERSION\n";
exit(0);
}
-if ( defined $opt_o ) {
- $M = $opt_o;
-}
# ---------------------
# Assign macro defaults
signature.asc
Description: OpenPGP digital signature
