Menu
▾
▴
[Mpkg-commit] CVS: mpkg/src deb.c,1.4,1.5 rpm.c,1.2,1.3
|
From: Pascal B. <pb...@us...> - 2001-11-28 14:33:32
|
Update of /cvsroot/mpkg/mpkg/src
In directory usw-pr-cvs1:/tmp/cvs-serv21366/src
Modified Files:
deb.c rpm.c
Log Message:
* src/deb.c: Clean verbose messages.
* src/rpm.c: Likewise.
* src/rpm.c (make_rpm): Don't show spec name.
Index: deb.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/deb.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** deb.c 2001/11/28 14:20:46 1.4
--- deb.c 2001/11/28 14:33:29 1.5
***************
*** 1,22 ****
! /*
! * Debian package gateway for Meta pkg (mpkg).
! *
! * Copyright 2001 by CubicSoft.
! * Copyright 1999-2001 by Easy Software Products.
! *
! * 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.
! *
! * Contents:
! *
! * make_deb() - Make a Debian software distribution package.
! */
#include "mpkg.h"
#include <libdeb/libdeb.h>
--- 1,16 ----
! /* Debian package gateway for Meta pkg (mpkg).
!
! Copyright 2001 by CubicSoft.
! Copyright 1999-2001 by Easy Software Products.
!
! 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. */
#include "mpkg.h"
#include <libdeb/libdeb.h>
***************
*** 91,95 ****
if (Verbosity)
! puts ("Creating Debian distribution...");
if (dist->relnumber)
--- 85,89 ----
if (Verbosity)
! puts ("Creating Debian distribution.");
if (dist->relnumber)
***************
*** 113,117 ****
if (Verbosity)
! puts ("Creating control file...");
snprintf (filename, sizeof (filename), "%s/%s", directory, name);
--- 107,111 ----
if (Verbosity)
! puts ("Creating control file.");
snprintf (filename, sizeof (filename), "%s/%s", directory, name);
***************
*** 194,198 ****
{
if (Verbosity)
! puts ("Creating preinst script...");
snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/preinst",
--- 188,192 ----
{
if (Verbosity)
! puts ("Creating preinst script.");
snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/preinst",
***************
*** 234,238 ****
{
if (Verbosity)
! puts ("Creating postinst script...");
snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/postinst",
--- 228,232 ----
{
if (Verbosity)
! puts ("Creating postinst script.");
snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/postinst",
***************
*** 282,286 ****
{
if (Verbosity)
! puts ("Creating prerm script...");
snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/prerm", directory,
--- 276,280 ----
{
if (Verbosity)
! puts ("Creating prerm script.");
snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/prerm", directory,
***************
*** 328,332 ****
{
if (Verbosity)
! puts ("Creating postrm script...");
snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/postrm", directory,
--- 322,326 ----
{
if (Verbosity)
! puts ("Creating postrm script.");
snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/postrm", directory,
***************
*** 357,361 ****
if (Verbosity)
! puts ("Creating conffiles...");
snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/conffiles", directory,
--- 351,355 ----
if (Verbosity)
! puts ("Creating conffiles.");
snprintf (filename, sizeof (filename), "%s/%s/DEBIAN/conffiles", directory,
***************
*** 382,386 ****
if (Verbosity)
! puts ("Copying temporary distribution files...");
for (i = dist->num_files, file = dist->files; i > 0; i--, file++)
--- 376,380 ----
if (Verbosity)
! puts ("Copying temporary distribution files.");
for (i = dist->num_files, file = dist->files; i > 0; i--, file++)
***************
*** 454,458 ****
if (Verbosity)
! puts ("Building Debian binary distribution...");
assert (name != NULL);
--- 448,452 ----
if (Verbosity)
! puts ("Building Debian binary distribution.");
assert (name != NULL);
***************
*** 495,499 ****
fprintf (stderr, "Removing temporary distribution files.\n");
! /* FIXME: Use `unlink' could be serouisly better. */
run_command (NULL, "/bin/rm -rf %s", name);
if (directory != NULL)
--- 489,493 ----
fprintf (stderr, "Removing temporary distribution files.\n");
! /* FIXME: Use `unlink' could be seriously better. */
run_command (NULL, "/bin/rm -rf %s", name);
if (directory != NULL)
Index: rpm.c
===================================================================
RCS file: /cvsroot/mpkg/mpkg/src/rpm.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rpm.c 2001/11/28 14:20:46 1.2
--- rpm.c 2001/11/28 14:33:29 1.3
***************
*** 1,24 ****
! /*
! *
! * Red Hat package gateway for Meta pkg (mpkg).
! *
! * Copyright 2001 by CubicSoft.
! * Copyright 1999-2001 by Easy Software Products.
! *
! * 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.
! *
! * Contents:
! *
! * make_rpm() - Make a Red Hat software distribution package.
! */
#include "mpkg.h"
#include <build/rpmbuild.h>
--- 1,16 ----
! /* Red Hat package gateway for Meta pkg (mpkg).
+ Copyright 2001 by CubicSoft.
+ Copyright 1999-2001 by Easy Software Products.
+
+ 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. */
#include "mpkg.h"
#include <build/rpmbuild.h>
***************
*** 61,65 ****
if (Verbosity)
! puts ("Creating RPM distribution...");
getcwd (current, sizeof (current));
--- 53,57 ----
if (Verbosity)
! puts ("Creating RPM distribution.");
getcwd (current, sizeof (current));
***************
*** 85,89 ****
if (Verbosity)
! puts ("Creating spec file...");
snprintf (specname, sizeof (specname), "%s/%s.spec", directory, prodname);
--- 77,81 ----
if (Verbosity)
! puts ("Creating spec file.");
snprintf (specname, sizeof (specname), "%s/%s.spec", directory, prodname);
***************
*** 285,289 ****
if (Verbosity)
! puts ("Copying temporary distribution files...");
for (i = dist->num_files, file = dist->files; i > 0; i--, file++)
--- 277,281 ----
if (Verbosity)
! puts ("Copying temporary distribution files.");
for (i = dist->num_files, file = dist->files; i > 0; i--, file++)
***************
*** 355,361 ****
* Build the distribution from the spec file...
*/
- puts (specname);
if (Verbosity)
! puts ("Building RPM binary distribution...");
{
--- 347,352 ----
* Build the distribution from the spec file...
*/
if (Verbosity)
! puts ("Building RPM binary distribution.");
{
***************
*** 387,391 ****
{
if (Verbosity)
! puts ("Removing temporary distribution files...");
run_command (NULL, "/bin/rm -rf %s/buildroot", directory);
--- 378,382 ----
{
if (Verbosity)
! puts ("Removing temporary distribution files.");
run_command (NULL, "/bin/rm -rf %s/buildroot", directory);
|
