Author: mdke
Date: Fri Feb  2 00:30:16 2007
New Revision: 3742

Modified:
   trunk/debian/changelog
   trunk/debian/rules
   trunk/ubuntu/add-applications/C/add-applications-C.omf
   trunk/ubuntu/advanced-topics/C/advanced-topics-C.omf
   trunk/ubuntu/config-desktop/C/config-desktop-C.omf
   trunk/ubuntu/internet/C/internet-C.omf
   trunk/ubuntu/keeping-safe/C/keeping-safe-C.omf
   trunk/ubuntu/musicvideophotos/C/musicvideophotos-C.omf
   trunk/ubuntu/newtoubuntu/C/newtoubuntu-C.omf
   trunk/ubuntu/printing/C/printing-C.omf

Log:
changing the address that documents are installed in


Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog      (original)
+++ trunk/debian/changelog      Fri Feb  2 00:30:16 2007
@@ -1,3 +1,10 @@
+ubuntu-docs (7.01.4) feisty; urgency=low
+
+  * Installing documents within the gnome/help scheme
+    - for easier linking
+
+ -- Matthew East <[EMAIL PROTECTED]>  Fri,  2 Feb 2007 00:28:53 +0000
+
 ubuntu-docs (7.01.3) feisty; urgency=low
 
   * Rearranging directory structure and adding translation templates
@@ -6,7 +13,7 @@
 
 ubuntu-docs (7.01.2) feisty; urgency=low
 
-  * adding new advanced-topics category with links to man pages and such
+  * adding new advanced-topics category with links to man pages
 
  -- Matthew East <[EMAIL PROTECTED]>  Wed, 24 Jan 2007 00:14:21 +0000
 

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules  (original)
+++ trunk/debian/rules  Fri Feb  2 00:30:16 2007
@@ -35,28 +35,22 @@
 
 # Ubuntu documents
 
-               for doc in add-applications advanced-topics config-desktop 
games getting-help internet keeping-safe musicvideophotos newtoubuntu office 
printing programming switching; do \
-                       mkdir -p 
debian/ubuntu-docs/usr/share/ubuntu-docs/$$doc/C/; \
-                       cp ubuntu/$$doc/C/*xml 
debian/ubuntu-docs/usr/share/ubuntu-docs/$$doc/C/; \
+               for doc in about-ubuntu add-applications advanced-topics 
config-desktop games getting-help internet keeping-safe musicvideophotos 
newtoubuntu office printing programming switching; do \
+                       mkdir -p 
debian/ubuntu-docs/usr/share/gnome/help/$$doc/C/; \
+                       cp ubuntu/$$doc/C/*xml 
debian/ubuntu-docs/usr/share/gnome/help/$$doc/C/; \
                done; \
 
-# Except about-ubuntu gets special treatment, needed for the menu entry to work
-
-       mkdir -p debian/ubuntu-docs/usr/share/gnome/help/about-ubuntu/C
-       cp ubuntu/about-ubuntu/C/about-ubuntu.xml 
debian/ubuntu-docs/usr/share/gnome/help/about-ubuntu/C/
-
 # Generic documents
 
                for doc in server contribute; do \
-                       mkdir -p 
debian/ubuntu-docs/usr/share/ubuntu-docs/$$doc/C; \
-                       cp generic/$$doc/C/*xml 
debian/ubuntu-docs/usr/share/ubuntu-docs/$$doc/C/; \
+                       mkdir -p 
debian/ubuntu-docs/usr/share/gnome/help/$$doc/C; \
+                       cp generic/$$doc/C/*xml 
debian/ubuntu-docs/usr/share/gnome/help/$$doc/C/; \
                done; \
 
-# Preface documents
+# Common documents
 
        cp -r common debian/ubuntu-docs/usr/share/ubuntu-docs/ 
 
-
 # Scrollkeeper loving
 
        dh_scrollkeeper 

Modified: trunk/ubuntu/add-applications/C/add-applications-C.omf
==============================================================================
--- trunk/ubuntu/add-applications/C/add-applications-C.omf      (original)
+++ trunk/ubuntu/add-applications/C/add-applications-C.omf      Fri Feb  2 
00:30:16 2007
@@ -10,7 +10,7 @@
     <subject category="General|Linux|Distributions|Other"/>
     <description>Placeholder.</description>
     <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-    <identifier 
url="file:///usr/share/ubuntu-docs/add-applications/C/add-applications.xml"/>
+    <identifier 
url="file:///usr/share/gnome/help/add-applications/C/add-applications.xml"/>
     <language code="C"/>
     <relation seriesid="df238718-a01c-11db-96b4-f24d7bdff18d"/>
     <rights type="CC-by-SA" license.version="2.0" holder="Canonical Ltd."/>

Modified: trunk/ubuntu/advanced-topics/C/advanced-topics-C.omf
==============================================================================
--- trunk/ubuntu/advanced-topics/C/advanced-topics-C.omf        (original)
+++ trunk/ubuntu/advanced-topics/C/advanced-topics-C.omf        Fri Feb  2 
00:30:16 2007
@@ -10,7 +10,7 @@
     <subject category="General|Linux|Distributions|Other"/>
     <description>Placeholder</description>
     <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-    <identifier 
url="file:///usr/share/ubuntu-docs/advanced-topics/C/advanced-topics.xml"/>
+    <identifier 
url="file:///usr/share/gnome/help/advanced-topics/C/advanced-topics.xml"/>
     <language code="C"/>
     <relation seriesid="3b215d58-ab3d-11db-9346-b6e891c8efa5"/>
     <rights type="CC-by-SA" license.version="2.0" holder="Canonical Ltd."/>

Modified: trunk/ubuntu/config-desktop/C/config-desktop-C.omf
==============================================================================
--- trunk/ubuntu/config-desktop/C/config-desktop-C.omf  (original)
+++ trunk/ubuntu/config-desktop/C/config-desktop-C.omf  Fri Feb  2 00:30:16 2007
@@ -10,7 +10,7 @@
     <subject category="General|Linux|Distributions|Other"/>
     <description>Placeholder.</description>
     <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-    <identifier 
url="file:///usr/share/ubuntu-docs/config-desktop/C/config-desktop.xml"/>
+    <identifier 
url="file:///usr/share/gnome/help/config-desktop/C/config-desktop.xml"/>
     <language code="C"/>
     <relation seriesid="628dd582-9f6d-11db-9890-e2fbc6f27def"/>
     <rights type="CC-by-SA" license.version="2.0" holder="Canonical Ltd."/>

Modified: trunk/ubuntu/internet/C/internet-C.omf
==============================================================================
--- trunk/ubuntu/internet/C/internet-C.omf      (original)
+++ trunk/ubuntu/internet/C/internet-C.omf      Fri Feb  2 00:30:16 2007
@@ -10,7 +10,7 @@
     <subject category="General|Linux|Distributions|Other"/>
     <description>Connecting to and browsing the internet, and communicating 
over the internet using email and instant messaging.</description>
     <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-    <identifier url="file:///usr/share/ubuntu-docs/internet/C/internet.xml"/>
+    <identifier url="file:///usr/share/gnome/help/internet/C/internet.xml"/>
     <language code="C"/>
     <relation seriesid="a4cecdc6-8d38-11db-807a-d364bb9186c1"/>
     <rights type="CC-by-SA" license.version="2.0" holder="Canonical Ltd."/>

Modified: trunk/ubuntu/keeping-safe/C/keeping-safe-C.omf
==============================================================================
--- trunk/ubuntu/keeping-safe/C/keeping-safe-C.omf      (original)
+++ trunk/ubuntu/keeping-safe/C/keeping-safe-C.omf      Fri Feb  2 00:30:16 2007
@@ -10,7 +10,7 @@
     <subject category="General|Linux|Distributions|Other"/>
     <description>Placeholder.</description>
     <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-    <identifier 
url="file:///usr/share/ubuntu-docs/keeping-safe/C/keeping-safe.xml"/>
+    <identifier 
url="file:///usr/share/gnome/help/keeping-safe/C/keeping-safe.xml"/>
     <language code="C"/>
     <relation seriesid="75a2a7e0-9f74-11db-8ee5-a16b5b471285"/>
     <rights type="CC-by-SA" license.version="2.0" holder="Canonical Ltd."/>

Modified: trunk/ubuntu/musicvideophotos/C/musicvideophotos-C.omf
==============================================================================
--- trunk/ubuntu/musicvideophotos/C/musicvideophotos-C.omf      (original)
+++ trunk/ubuntu/musicvideophotos/C/musicvideophotos-C.omf      Fri Feb  2 
00:30:16 2007
@@ -10,7 +10,7 @@
     <subject category="General|Linux|Distributions|Other"/>
     <description>All about playing music and video files, CDs, DVDs as well as 
importing, managing and editing your photos and pictures.</description>
     <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-    <identifier 
url="file:///usr/share/ubuntu-docs/musicvideophotos/C/musicvideophotos.xml"/>
+    <identifier 
url="file:///usr/share/gnome/help/musicvideophotos/C/musicvideophotos.xml"/>
     <language code="C"/>
     <relation seriesid="e2be544e-8d38-11db-85e5-90c26ca97f1b"/>
     <rights type="CC-by-SA" license.version="2.0" holder="Canonical Ltd."/>

Modified: trunk/ubuntu/newtoubuntu/C/newtoubuntu-C.omf
==============================================================================
--- trunk/ubuntu/newtoubuntu/C/newtoubuntu-C.omf        (original)
+++ trunk/ubuntu/newtoubuntu/C/newtoubuntu-C.omf        Fri Feb  2 00:30:16 2007
@@ -10,7 +10,7 @@
     <subject category="General|Linux|Distributions|Other"/>
     <description>Introduction to the basics of Ubuntu, and what you need to 
know if you are switching to Ubuntu from another operating system.</description>
     <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-    <identifier 
url="file:///usr/share/ubuntu-docs/newtoubuntu/C/newtoubuntu.xml"/>
+    <identifier 
url="file:///usr/share/gnome/help/newtoubuntu/C/newtoubuntu.xml"/>
     <language code="C"/>
     <relation seriesid="d8a3af46-8d5a-11db-8c4e-d252d62af366"/>
     <rights type="CC-by-SA" license.version="2.0" holder="Canonical Ltd."/>

Modified: trunk/ubuntu/printing/C/printing-C.omf
==============================================================================
--- trunk/ubuntu/printing/C/printing-C.omf      (original)
+++ trunk/ubuntu/printing/C/printing-C.omf      Fri Feb  2 00:30:16 2007
@@ -10,7 +10,7 @@
     <subject category="General|Linux|Distributions|Other"/>
     <description>Setting up and using a printer/fax machine.</description>
     <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-    <identifier url="file:///usr/share/ubuntu-docs/printing/C/printing.xml"/>
+    <identifier url="file:///usr/share/gnome/help/printing/C/printing.xml"/>
     <language code="C"/>
     <relation seriesid="46905562-8d39-11db-9e8e-dac9ef893e3b"/>
     <rights type="CC-by-SA" license.version="2.0" holder="Canonical Ltd."/>

-- 
ubuntu-doc-commits mailing list
ubuntu-doc-commits@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc-commits

Reply via email to