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

Re: Could somebody look at the discussion at merge 5


I now understand the situation.  Let me sort out.
(My conclusion is at the bottom.)

On Thu, Sep 06, 2018 at 12:12:40AM +0530, shirish शिरीष wrote:
> On 05/09/2018, Javier Fernandez-Sanguino <javifs@gmail.com> wrote:


> > As mentioned previously in the thread related to this document the
> > authoritative location is this one:
> > https://salsa.debian.org/ddp-team/java-faq

I see.

> > That is where all the document history is (migrated from the former
> > DDP SVN).
> >
> > Java-policy contains a *copy* of the document and does not have the
> > commit history.

I see.  This has some newer data which I will review as below.

> I am and was concerned because the recent commits I did which Osamu
> Aoki also copied on his repo. doesn't seem to appear on
> https://salsa.debian.org/ddp-team/java-faq .

Excuse me for my confusion.  Since I don't have the write commit access
to java-team/java-policy, I was making a clone of master
java-team/java-policy repo.  No wonder you guys didn't notice my push to

  master repo:   https://salsa.debian.org/java-team/java-policy
  my clone repo: https://salsa.debian.org/osamu/java-policy
                          (This includes shirish's changes)

But these doesn't use Javi's latest upstream java-faq data.

> Do you want me to reopen a merge request from my repo. to
> https://salsa.debian.org/ddp-team/java-faq . 

No (to shirish) since your changes are in the WIP state and doesn't
build as is.  My repo contains buildable source.

Let's check Javi's comment of which I initially overlooked.

> I was under the impression that Osamu had already done that and also
> made a few changes of his own but see no updates of either :(

As explained above.  You can see my repo in:

> I used https://salsa.debian.org/ddp-team/java-faq/commits/master to
> see the history but didn't see anything which jumped out at me.

I don't know I jump or not.  But let's look into Javi's changes in this
ddp-team/java-faq repo:

ddp-team/java-faq has Italian translation (no po4a) and French
translation (with po4a).  java-team/java-policy dropped Italian
translation as OUTDATED.
 691112c ("Removed the outdated italian translation of the FAQ", 2015-09-23)

The only new commit for the English content in Javi's ddp-team/java-faq
 7b4c3e5 ("Improve information on bug/issue reporting and add a pointer
           to the location of this document's sources", 2014-05-22)

           This change is mostly about repo URL change (patch attached)
           but it is a SVN repo which is not usable any more.

           We don't need to merge most parts of this change.

Javi's ddp-team/java-faq is getting copy from java-team/java-policy
 7a0da2c ("Sync the content with the content available in the
          java-common package, in which Sylvestre Ledru has introduced
          changes in the package  sources for some time (previously
          java-common sources were updated with the DDP sources)",

(Yes there are many build system changes.  But they are not important if
we migrate to DocBook XML)

The raison d'etre of Javi's ddp-team/java-faq activity was to publish
the latest Java FAQ to the DDP web site by building from SVN checkout
with cron.  With migration to salsa, all SVN services are out and
the publishing functionality which relies on the SVN are not working.

Please note that most DDP documents are published by using the released
unstable package.  We already have cron script in place for Java FAQ and
Java Policy.  

+++++ CONCLUSION +++++

In light of above analysis, let me propose the following actions:

1.  Merge changes published as master in the forked repo:
    into the master repo:

    I just submitted write access to Debian Java Maintainers.  If I get
    approved, I will push my forked repo contents to the master repo.
    (If I get rejected, I will create a merge request, so someone with
    write access can merge.)

2.  I can convert FR and IT translation data to the updated PO file.  Of
    course, there will be some fuzzy strings but there will not be any
    outdated translation since my conversion uses po4a.  This is
    relatively simple task for me.

3.  Check CRON script to make sure we have the latest data published.

4.  I guess we need to get involved by getting write access or sending
    merge request to update FAQ.  Also, close 
    to avoid any future confusion.



>From 7b4c3e5d775816c61a1560ca032e5e91d33ea585 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Fern=C3=A1ndez-Sanguino=20Pe=C3=B1a?=
Date: Thu, 22 May 2014 20:20:16 +0000
Subject: [PATCH] Improve information on bug/issue reporting and add a pointer
 to the location of this document's sources

 debian-java-faq.sgml | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/debian-java-faq.sgml b/debian-java-faq.sgml
index 48e2856..f0b5eee 100644
--- a/debian-java-faq.sgml
+++ b/debian-java-faq.sgml
@@ -23,8 +23,7 @@
 <version>$Revision$, $Date$
-Answers to Frequently Asked Questions on Debian and Java
-(Note: some information is not up-to-date). Any changes/corrections to this
+Answers to Frequently Asked Questions on Debian and Java. Any changes/corrections to this
 FAQ are appreciated. Please send them to the Debian Bug Tracking System as
 described in <ref id="bugs">.
@@ -90,17 +89,33 @@ PDF versions currently (if you want them please submit a bug
 'wishlist' to the package). Also, the web version might be more up-to-date
 than the package's offline version.
+<p>Sources for this FAQ and its translation are available in a Subversion
+repository. They can be found here:
+<url id="http://anonscm.debian.org/viewvc/ddp/manuals/trunk/java-faq/";>
 <sect id="bugs">Sending bugs on this FAQ 
-<P>Please note that this FAQ is still outdated but gets updated step by step.
+<P>Please note that this FAQ might be, sometimes, outdated but it gets updated
+step by step. Contributors (you included!) help improve the content
+and keep it up-to-date.
-<p> Please file bug reports against the java-common package if you find errors
-or have suggestions on how to improve this document. However, make sure you
-have read the latest online version of the english text available at <url
-id="http://www.debian.org/doc/manuals/debian-java-faq/index.html";> before
+<p>Please file bug reports against the java-common package if you find errors
+or have suggestions on how to improve this document. However, make sure first you
+are reading the latest version. If you are reading a translator, look first
+if the issue you have found does exist also in the original english version.
+You can always find the latest verion online version of the english text available at <url
+id="http://www.debian.org/doc/manuals/debian-java-faq/";>. Please, check it before
 filing a bug report. Translations, if available, and the offline version in
 the java-common package might be out of date.
+<p>You can also check if the issue you have found has already been reported. To
+do this, please browse through the bugs you will find in 
+<url id="bugs.debian.org/java-common" name="java-common's list of reported bugs">.
+<p>Bugs on this FAQ, either for the english version or its translations, can
+be filed using <url id="https://www.debian.org/Bugs/"; name="Debian's Bug Tracking
+System">. Please report the bugs against the <package>java-common</package> package.
 <sect>What is Java?
 Java is a programming language originally developed by James Gosling at

Reply to: