[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#804828: fte-docs: rename to ‘fte-doc’



Hi,

Ben Finney wrote:
> The overwhelming Debian convention for “documentation package for
> ‘foo’ package” is to name the documentation pacakge ‘foo-doc’.

Indeed. Only about 1.3% have -docs. (3282 vs 43)

> Please rename the ‘fte-docs’ package to ‘fte-doc’.

I do have a patch for that (attached), but I actually think that the
upload, going through the NEW queue and annoying users with
transitional packages are not worth the effort.

I've also pushed that patch[1] into a branch called
fte-docs-rename[2]. If anyone thinks, this is really worth the effort,
feel free to merge the patch into the master branch and make a QA
upload.

[1] https://anonscm.debian.org/cgit/collab-maint/fte.git/commit/?h=fte-docs-rename&id=566010fefedfaa9e4ac9135cba256c0060b67d7c
[2] https://anonscm.debian.org/cgit/collab-maint/fte.git/log/?h=fte-docs-rename

		Regards, Axel
-- 
 ,''`.  |  Axel Beckert <abe@debian.org>, http://people.debian.org/~abe/
: :' :  |  Debian Developer, ftp.ch.debian.org Admin
`. `'   |  4096R: 2517 B724 C5F6 CA99 5329  6E61 2FF9 CD59 6126 16B5
  `-    |  1024D: F067 EA27 26B9 C3FC 1486  202E C09E 1D89 9593 0EDE
diff --git a/debian/README.debian b/debian/README.debian
index f2aa026..d583953 100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@ -1,5 +1,6 @@
 fte for DEBIAN
-----------------------
+--------------
+
   * if you are using some non-iso encondings like KOI8-R please
     check your Compose file if you are worried about warning message.
     This problem is known - if you know how to fix this, please
@@ -32,7 +33,7 @@ fte for DEBIAN
     reproducable bugs found.
 
   * To make your own configurations, make sure you have the package
-    fte-docs installed on your system and unpack the file
+    fte-doc installed on your system and unpack the file
     config-example.tar.gz to $HOME/.fte/.
     Run the program: cfte $HOME/.fte/main.fte
     Report any useful improvements and new Color modes.
diff --git a/debian/changelog b/debian/changelog
index f9290a1..ddd0960 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fte (0.50.2b6-9) UNRELEASED; urgency=medium
+
+  * QA upload.
+  * Rename fte-docs to fte-doc. (Closes: #804828)
+    + Add a transitional package and according Breaks/Replaces.
+
+ -- Axel Beckert <abe@debian.org>  Thu, 12 Nov 2015 20:34:04 +0100
+
 fte (0.50.2b6-8) unstable; urgency=medium
 
   * QA upload.
diff --git a/debian/control b/debian/control
index 9b0b222..e7aa24c 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Depends: ${misc:Depends},
          ${shlibs:Depends}
 Recommends: fte-xwindow | fte-terminal | fte-console
 Suggests: exuberant-ctags,
-          fte-docs
+          fte-doc
 Description: Text editor for programmers - base package
  FTE is a text editor for programmers.  Some of its features are smart
  indentation for C, C++, Java, Perl; color syntax highlighting for many more
@@ -36,11 +36,13 @@ Description: Text editor for programmers - base package
  some elementary documentation.  There is no editor here; please select one
  of the packages in the dependencies.
 
-Package: fte-docs
+Package: fte-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: fte (= ${binary:Version})
+Breaks: fte-docs (<< 0.50.2b6-8~)
+Replaces: fte-docs (<< 0.50.2b6-8~)
 Description: Documentation and examples for the FTE editor
  FTE is a text editor for programmers.  Some of its features are smart
  indentation for C, C++, Java, Perl; color syntax highlighting for many more
@@ -50,6 +52,16 @@ Description: Documentation and examples for the FTE editor
  .
  This package contains HTML documentation and sample configuration files.
 
+Package: fte-docs
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: fte-doc,
+         ${misc:Depends}
+Description: Transitional package to fte-doc
+ This empty package is only for the transition from the old fte-docs
+ to the new fte-doc package. You can safely remove this package.
+
 Package: fte-xwindow
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
diff --git a/debian/fte-docs.dirs b/debian/fte-doc.dirs
similarity index 100%
rename from debian/fte-docs.dirs
rename to debian/fte-doc.dirs
diff --git a/debian/fte-docs.doc-base.manual b/debian/fte-doc.doc-base.manual
similarity index 100%
rename from debian/fte-docs.doc-base.manual
rename to debian/fte-doc.doc-base.manual
diff --git a/debian/fte-docs.doc-base.reference b/debian/fte-doc.doc-base.reference
similarity index 100%
rename from debian/fte-docs.doc-base.reference
rename to debian/fte-doc.doc-base.reference
diff --git a/debian/fte-docs.install b/debian/fte-doc.install
similarity index 100%
rename from debian/fte-docs.install
rename to debian/fte-doc.install
diff --git a/debian/rules b/debian/rules
index 874d451..9be3194 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,8 +29,8 @@ override_dh_install-arch:
 
 override_dh_install-indep:
 	chmod -R go=rX config
-	tar --sort=name -cf $(CURDIR)/debian/fte-docs/usr/share/doc/fte/config-example.tar config
-	gzip -9n $(CURDIR)/debian/fte-docs/usr/share/doc/fte/config-example.tar
+	tar --sort=name -cf $(CURDIR)/debian/fte-doc/usr/share/doc/fte/config-example.tar config
+	gzip -9n $(CURDIR)/debian/fte-doc/usr/share/doc/fte/config-example.tar
 	dh_install
 
 override_dh_installchangelogs:

Reply to: