Remove comment headers in dselect/helpmsgs.{cc,h} about the files being

autogenerated, replace them with a proper license and copyright comment.
Closes: #382308

diff --git a/ChangeLog b/ChangeLog
index b93d5810fbb2f5fd71d385b181fd215228bf2f3b..b6e43ab6bb235603c0350ca5553ce1e89418f2fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-10  Guillem Jover  <guillem@debian.org>
+
+       * dselect/helpmsgs.cc: Replace the comment header about the file being
+       autogenerated with a proper copyright and license one. Reindented.
+       * dselect/helpmsgs.h: Likewise.
+
 2006-08-08  Guillem Jover  <guillem@debian.org>
 
        * scripts/dpkg-architecture.pl (dpkglibdir): Set to '.' where

diff --git a/debian/changelog b/debian/changelog
index 7dd2393c0cecf4ae1192b5c7f95b4486c1927142..2f34f1ae0c990a6b362c8b99b7d5f8c969b08a99 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ dpkg (1.13.23~) UNRELEASED; urgency=low
     Thanks to Ian Jackson <iwj@ubuntu.com>. Closes: #375703
   * Use dpkg-architecture from the source tree to get the target Debian
     architecture, instead of duplicating the logic in the m4 files.
+  * Remove comment headers in dselect/helpmsgs.{cc,h} about the files being
+    autogenerated, replace them with a proper license and copyright comment.
+    Closes: #382308
 
   [ Added dpkg Translations ]
   * Dzongkha (Kinley Tshering)

diff --git a/dselect/helpmsgs.cc b/dselect/helpmsgs.cc
index 83e4b07ae78d0d29a6242c315162c9e7032d6598..03d0fc5547976ff8c7d189f87578ac598a7d069b 100644 (file)
--- a/dselect/helpmsgs.cc
+++ b/dselect/helpmsgs.cc
@@ -1,9 +1,26 @@
 /*
- * WARNING - THIS FILE IS GENERATED AUTOMATICALLY - DO NOT EDIT
- * It is generated by mkhelpmsgs.pl from helpmsgs.src.
+ * dselect - Debian package maintenance user interface
+ * helpmsgs.cc - list of help messages
+ *
+ * Copyright (C) 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ *
+ * This 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 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; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include "helpmsgs.h"
+
 const struct helpmessage hlp_listkeys = {
   N_("Keystrokes"), N_("\
 Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n\
@@ -29,6 +46,7 @@ Quit, exit, overwrite (note capitals!):       ?, F1 request help (also Help)\n\
    U     set all to sUggested state             /   search (Return to cancel)\n\
    D     set all to Directly requested state  n, \\  repeat last search\n")
 };
+
 const struct helpmessage hlp_mainintro = {
   N_("Introduction to package selections"), N_("\
 Welcome to dselect's main package listing.\n\n\
@@ -53,6 +71,7 @@ dependencies will be done - here too you may see a sublist.\n\n\
 \
 Press <space> to leave help and enter the list now.\n")
 };
+
 const struct helpmessage hlp_readonlyintro = {
   N_("Introduction to read-only package list browser"), N_("\
 Welcome to dselect's main package listing.\n\n\
@@ -71,6 +90,7 @@ When you have finished browsing, press `Q' or <enter> to quit.\n\n\
 \
 Press <space> to leave help and enter the list now.\n")
 };
+
 const struct helpmessage hlp_recurintro = {
   N_("Introduction to conflict/dependency resolution sub-list"), N_("\
 Dependency/conflict resolution - introduction.\n\n\
@@ -96,6 +116,7 @@ override a recommendation or think that the program is mistaken.\n\n\
 \
 Press <space> to leave help and enter the sub-list; remember: press `?' for help.\n")
 };
+
 const struct helpmessage hlp_displayexplain1 = {
   N_("Display, part 1: package listing and status chars"), N_("\
 The top half of the screen shows a list of packages.  For each package you see\n\
@@ -121,6 +142,7 @@ four columns for its current status on the system and mark.  In terse mode (use\
 Also displayed are each package's Priority, Section, name, installed and\n\
 available version numbers (shift-V to display/hide) and summary description.\n")
 };
+
 const struct helpmessage hlp_displayexplain2 = {
   N_("Display, part 2: list highlight; information display"), N_("\
 * Highlight: One line in the package list will be highlighted.  It indicates\n\
@@ -144,6 +166,7 @@ const struct helpmessage hlp_displayexplain2 = {
   Use the `i' key to cycle through the displays, and `I' to hide the\n\
   information display or expand it to use almost all of the screen.\n")
 };
+
 const struct helpmessage hlp_methintro = {
   N_("Introduction to method selection display"), N_("\
 dselect and dpkg can do automatic installation, loading the package files to be\n\
@@ -163,6 +186,7 @@ of installation methods.\n\n\
 A full list of keystrokes is available by pressing `k' now, or from the help\n\
 menu reachable by pressing `?'.\n")
 };
+
 const struct helpmessage hlp_methkeys = {
   N_("Keystrokes for method selection"), N_("\
 Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n\

diff --git a/dselect/helpmsgs.h b/dselect/helpmsgs.h
index 9b231a4657c0da288e8c6b41c4d6deb288c493c1..fdb5a2bf0fcc0d4e29e821d08be5bece2a3fb770 100644 (file)
--- a/dselect/helpmsgs.h
+++ b/dselect/helpmsgs.h
@@ -1,15 +1,37 @@
 /*
- * WARNING - THIS FILE IS GENERATED AUTOMATICALLY - DO NOT EDIT
- * It is generated by mkhelpmsgs.pl from helpmsgs.src.
+ * dselect - Debian package maintenance user interface
+ * helpmsgs.h - external definitions for the list of help messages
+ *
+ * Copyright (C) 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ *
+ * This 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 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; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #ifndef HELPMSGS_H
 #define HELPMSGS_H
+
 extern "C" {
 #include <config.h>
 #include <dpkg.h>
 }
-struct helpmessage { const char *title; const char *text; };
+
+struct helpmessage {
+  const char *title;
+  const char *text;
+};
+
 extern const struct helpmessage hlp_listkeys;
 extern const struct helpmessage hlp_mainintro;
 extern const struct helpmessage hlp_readonlyintro;
@@ -18,4 +40,5 @@ extern const struct helpmessage hlp_displayexplain1;
 extern const struct helpmessage hlp_displayexplain2;
 extern const struct helpmessage hlp_methintro;
 extern const struct helpmessage hlp_methkeys;
+
 #endif /* HELPMSGS_H */