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

[Git][xorg-team/doc/xorg-docs][debian-unstable] 5 commits: Standards-Version: 4.7.2 (routine-update)



Title: GitLab

Andreas Tille pushed to branch debian-unstable at X Strike Force / doc / xorg-docs

Commits:

  • d744de74
    by Andreas Tille at 2025-03-26T15:42:20+01:00
    Standards-Version: 4.7.2 (routine-update)
    
  • 0d8f4591
    by Andreas Tille at 2025-03-26T15:42:20+01:00
    debhelper-compat 13 (routine-update)
    
  • e6e13fd2
    by Andreas Tille at 2025-03-26T15:49:07+01:00
    cme fix dpkg-control
    
  • de3819b9
    by Andreas Tille at 2025-03-26T15:51:05+01:00
    Fix Vcs fields
    
  • eb08c14f
    by Andreas Tille at 2025-03-26T16:03:29+01:00
    Some formatting fixes for the manual
    

6 changed files:

Changes:

  • debian/changelog
    ... ... @@ -2,12 +2,20 @@ xorg-docs (1:1.7.3-1) UNRELEASED; urgency=medium
    2 2
     
    
    3 3
       [ Andreas Tille ]
    
    4 4
       * Team upload.
    
    5
    +  * Fix Vcs fields
    
    5 6
       * Fix typo in watch file
    
    6 7
         Closes: #888454, #1040617
    
    8
    +  * Standards-Version: 4.7.2 (routine-update)
    
    9
    +  * debhelper-compat 13 (routine-update)
    
    10
    +  * cme fix dpkg-control
    
    7 11
     
    
    8 12
       [ Timo Aaltonen ]
    
    9 13
       * New upstream release.
    
    10 14
     
    
    15
    +  [ Bjarni Ingi Gislason ]
    
    16
    +  * Some formatting fixes for the manual
    
    17
    +    Closes: #1037354
    
    18
    +
    
    11 19
      -- Andreas Tille <tille@debian.org>  Sat, 15 Mar 2025 17:51:45 +0100
    
    12 20
     
    
    13 21
     xorg-docs (1:1.7.1-1.2) unstable; urgency=medium
    

  • debian/compat deleted
    1
    -9

  • debian/control
    1 1
     Source: xorg-docs
    
    2
    +Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
    
    2 3
     Section: doc
    
    3 4
     Priority: optional
    
    4
    -Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
    
    5 5
     Build-Depends:
    
    6
    - debhelper (>= 9),
    
    7
    - dh-autoreconf,
    
    6
    + debhelper-compat (= 13),
    
    8 7
      quilt,
    
    9 8
      pkg-config,
    
    10
    - xorg-sgml-doctools (>= 1:1.8),
    
    9
    + xorg-sgml-doctools,
    
    11 10
      docbook-xml,
    
    12 11
      automake,
    
    13 12
      autoconf,
    
    14
    - xutils-dev (>= 1:7.6+2),
    
    15
    - xmlto (>= 0.0.22),
    
    13
    + xutils-dev,
    
    14
    + xmlto,
    
    16 15
      fop,
    
    17
    - w3m,
    
    18
    -Standards-Version: 3.9.6
    
    19
    -Vcs-Git: git://anonscm.debian.org/git/pkg-xorg/doc/xorg-docs
    
    20
    -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/doc/xorg-docs.git
    
    16
    + w3m
    
    17
    +Standards-Version: 4.7.2
    
    18
    +Vcs-Browser: https://salsa.debian.org/xorg-team/doc/xorg-docs
    
    19
    +Vcs-Git: https://salsa.debian.org/xorg-team/doc/xorg-docs.git
    
    21 20
     
    
    22 21
     Package: xorg-docs-core
    
    23 22
     Architecture: all
    
    23
    +Multi-Arch: foreign
    
    24 24
     Depends: ${misc:Depends}
    
    25 25
     Suggests: xorg-docs
    
    26
    -Replaces: xorg-docs ( << 1:1.4-5 )
    
    27
    -Multi-Arch: foreign
    
    28 26
     Description: Core documentation for the X.org X Window System
    
    29 27
      This package contains core documentation for the X.org X Window
    
    30 28
      System. This currently includes only a set of manpages which are
    
    ... ... @@ -32,10 +30,10 @@ Description: Core documentation for the X.org X Window System
    32 30
     
    
    33 31
     Package: xorg-docs
    
    34 32
     Architecture: all
    
    33
    +Multi-Arch: foreign
    
    35 34
     Depends: ${shlibs:Depends}, ${misc:Depends}
    
    36 35
     Conflicts: xprt-xprintorg (<= 1:0.1.0.alpha1-10)
    
    37 36
     Replaces: xspecs (<= 1:1.2+git20061105-2), xprt-xprintorg (<= 1:0.1.0.alpha1-10)
    
    38
    -Multi-Arch: foreign
    
    39 37
     Description: Miscellaneous documentation for the X.org X Window System
    
    40 38
      This package contains various documents on the X.org X Window System
    
    41 39
      including the release notes for the current version and instructions on
    

  • debian/patches/04-spelling.diff
    1
    +Author: Bjarni Ingi Gislason <bjarniig@simnet.is>
    
    2
    +Last-Update: 2023-06-12
    
    3
    +Bug-Debian: https://bugs.debian.org/1037354
    
    4
    +Description: Some formatting fixes for the manual
    
    5
    +
    
    6
    +--- a/man/X.man
    
    7
    ++++ b/man/X.man
    
    8
    +@@ -36,7 +36,6 @@
    
    9
    + .SH NAME
    
    10
    + X \- a portable, network-transparent window system
    
    11
    + .SH OVERVIEW
    
    12
    +-.PP
    
    13
    + The X Window System is a network transparent window system which runs
    
    14
    + on a wide range of computing and graphics machines.  It should be
    
    15
    + relatively straightforward to build the X.Org Foundation software
    
    16
    +@@ -72,9 +71,9 @@ X supports overlapping hierarchical subw
    
    17
    + graphics operations, on both monochrome and color
    
    18
    + displays.
    
    19
    + For a full explanation of the functions that are available, see
    
    20
    +-the \fIXlib - C Language X Interface\fP manual,
    
    21
    ++the \fIXlib \(en C Language X Interface\fP manual,
    
    22
    + the \fIX Window System Protocol\fP specification,
    
    23
    +-the \fIX Toolkit Intrinsics - C Language Interface\fP manual,
    
    24
    ++the \fIX Toolkit Intrinsics \(en C Language Interface\fP manual,
    
    25
    + and various toolkit documents.
    
    26
    + .\" Use .UR macro from groff's man(7) if available, otherwise just
    
    27
    + .\" display URL as plain text for other processors.
    
    28
    +@@ -124,7 +123,6 @@ as packages in many operating system dis
    
    29
    + available on the Internet.
    
    30
    + See your site administrator or distro package manager for details.
    
    31
    + .SH "STARTING UP"
    
    32
    +-.PP
    
    33
    + There are two main ways of getting the X server and an initial set of
    
    34
    + client applications started.  The particular method used depends on what
    
    35
    + operating system you are running and whether or not you use other window
    
    36
    +@@ -158,7 +156,6 @@ finish.  Since either or both of the use
    
    37
    + script, this gives substantial flexibility at the expense of a
    
    38
    + nice interface.  For this reason, \fIxinit\fP is not intended for end users.
    
    39
    + .SH "DISPLAY NAMES"
    
    40
    +-.PP
    
    41
    + From the user's perspective, every X server has a \fIdisplay name\fP of the
    
    42
    + form:
    
    43
    + .sp
    
    44
    +@@ -430,7 +427,6 @@ hand corner:
    
    45
    +     xload \-geometry 48x48\-96+0 &
    
    46
    +     xbiff \-geometry 48x48\-48+0 &
    
    47
    + .fi
    
    48
    +-.PP
    
    49
    + .SH "WINDOW MANAGERS"
    
    50
    + The layout of windows on the screen is controlled by special programs called
    
    51
    + \fIwindow managers\fP.  Although many window managers will honor geometry
    
    52
    +@@ -481,8 +477,8 @@ font database, reset the font path with
    
    53
    + to add a font to a private directory, the following commands could be used:
    
    54
    + .sp
    
    55
    + .nf
    
    56
    +-    % cp newfont.pcf ~/myfonts
    
    57
    +-    % mkfontdir ~/myfonts
    
    58
    ++    % cp newfont.pcf \(ti/myfonts
    
    59
    ++    % mkfontdir \(ti/myfonts
    
    60
    +     % xset fp rehash
    
    61
    + .fi
    
    62
    + .PP
    
    63
    +@@ -650,8 +646,8 @@ the following syntax:
    
    64
    + center;
    
    65
    + l l.
    
    66
    + CIEXYZ:\fI<X>/<Y>/<Z>\fP	(\fInone\fP, 1, \fInone\fP)
    
    67
    +-CIEuvY:\fI<u>/<v>/<Y>\fP	(~.6, ~.6, 1)
    
    68
    +-CIExyY:\fI<x>/<y>/<Y>\fP	(~.75, ~.85, 1)
    
    69
    ++CIEuvY:\fI<u>/<v>/<Y>\fP	(\(ti.6, \(ti.6, 1)
    
    70
    ++CIExyY:\fI<x>/<y>/<Y>\fP	(\(ti.75, \(ti.85, 1)
    
    71
    + CIELab:\fI<L>/<a>/<b>\fP	(100, \fInone\fP, \fInone\fP)
    
    72
    + CIELuv:\fI<L>/<u>/<v>\fP	(100, \fInone\fP, \fInone\fP)
    
    73
    + TekHVC:\fI<H>/<V>/<C>\fP	(360, 100, 100)
    
    74
    +@@ -669,7 +665,6 @@ followed by an optional '+' or '\-' foll
    
    75
    + For more information on device independent color,
    
    76
    + see the \fIXlib\fP reference manual.
    
    77
    + .SH KEYBOARDS
    
    78
    +-.PP
    
    79
    + The X keyboard model is broken into two layers:  server-specific codes
    
    80
    + (called \fIkeycodes\fP) which represent the physical keys, and
    
    81
    + server-independent symbols (called \fIkeysyms\fP) which
    
    82
    +@@ -700,7 +695,7 @@ The first four elements of the list are
    
    83
    + Group 1 contains the first and second keysyms;
    
    84
    + Group 2 contains the third and fourth keysyms.
    
    85
    + Within each group,
    
    86
    +-if the first element is alphabetic and the
    
    87
    ++if the first element is alphabetic and
    
    88
    + the second element is the special keysym \fINoSymbol\fP,
    
    89
    + then the group is treated as equivalent to a group in which
    
    90
    + the first element is the lowercase letter and the second element
    
    91
    +@@ -709,7 +704,7 @@ is the uppercase letter.
    
    92
    + Switching between groups is controlled by the keysym named MODE SWITCH,
    
    93
    + by attaching that keysym to some key and attaching
    
    94
    + that key to any one of the modifiers Mod1 through Mod5.
    
    95
    +-This modifier is called the ``group modifier.''
    
    96
    ++This modifier is called the ``group modifier''.
    
    97
    + Group 1 is used when the group modifier is off,
    
    98
    + and Group 2 is used when the group modifier is on.
    
    99
    + .PP
    
    100
    +@@ -769,7 +764,7 @@ possible, often by swapping the foregrou
    
    101
    + programs honor this or implement it correctly.  It is usually only used on
    
    102
    + monochrome displays.
    
    103
    + .TP 8
    
    104
    +-.B \+rv
    
    105
    ++.B +rv
    
    106
    + .br
    
    107
    + This option indicates that the program should not simulate reverse video.
    
    108
    + This is used to
    
    109
    +@@ -814,7 +809,7 @@ Program components are named in a hierar
    
    110
    + with each node in the hierarchy identified by a class and an instance name.
    
    111
    + At the top level is the class and instance name of the application itself.
    
    112
    + By convention, the class name of the application is the same as the program
    
    113
    +-name, but with  the first letter capitalized (e.g. \fIBitmap\fP or \fIEmacs\fP)
    
    114
    ++name, but with the first letter capitalized (e.g. \fIBitmap\fP or \fIEmacs\fP)
    
    115
    + although some programs that begin with the letter ``x'' also capitalize the
    
    116
    + second letter for historical reasons.
    
    117
    + .PP
    
    118
    +@@ -859,24 +854,24 @@ same ResourceName, the last line in the
    
    119
    + Any whitespace character before or after the name or colon in a ResourceSpec
    
    120
    + are ignored.
    
    121
    + To allow a Value to begin with whitespace,
    
    122
    +-the two-character sequence ``\\\^\fIspace\fP'' (backslash followed by space)
    
    123
    ++the two-character sequence ``\e\^\fIspace\fP'' (backslash followed by space)
    
    124
    + is recognized and replaced by a space character,
    
    125
    +-and the two-character sequence ``\\\^\fItab\fP''
    
    126
    ++and the two-character sequence ``\e\^\fItab\fP''
    
    127
    + (backslash followed by horizontal tab)
    
    128
    + is recognized and replaced by a horizontal tab character.
    
    129
    + To allow a Value to contain embedded newline characters,
    
    130
    +-the two-character sequence ``\\\^n'' is recognized and replaced by a
    
    131
    ++the two-character sequence ``\e\^n'' is recognized and replaced by a
    
    132
    + newline character.
    
    133
    + To allow a Value to be broken across multiple lines in a text file,
    
    134
    +-the two-character sequence ``\\\^\fInewline\fP''
    
    135
    ++the two-character sequence ``\e\^\fInewline\fP''
    
    136
    + (backslash followed by newline) is
    
    137
    + recognized and removed from the value.
    
    138
    + To allow a Value to contain arbitrary character codes,
    
    139
    +-the four-character sequence ``\\\^\fInnn\fP'',
    
    140
    ++the four-character sequence ``\e\^\fInnn\fP'',
    
    141
    + where each \fIn\fP is a digit character in the range of ``0''\-``7'',
    
    142
    + is recognized and replaced with a single byte that contains
    
    143
    + the octal value specified by the sequence.
    
    144
    +-Finally, the two-character sequence ``\\\\'' is recognized
    
    145
    ++Finally, the two-character sequence ``\e\e'' is recognized
    
    146
    + and replaced with a single backslash.
    
    147
    + .PP
    
    148
    + When an application looks for the value of a resource, it specifies
    
    149
    +@@ -942,10 +937,10 @@ or the environment variable XAPPLRESDIR
    
    150
    + directory and should end with a '/' on POSIX systems), plus directories in a
    
    151
    + standard place (usually under __datadir__/X11/,
    
    152
    + but this can be overridden with the XFILESEARCHPATH environment variable)
    
    153
    +-are searched for for application-specific resources.
    
    154
    ++are searched for application-specific resources.
    
    155
    + For example, application default resources are usually kept in
    
    156
    + __datadir__/X11/app-defaults/.
    
    157
    +-See the \fIX Toolkit Intrinsics - C Language Interface\fP manual for
    
    158
    ++See the \fIX Toolkit Intrinsics \(en C Language Interface\fP manual for
    
    159
    + details.
    
    160
    + .TP 8
    
    161
    + .B XENVIRONMENT
    
    162
    +@@ -972,15 +967,12 @@ begins with a lowercase letter and class
    
    163
    + Multiple word resources are concatenated with the first letter of the
    
    164
    + succeeding words capitalized.  Applications written with the X Toolkit
    
    165
    + Intrinsics will have at least the following resources:
    
    166
    +-.PP
    
    167
    + .TP 8
    
    168
    + .B background (\fPclass\fB Background)
    
    169
    + This resource specifies the color to use for the window background.
    
    170
    +-.PP
    
    171
    + .TP 8
    
    172
    + .B borderWidth (\fPclass\fB BorderWidth)
    
    173
    + This resource specifies the width in pixels of the window border.
    
    174
    +-.PP
    
    175
    + .TP 8
    
    176
    + .B borderColor (\fPclass\fB BorderColor)
    
    177
    + This resource specifies the color to use for the window border.
    
    178
    +@@ -1165,7 +1157,7 @@ The default value is\fI __datadir__/X11/
    
    179
    + .TP
    
    180
    + .B XCMSDB
    
    181
    + This must point to a color name database file. The default value is
    
    182
    +-\fI __libdir__/X11/Xcms.txt\fP.
    
    183
    ++\fI__libdir__/X11/Xcms.txt\fP.
    
    184
    + .TP
    
    185
    + .B RESOURCE_NAME
    
    186
    + This serves as main identifier for resources belonging to the program
    
    187
    +@@ -1271,7 +1263,6 @@ the appropriate instance name can be pla
    
    188
    +     xterm*StringConversionWarnings: on
    
    189
    + .fi
    
    190
    + .SH "SEE ALSO"
    
    191
    +-.PP
    
    192
    + .\" introductions
    
    193
    + .BR XOrgFoundation (__miscmansuffix__),
    
    194
    + .BR XStandards (__miscmansuffix__),
    
    195
    +@@ -1360,10 +1351,8 @@ website at
    
    196
    + .UR "http://www.x.org/releases/current/doc/"
    
    197
    + .UE .
    
    198
    + .SH TRADEMARKS
    
    199
    +-.PP
    
    200
    + X Window System is a trademark of The Open Group.
    
    201
    + .SH AUTHORS
    
    202
    +-.PP
    
    203
    + A cast of thousands, literally.  Releases 6.7 and later are
    
    204
    + brought to you by the X.Org Foundation. The names of all people who
    
    205
    + made it a reality will be found in the individual documents and

  • debian/patches/series
    1 1
     01-disable-ps-generation.diff
    
    2 2
     02-disable-automatic-size-detection.diff
    
    3 3
     03-tell-xmlto-to-be-quiet.diff
    
    4
    +04-spelling.diff

  • debian/rules
    ... ... @@ -4,7 +4,7 @@
    4 4
     PACKAGE = xorg-docs
    
    5 5
     
    
    6 6
     %:
    
    7
    -	dh $@ --with quilt,autoreconf --parallel --builddirectory=build/
    
    7
    +	dh $@ --with quilt,autoreconf --builddirectory=build/
    
    8 8
     
    
    9 9
     override_dh_auto_configure:
    
    10 10
     	dh_auto_configure -- \
    


  • Reply to: