remove no longer needed apt.7 page

diff --git a/doc/apt.7 b/doc/apt.7
deleted file mode 100644 (file)
index 5cdfa78..0000000
--- a/doc/apt.7
+++ /dev/null
@@ -1,55 +0,0 @@
-.\" This manpage is copyright (C) 1998 Branden Robinson <branden@debian.org>.
-.\" 
-.\" This is free software; you may 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 APT; if not, write to the Free Software
-.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
-.\" 02111-1307 USA
-.TH apt 7 "16 June 1998" "Debian"
-.SH NAME
-apt \- Advanced Package Tool
-.SH SYNOPSIS
-.B apt
-.SH DESCRIPTION
-APT is a management system for software packages. 
-
-For normal day to day
-package management there are several frontends available, such as
-.BR aptitude (8)
-for the command line or
-.BR synaptic (8)
-for the X Window System. Some options are only implemented in
-.BR apt-get (8)
-though.
-.SH SEE ALSO
-.BR apt (8),
-.BR apt-cache (8),
-.BR apt-get (8),
-.BR apt.conf (5),
-.BR sources.list (5),
-.BR apt_preferences (5),
-.BR apt-secure (8)
-.SH DIAGNOSTICS
-apt returns zero on normal operation, decimal 100 on error.
-.SH BUGS
-This manpage isn't even started.
-.PP
-See <http://bugs.debian.org/apt>.  If you wish to report a
-bug in
-.BR apt ,
-please see
-.I /usr/share/doc/debian/bug-reporting.txt
-or the
-.BR reportbug (1)
-command.
-.SH AUTHOR
-apt was written by the APT team <apt@packages.debian.org>.

diff --git a/doc/en/makefile b/doc/en/makefile
index d1415fe..1be137c 100644 (file)
--- a/doc/en/makefile
+++ b/doc/en/makefile
@@ -19,23 +19,19 @@ apt-vendor.ent: ../../vendor/current/apt-vendor.ent
        ln -sf $(shell readlink -f $^) $@
 
 # Install generation hooks
-manpages: $($(LOCAL)-LIST) apt.7
+manpages: $($(LOCAL)-LIST)
 
 $($(LOCAL)-LIST) :: % : ../%.xml $(STYLESHEET) $(INCLUDES)
        echo Creating man page $@
        $(XSLTPROC) -o $@ $(STYLESHEET) $<
 
-apt.7: ../apt.7
-       cp -a ../apt.7 apt.7
-
 # Clean rule
 .PHONY: clean/$(LOCAL)
 veryclean: clean/$(LOCAL)
 clean: clean/$(LOCAL)
 clean/$(LOCAL):
-       -rm -rf $($(@F)-LIST) apt.7 apt-vendor.ent
+       -rm -rf $($(@F)-LIST) apt-vendor.ent
 endif
 
 # Chain to the manpage rule
-SOURCE = apt.7
 include $(MANPAGE_H)

diff --git a/doc/makefile b/doc/makefile
index e8d4c7e..3939c74 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -66,9 +66,7 @@ update-po:
 
 manpages/subdirs: $(MANPAGEPOLIST)
 $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf
-       # first line is for apt.7 (see Bug#696923)
        po4a --previous --no-backups --translate-only $(dir $<)apt.ent \
-               $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.7,%.$(subst /,,$(dir $<)).7,$(wildcard *.7))) \
                $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.1.xml,%.$(subst /,,$(dir $<)).1.xml,$(wildcard *.1.xml))) \
                $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.2.xml,%.$(subst /,,$(dir $<)).2.xml,$(wildcard *.2.xml))) \
                $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.3.xml,%.$(subst /,,$(dir $<)).3.xml,$(wildcard *.3.xml))) \

diff --git a/doc/po4a.conf b/doc/po4a.conf
index cf89994..3f92c19 100644 (file)
--- a/doc/po4a.conf
+++ b/doc/po4a.conf
@@ -26,7 +26,6 @@
 [type: manpage] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml add_$lang:xml.add
 [type: manpage] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml add_$lang:xml.add
 [type: manpage] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml add_$lang:xml.add
-[type: man]     apt.7 $lang:$lang/apt.$lang.7
 
 [type: sgml]    guide.sgml $lang:$lang/guide.$lang.sgml
 #                 add_$lang::$lang/addendum/debiandoc_$lang.add