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

xorg-server: Changes to 'debian-unstable'



 debian/changelog                      |   35 ++++++++++++
 debian/control                        |   30 +++++++++-
 debian/patches/series                 |    1 
 debian/patches/xorg-wrapper-envp.diff |   24 ++++++++
 debian/po/POTFILES.in                 |    1 
 debian/po/ar.po                       |   62 +++++++++++++++++++++
 debian/po/ast.po                      |   64 ++++++++++++++++++++++
 debian/po/be.po                       |   58 ++++++++++++++++++++
 debian/po/bg.po                       |   80 +++++++++++++++++++++++++++
 debian/po/bn.po                       |   60 ++++++++++++++++++++
 debian/po/bs.po                       |   70 ++++++++++++++++++++++++
 debian/po/ca.po                       |   79 +++++++++++++++++++++++++++
 debian/po/cs.po                       |   79 +++++++++++++++++++++++++++
 debian/po/da.po                       |   98 ++++++++++++++++++++++++++++++++++
 debian/po/de.po                       |   78 +++++++++++++++++++++++++++
 debian/po/dz.po                       |   73 +++++++++++++++++++++++++
 debian/po/el.po                       |   84 +++++++++++++++++++++++++++++
 debian/po/eo.po                       |   61 +++++++++++++++++++++
 debian/po/es.po                       |   88 ++++++++++++++++++++++++++++++
 debian/po/eu.po                       |   82 ++++++++++++++++++++++++++++
 debian/po/fi.po                       |   62 +++++++++++++++++++++
 debian/po/fr.po                       |   87 ++++++++++++++++++++++++++++++
 debian/po/gl.po                       |   68 +++++++++++++++++++++++
 debian/po/gu.po                       |   59 ++++++++++++++++++++
 debian/po/he.po                       |   61 +++++++++++++++++++++
 debian/po/hr.po                       |   56 +++++++++++++++++++
 debian/po/hu.po                       |   56 +++++++++++++++++++
 debian/po/id.po                       |   74 +++++++++++++++++++++++++
 debian/po/it.po                       |   85 +++++++++++++++++++++++++++++
 debian/po/ja.po                       |   81 ++++++++++++++++++++++++++++
 debian/po/kk.po                       |   55 +++++++++++++++++++
 debian/po/km.po                       |   70 ++++++++++++++++++++++++
 debian/po/ko.po                       |   58 ++++++++++++++++++++
 debian/po/ku.po                       |   56 +++++++++++++++++++
 debian/po/lt.po                       |   71 ++++++++++++++++++++++++
 debian/po/ml.po                       |   70 ++++++++++++++++++++++++
 debian/po/mr.po                       |   60 ++++++++++++++++++++
 debian/po/nb.po                       |   63 +++++++++++++++++++++
 debian/po/ne.po                       |   63 +++++++++++++++++++++
 debian/po/nl.po                       |   82 ++++++++++++++++++++++++++++
 debian/po/nn.po                       |   70 ++++++++++++++++++++++++
 debian/po/pl.po                       |   66 ++++++++++++++++++++++
 debian/po/pothead.in                  |   30 ++++++++++
 debian/po/pt.po                       |   67 +++++++++++++++++++++++
 debian/po/pt_BR.po                    |   85 +++++++++++++++++++++++++++++
 debian/po/ro.po                       |   84 +++++++++++++++++++++++++++++
 debian/po/ru.po                       |   87 ++++++++++++++++++++++++++++++
 debian/po/sk.po                       |   65 ++++++++++++++++++++++
 debian/po/sq.po                       |   66 ++++++++++++++++++++++
 debian/po/sr.po                       |   60 ++++++++++++++++++++
 debian/po/sr@latin.po                 |   61 +++++++++++++++++++++
 debian/po/sv.po                       |   88 ++++++++++++++++++++++++++++++
 debian/po/ta.po                       |   70 ++++++++++++++++++++++++
 debian/po/templates.pot               |   53 ++++++++++++++++++
 debian/po/th.po                       |   59 ++++++++++++++++++++
 debian/po/tr.po                       |   83 ++++++++++++++++++++++++++++
 debian/po/vi.po                       |   62 +++++++++++++++++++++
 debian/po/wo.po                       |   61 +++++++++++++++++++++
 debian/po/zh_CN.po                    |   81 ++++++++++++++++++++++++++++
 debian/po/zh_TW.po                    |   74 +++++++++++++++++++++++++
 debian/rules                          |   11 +++
 debian/xserver-xorg-core.install      |    2 
 debian/xserver-xorg-legacy.config     |   87 ++++++++++++++++++++++++++++++
 debian/xserver-xorg-legacy.install    |    3 +
 debian/xserver-xorg-legacy.postinst   |   77 ++++++++++++++++++++++++++
 debian/xserver-xorg-legacy.postrm     |   36 ++++++++++++
 debian/xserver-xorg-legacy.templates  |   22 +++++++
 67 files changed, 4150 insertions(+), 4 deletions(-)

New commits:
commit b85977a295721064c5e4eee3e6762c27af16d3ea
Author: Laurent Bigonville <bigon@bigon.be>
Date:   Tue Oct 6 09:06:36 2015 +0200

    Release to unstable

diff --git a/debian/changelog b/debian/changelog
index d72d138..0b56c99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
+xorg-server (2:1.17.2-3) unstable; urgency=medium
 
+  * Team upload.
   [ Laurent Bigonville ]
   * Move Xorg.wrap.1 man page from the xserver-xorg-core to
     xserver-xorg-legacy package (Closes: #797661)
@@ -14,7 +15,7 @@ xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
   [ Julien Cristau ]
   * Only reset environment in the Xorg wrapper if we didn't drop privileges.
 
- -- Laurent Bigonville <bigon@debian.org>  Tue, 06 Oct 2015 09:05:48 +0200
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 06 Oct 2015 09:06:22 +0200
 
 xorg-server (2:1.17.2-2) experimental; urgency=medium
 

commit 2abffe87662e3d8d023bc576051214ddb38e7832
Author: Laurent Bigonville <bigon@bigon.be>
Date:   Tue Oct 6 09:06:05 2015 +0200

    Bump Standards-Version to 3.9.6 (no further changes)

diff --git a/debian/changelog b/debian/changelog
index 97b77a8..d72d138 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
     xserver-xorg-legacy package (Closes: #797661)
   * Add a Breaks against systemd (<< 226-4~), before that version logind was
     restarted on upgrade which makes the X server crash (See #798097)
+  * Bump Standards-Version to 3.9.6 (no further changes)
 
   [ Andreas Boll ]
   * Update Vcs-* fields.
@@ -13,7 +14,7 @@ xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
   [ Julien Cristau ]
   * Only reset environment in the Xorg wrapper if we didn't drop privileges.
 
- -- Laurent Bigonville <bigon@debian.org>  Tue, 06 Oct 2015 08:49:08 +0200
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 06 Oct 2015 09:05:48 +0200
 
 xorg-server (2:1.17.2-2) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 4eb9539..2f3b6a3 100644
--- a/debian/control
+++ b/debian/control
@@ -98,7 +98,7 @@ Build-Depends:
  libwayland-dev [linux-any],
 #logind
   libdbus-1-dev (>= 1.0) [linux-any],
-Standards-Version: 3.9.2
+Standards-Version: 3.9.6
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/debian/xorg.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
 Homepage: http://www.x.org/

commit 9b44e1815d3580b80ae61b19fd9392608f0183fe
Author: Laurent Bigonville <bigon@bigon.be>
Date:   Tue Oct 6 08:53:37 2015 +0200

    Add a Breaks against systemd (<< 226-4~), before that version logind was restarted on upgrade which makes the X server crash (See #798097)

diff --git a/debian/changelog b/debian/changelog
index e35fa2d..97b77a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
   [ Laurent Bigonville ]
   * Move Xorg.wrap.1 man page from the xserver-xorg-core to
     xserver-xorg-legacy package (Closes: #797661)
+  * Add a Breaks against systemd (<< 226-4~), before that version logind was
+    restarted on upgrade which makes the X server crash (See #798097)
 
   [ Andreas Boll ]
   * Update Vcs-* fields.
@@ -11,7 +13,7 @@ xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
   [ Julien Cristau ]
   * Only reset environment in the Xorg wrapper if we didn't drop privileges.
 
- -- Laurent Bigonville <bigon@debian.org>  Sat, 22 Aug 2015 16:29:11 +0200
+ -- Laurent Bigonville <bigon@debian.org>  Tue, 06 Oct 2015 08:49:08 +0200
 
 xorg-server (2:1.17.2-2) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index eb6f745..4eb9539 100644
--- a/debian/control
+++ b/debian/control
@@ -145,6 +145,7 @@ Breaks:
  libgl1-mesa-dri (<< 7.10.2-4),
  libgl1-mesa-dri-experimental (<< 7.10.2-4),
  xserver-xorg (<< 1:7.7+10~),
+ systemd (<< 226-4~),
 Replaces:
  xserver-xorg-video-modesetting,
  xserver-xorg (<< 1:7.7+10~),

commit 4a047d592f91a98b18f6ae17779e17c4461e9bbd
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date:   Wed Sep 2 14:16:47 2015 +0200

    Use https for Vcs-* fields.

diff --git a/debian/control b/debian/control
index be6388b..eb6f745 100644
--- a/debian/control
+++ b/debian/control
@@ -99,8 +99,8 @@ Build-Depends:
 #logind
   libdbus-1-dev (>= 1.0) [linux-any],
 Standards-Version: 3.9.2
-Vcs-Git: git://anonscm.debian.org/pkg-xorg/xserver/xorg-server.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/debian/xorg.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
 Homepage: http://www.x.org/
 
 Package: xserver-xorg-core

commit b57a76cfb9801786cc922e34ec1bd9e42802e472
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Sep 2 11:55:29 2015 +0200

    Only reset environment in the Xorg wrapper if we didn't drop privileges.

diff --git a/debian/changelog b/debian/changelog
index 82e7b25..e35fa2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
   * Update Vcs-* fields.
   * Add upstream url.
 
+  [ Julien Cristau ]
+  * Only reset environment in the Xorg wrapper if we didn't drop privileges.
+
  -- Laurent Bigonville <bigon@debian.org>  Sat, 22 Aug 2015 16:29:11 +0200
 
 xorg-server (2:1.17.2-2) experimental; urgency=medium
diff --git a/debian/patches/xorg-wrapper-envp.diff b/debian/patches/xorg-wrapper-envp.diff
index 6e427f4..47fa90e 100644
--- a/debian/patches/xorg-wrapper-envp.diff
+++ b/debian/patches/xorg-wrapper-envp.diff
@@ -1,7 +1,7 @@
-diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c
-index 22e97ad..10e6fe8 100644
---- a/hw/xfree86/xorg-wrapper.c
-+++ b/hw/xfree86/xorg-wrapper.c
+Index: xorg-server/hw/xfree86/xorg-wrapper.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/xorg-wrapper.c
++++ xorg-server/hw/xfree86/xorg-wrapper.c
 @@ -190,6 +190,7 @@ int main(int argc, char *argv[])
      int total_cards = 0;
      int allowed = CONSOLE_ONLY;
@@ -10,12 +10,15 @@ index 22e97ad..10e6fe8 100644
  
      progname = argv[0];
  
-@@ -265,7 +266,7 @@ int main(int argc, char *argv[])
+@@ -265,7 +266,10 @@ int main(int argc, char *argv[])
      }
  
      argv[0] = buf;
 -    (void) execv(argv[0], argv);
-+    (void) execve(argv[0], argv, envp);
++    if (getuid() == geteuid())
++        (void) execv(argv[0], argv);
++    else
++        (void) execve(argv[0], argv, envp);
      fprintf(stderr, "%s: Failed to execute %s: %s\n",
          progname, buf, strerror(errno));
      exit(1);

commit 721e7aaf1c84e176f3bd03871013e0cc259e1860
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date:   Wed Sep 2 10:51:47 2015 +0200

    Add upstream url.

diff --git a/debian/changelog b/debian/changelog
index 151ca1d..82e7b25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
 
   [ Andreas Boll ]
   * Update Vcs-* fields.
+  * Add upstream url.
 
  -- Laurent Bigonville <bigon@debian.org>  Sat, 22 Aug 2015 16:29:11 +0200
 
diff --git a/debian/control b/debian/control
index e972671..be6388b 100644
--- a/debian/control
+++ b/debian/control
@@ -101,6 +101,7 @@ Build-Depends:
 Standards-Version: 3.9.2
 Vcs-Git: git://anonscm.debian.org/pkg-xorg/xserver/xorg-server.git
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
+Homepage: http://www.x.org/
 
 Package: xserver-xorg-core
 Architecture: any

commit cad883ae7f3aa1d22a3de84d200c5fce7f96f1e2
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date:   Wed Sep 2 10:43:46 2015 +0200

    Update Vcs-* fields.

diff --git a/debian/changelog b/debian/changelog
index 31e5fb1..151ca1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
 
+  [ Laurent Bigonville ]
   * Move Xorg.wrap.1 man page from the xserver-xorg-core to
     xserver-xorg-legacy package (Closes: #797661)
 
+  [ Andreas Boll ]
+  * Update Vcs-* fields.
+
  -- Laurent Bigonville <bigon@debian.org>  Sat, 22 Aug 2015 16:29:11 +0200
 
 xorg-server (2:1.17.2-2) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index a837aeb..e972671 100644
--- a/debian/control
+++ b/debian/control
@@ -99,8 +99,8 @@ Build-Depends:
 #logind
   libdbus-1-dev (>= 1.0) [linux-any],
 Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
+Vcs-Git: git://anonscm.debian.org/pkg-xorg/xserver/xorg-server.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
 
 Package: xserver-xorg-core
 Architecture: any

commit 425d762dc494b8dd83dbfcc30cd1681d59a61f27
Author: Laurent Bigonville <bigon@bigon.be>
Date:   Wed Sep 2 10:23:29 2015 +0200

    Add Closes statement

diff --git a/debian/changelog b/debian/changelog
index 417b174..31e5fb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
 
   * Move Xorg.wrap.1 man page from the xserver-xorg-core to
-    xserver-xorg-legacy package
+    xserver-xorg-legacy package (Closes: #797661)
 
  -- Laurent Bigonville <bigon@debian.org>  Sat, 22 Aug 2015 16:29:11 +0200
 

commit cc1e94cb5a7e7172974be98103f0af4170c8dc22
Author: Laurent Bigonville <bigon@bigon.be>
Date:   Sat Aug 22 16:30:03 2015 +0200

    Move Xorg.wrap.1 man page from the xserver-xorg-core to xserver-xorg-legacy package

diff --git a/debian/changelog b/debian/changelog
index eb80147..417b174 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
+
+  * Move Xorg.wrap.1 man page from the xserver-xorg-core to
+    xserver-xorg-legacy package
+
+ -- Laurent Bigonville <bigon@debian.org>  Sat, 22 Aug 2015 16:29:11 +0200
+
 xorg-server (2:1.17.2-2) experimental; urgency=medium
 
   [ Laurent Bigonville ]
diff --git a/debian/control b/debian/control
index ca9e18e..a837aeb 100644
--- a/debian/control
+++ b/debian/control
@@ -398,8 +398,10 @@ Depends:
  ${misc:Depends},
 Breaks:
  x11-common (<< 1:7.7+10~),
+ xserver-xorg-core (<< 2:1.17.2-3~),
 Replaces:
  x11-common (<< 1:7.7+10~),
+ xserver-xorg-core (<< 2:1.17.2-3~),
 Description: setuid root Xorg server wrapper
  This package provides a wrapper for the Xorg X server, which is
  necessary for legacy drivers and non-Linux kernels.
diff --git a/debian/xserver-xorg-core.install b/debian/xserver-xorg-core.install
index 856b615..e16f9d6 100644
--- a/debian/xserver-xorg-core.install
+++ b/debian/xserver-xorg-core.install
@@ -2,11 +2,9 @@ main/usr/lib/xorg/modules	usr/lib/xorg
 main/usr/bin/Xorg	usr/bin
 main/usr/bin/X		usr/bin
 main/usr/share/man/man1/Xorg.1	usr/share/man/man1
-main/usr/share/man/man1/Xorg.wrap.1	usr/share/man/man1
 main/usr/share/man/man4		usr/share/man/
 main/usr/share/man/man5/xorg.conf.5	usr/share/man/man5
 main/usr/share/man/man5/xorg.conf.d.5	usr/share/man/man5
-main/usr/share/man/man5/Xwrapper.config.5	usr/share/man/man5
 main/usr/bin/cvt	usr/bin
 main/usr/bin/gtf	usr/bin
 main/usr/share/man/man1/cvt.1	usr/share/man/man1
diff --git a/debian/xserver-xorg-legacy.install b/debian/xserver-xorg-legacy.install
index 5f3eb87..44b995e 100644
--- a/debian/xserver-xorg-legacy.install
+++ b/debian/xserver-xorg-legacy.install
@@ -1 +1,3 @@
 main/usr/lib/xorg/Xorg.wrap usr/lib/xorg
+main/usr/share/man/man1/Xorg.wrap.1	usr/share/man/man1
+main/usr/share/man/man5/Xwrapper.config.5	usr/share/man/man5

commit 1199afc577837d3bf0e312ebd739d63f1dd843df
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Aug 19 11:17:01 2015 +0200

    Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 824a323..eb80147 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.17.2-2) UNRELEASED; urgency=medium
+xorg-server (2:1.17.2-2) experimental; urgency=medium
 
   [ Laurent Bigonville ]
   * Enable logind support for the main build on Linux.
@@ -12,7 +12,7 @@ xorg-server (2:1.17.2-2) UNRELEASED; urgency=medium
     any variable there, and if that turns out to be wrong we can add a
     whitelist or hardcode some values.
 
- -- Julien Cristau <jcristau@debian.org>  Tue, 11 Aug 2015 19:40:35 +0200
+ -- Julien Cristau <jcristau@debian.org>  Wed, 19 Aug 2015 11:14:05 +0200
 
 xorg-server (2:1.17.2-1.1) unstable; urgency=medium
 

commit 6823004aae3b30786ca35e887c68db4842825eb4
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Aug 12 18:51:41 2015 +0200

    Patch the wrapper to reset Xorg's environment

diff --git a/debian/changelog b/debian/changelog
index 5e57b53..824a323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ xorg-server (2:1.17.2-2) UNRELEASED; urgency=medium
   [ Julien Cristau ]
   * Take over x11-common's handling of the X wrapper; ship the wrapper in a
     new xserver-xorg-legacy package.
+  * Patch the wrapper to reset Xorg's environment.  I don't believe it needs
+    any variable there, and if that turns out to be wrong we can add a
+    whitelist or hardcode some values.
 
  -- Julien Cristau <jcristau@debian.org>  Tue, 11 Aug 2015 19:40:35 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 2c8af94..24628e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 03_static-nettle.diff
 05_Revert-Unload-submodules.diff
 #08_xfree86_fix_ia64_inx_outx.diff
+xorg-wrapper-envp.diff
diff --git a/debian/patches/xorg-wrapper-envp.diff b/debian/patches/xorg-wrapper-envp.diff
new file mode 100644
index 0000000..6e427f4
--- /dev/null
+++ b/debian/patches/xorg-wrapper-envp.diff
@@ -0,0 +1,21 @@
+diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c
+index 22e97ad..10e6fe8 100644
+--- a/hw/xfree86/xorg-wrapper.c
++++ b/hw/xfree86/xorg-wrapper.c
+@@ -190,6 +190,7 @@ int main(int argc, char *argv[])
+     int total_cards = 0;
+     int allowed = CONSOLE_ONLY;
+     int needs_root_rights = -1;
++    char *const envp[1] = { NULL, };
+ 
+     progname = argv[0];
+ 
+@@ -265,7 +266,7 @@ int main(int argc, char *argv[])
+     }
+ 
+     argv[0] = buf;
+-    (void) execv(argv[0], argv);
++    (void) execve(argv[0], argv, envp);
+     fprintf(stderr, "%s: Failed to execute %s: %s\n",
+         progname, buf, strerror(errno));
+     exit(1);

commit bc8eefa262dbed4904946aa8b50c382e4fa6c024
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Aug 12 18:43:30 2015 +0200

    take over wrapper and related stuff from x11-common
    
    add a new xserver-xorg-legacy package for that.

diff --git a/debian/changelog b/debian/changelog
index 81e979f..5e57b53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ xorg-server (2:1.17.2-2) UNRELEASED; urgency=medium
   * Build and ship the setuid root wrapper from upstream, replacing
     xserver-xorg's.
 
+  [ Julien Cristau ]
+  * Take over x11-common's handling of the X wrapper; ship the wrapper in a
+    new xserver-xorg-legacy package.
+
  -- Julien Cristau <jcristau@debian.org>  Tue, 11 Aug 2015 19:40:35 +0200
 
 xorg-server (2:1.17.2-1.1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 67bb7c4..ca9e18e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Build-Depends:
  debhelper (>= 9),
+ po-debconf,
  dpkg-dev (>= 1.16.1),
  quilt,
  lsb-release,
@@ -142,9 +143,10 @@ Breaks:
  xserver-xorg-video-vga (<= 1:4.1.0-8),
  libgl1-mesa-dri (<< 7.10.2-4),
  libgl1-mesa-dri-experimental (<< 7.10.2-4),
+ xserver-xorg (<< 1:7.7+10~),
 Replaces:
  xserver-xorg-video-modesetting,
- xserver-xorg,
+ xserver-xorg (<< 1:7.7+10~),
 Conflicts:
  xserver-xorg-input-evtouch,
  xserver-xorg-video-modesetting,
@@ -386,3 +388,18 @@ Description: Xwayland X server
  This package provides an X server running on top of wayland, using wayland
  input devices for input and forwarding either the root window or individual
  top-level windows as wayland surfaces.
+
+Package: xserver-xorg-legacy
+Architecture: any
+Priority: extra
+Depends:
+ xserver-common (>= ${source:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks:
+ x11-common (<< 1:7.7+10~),
+Replaces:
+ x11-common (<< 1:7.7+10~),
+Description: setuid root Xorg server wrapper
+ This package provides a wrapper for the Xorg X server, which is
+ necessary for legacy drivers and non-Linux kernels.
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
new file mode 100644
index 0000000..1728364
--- /dev/null
+++ b/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] xserver-xorg-legacy.templates
diff --git a/debian/po/ar.po b/debian/po/ar.po
new file mode 100644
index 0000000..b7075c5
--- /dev/null
+++ b/debian/po/ar.po
@@ -0,0 +1,62 @@
+# translation of ar.po to Arabic
+# xserver-xorg translation
+# Copyright (C) 2006 The Arabeyes Project
+# This file is distributed under the same license as the xserver-xorg package.
+#
+# Ossama M. Khayat <okhayat@yahoo.com>, 2006, 2007, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: ar\n"
+"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2009-06-02 20:32+0200\n"
+"PO-Revision-Date: 2008-06-12 03:41+0300\n"
+"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
+"Language-Team: Arabic <support@arabeyes.org>\n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=4; plural=n%100==1 || n==0 ? 0 : n%100==2 ? 2 : n"
+"%100>=3 && n%100<=10 ? 2 : 3;\n"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Root Only"
+msgstr "المستخدم root فقط"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Console Users Only"
+msgstr "مستخدمي الطرفية فقط"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Anybody"
+msgstr "أي أحد"
+
+#. Type: select
+#. Description
+#: ../xserver-xorg-legacy.templates:2002
+msgid "Users allowed to start the X server:"
+msgstr "المستخدمين المسموح لهم تشغيل خادم X:"
+
+#. Type: select
+#. Description
+#: ../xserver-xorg-legacy.templates:2002
+msgid ""
+"Because the X server runs with superuser privileges, it may be unwise to "
+"permit any user to start it, for security reasons.  On the other hand, it is "
+"even more unwise to run general-purpose X client programs as root, which is "
+"what may happen if only root is permitted to start the X server.  A good "
+"compromise is to permit the X server to be started only by users logged in "
+"to one of the virtual consoles."
+msgstr ""
+"لأن خادم X يعمل بصلاحية المستخدم الخارق، فقد لا يكون من الحكمة السماح لأي "
+"مستخدم بتشغيله، لأسباب أمنية. من ناحية أخرى، فليس من الحكمة أيضاً تشغيل برامج "
+"X العامة كمستخدم root، والذي قد يحدث إن كان المستخدم root هو الوحيد الذي "
+"يمكنه تشغيل خادم X. لذا، فإن الحل الأمثل لهذه المعضلة هو السماح فقط لمستخدمي "
+"النظام عبر أحد الطرفيات الوهمية."
diff --git a/debian/po/ast.po b/debian/po/ast.po
new file mode 100644
index 0000000..7f0d175
--- /dev/null
+++ b/debian/po/ast.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xorg_po\n"
+"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2009-06-02 20:32+0200\n"
+"PO-Revision-Date: 2009-01-12 08:33+0100\n"
+"Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
+"com>\n"
+"Language-Team: Asturian <softast-xeneral@lists.sourceforge.net>\n"
+"Language: ast\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Language: Asturian\n"
+"X-Poedit-Country: SPAIN\n"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Root Only"
+msgstr "Namái root"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Console Users Only"
+msgstr "Namái usuarios de consola"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Anybody"
+msgstr "Cualesquiera"
+
+#. Type: select
+#. Description
+#: ../xserver-xorg-legacy.templates:2002
+msgid "Users allowed to start the X server:"
+msgstr "Usuarios a los que se-yos permite arrancar el sirvidor de X:"
+
+#. Type: select
+#. Description
+#: ../xserver-xorg-legacy.templates:2002
+msgid ""
+"Because the X server runs with superuser privileges, it may be unwise to "
+"permit any user to start it, for security reasons.  On the other hand, it is "
+"even more unwise to run general-purpose X client programs as root, which is "
+"what may happen if only root is permitted to start the X server.  A good "
+"compromise is to permit the X server to be started only by users logged in "
+"to one of the virtual consoles."
+msgstr ""
+"Darréu que'l servidor X execútase con privilexos de superusuariu, pue nun "
+"ser enforma prudente dexar que cualesquier usuariu lu arranque, por sides de "
+"seguridá. Per otru llau, ye entá más imprudente executar programes veceru de "
+"X de forma xeneral como root, lo cual pue asoceder si namái se permite a "
+"root aniciar el sirvidor X. Un compromisu ente dambos casos ye permitir "
+"que'l sirvidor X lu anicien namái usuarios que tengan entrao per una de les "
+"consoles virtuales."
diff --git a/debian/po/be.po b/debian/po/be.po
new file mode 100644
index 0000000..cbd9ff2
--- /dev/null
+++ b/debian/po/be.po
@@ -0,0 +1,58 @@
+# translation of xorg_be.po to Belarusian
+# Pavel Piatruk <piatruk.p@gmail.com>, 2008.
+# Version xorg 1:7.3+12
+msgid ""
+msgstr ""
+"Project-Id-Version: xorg_be\n"
+"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2009-06-02 20:32+0200\n"
+"PO-Revision-Date: 2008-06-09 12:18+0300\n"
+"Last-Translator: Pavel Piatruk <piatruk.p@gmail.com>\n"
+"Language-Team: Belarusian <i18n@mova.org>\n"
+"Language: be\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Root Only"
+msgstr "Толькі Root"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Console Users Only"
+msgstr "Толькі карыстальнікі кансолі"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Anybody"
+msgstr "Усе"
+
+#. Type: select
+#. Description
+#: ../xserver-xorg-legacy.templates:2002
+msgid "Users allowed to start the X server:"
+msgstr "Карыстальнікі, якім дазволена запускаць X-сервер:"
+
+#. Type: select
+#. Description
+#: ../xserver-xorg-legacy.templates:2002
+msgid ""
+"Because the X server runs with superuser privileges, it may be unwise to "
+"permit any user to start it, for security reasons.  On the other hand, it is "
+"even more unwise to run general-purpose X client programs as root, which is "
+"what may happen if only root is permitted to start the X server.  A good "
+"compromise is to permit the X server to be started only by users logged in "
+"to one of the virtual consoles."
+msgstr ""
+"X-сервер працуе з прывілеямі супер-карыстальніка, таму з прычын бяспекі лепш "
+"не дазваляць запускаць яго любому карыстальніку. З іншага боку, яшчэ горш "
+"сітуацыя, калі ўсе кліенцкія X-праграмы працуюць з прывілеямі супер-"
+"карыстальніка - так будзе, калі толькі супер-карыстальніку будзе дазволена "
+"стартаваць X-сервер. Найлепшае выйсце - дазволіць запуск X-сервера толькі "
+"тым карыстальнікам, што зайшлі ў адну з віртуальных кансоляў."
diff --git a/debian/po/bg.po b/debian/po/bg.po
new file mode 100644
index 0000000..77bb0ea
--- /dev/null
+++ b/debian/po/bg.po
@@ -0,0 +1,80 @@
+# translation of bg.po to Bulgarian
+# debconf templates for xorg-x11 package
+# Bulgarian translation
+#
+# $Id$
+#
+# Copyrights:
+#
+# This file is distributed under the same license as the xorg-x11 package.
+# Please see debian/copyright.
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+# Damyan Ivanov <dam@modsoftsys.com>, 2006, 2007.
+# Damyan Ivanov <dmn@debian.org>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: xserver-xorg_debian_po_bg\n"
+"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2009-06-02 20:32+0200\n"
+"PO-Revision-Date: 2008-06-09 09:47+0300\n"
+"Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"Language: bg\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Root Only"
+msgstr "Само root"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Console Users Only"
+msgstr "Само потребители на конзолата"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Anybody"
+msgstr "Всички потребители на системата"
+
+#. Type: select
+#. Description
+#: ../xserver-xorg-legacy.templates:2002
+msgid "Users allowed to start the X server:"
+msgstr "Потребители, на които им е разрешено да стартират X-сървъра:"
+
+#. Type: select
+#. Description
+#: ../xserver-xorg-legacy.templates:2002
+msgid ""
+"Because the X server runs with superuser privileges, it may be unwise to "
+"permit any user to start it, for security reasons.  On the other hand, it is "
+"even more unwise to run general-purpose X client programs as root, which is "
+"what may happen if only root is permitted to start the X server.  A good "
+"compromise is to permit the X server to be started only by users logged in "
+"to one of the virtual consoles."
+msgstr ""
+"Понеже X-сървърът се изпълнява с администраторски привилегии, идеята всеки "
+"потребител да може да го стартира не е много добра от гледна точка на "
+"сигурността. От друга страна, вършенето на ежедневната работа като "
+"администратор е още по-лоша идея. Добър компромис е да се разреши "
+"стартирането на X-сървъра само на потребители, които работят на системната "
+"конзола."
diff --git a/debian/po/bn.po b/debian/po/bn.po
new file mode 100644
index 0000000..03138da
--- /dev/null
+++ b/debian/po/bn.po
@@ -0,0 +1,60 @@
+# Bengali translation of xorg.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Md. Rezwan Shahid <rezwan@ankur.org.bd>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: xorg\n"
+"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2009-06-02 20:32+0200\n"
+"PO-Revision-Date: 2009-04-15 12:27+0600\n"
+"Last-Translator: Md. Rezwan Shahid <rezwan@ankur.org.bd>\n"
+"Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
+"Language: bn\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: WordForge 0.5-beta1\n"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Root Only"
+msgstr "শুধুমাত্র রুট"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Console Users Only"
+msgstr "শুধুমাত্র কনসোল ব্যবহারকারী"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Anybody"
+msgstr "যেকেউ"
+
+#. Type: select
+#. Description
+#: ../xserver-xorg-legacy.templates:2002
+msgid "Users allowed to start the X server:"
+msgstr "যেসকল ব্যবহারকারী X সার্ভার চালু করতে অনুমতিপ্রাপ্ত:"
+
+#. Type: select
+#. Description
+#: ../xserver-xorg-legacy.templates:2002
+msgid ""
+"Because the X server runs with superuser privileges, it may be unwise to "
+"permit any user to start it, for security reasons.  On the other hand, it is "
+"even more unwise to run general-purpose X client programs as root, which is "
+"what may happen if only root is permitted to start the X server.  A good "
+"compromise is to permit the X server to be started only by users logged in "
+"to one of the virtual consoles."
+msgstr ""
+"যেহেতু X সার্ভার সুপারইউজার সুবিধাসহ রান করে, যেকোনো ব্যবহারকারীকে এটি চালু করতে "
+"দেয়া বুদ্ধিমানের কাজ হবে না (নিরাপত্তার জন্য)। আবার, সাধারন কারনে X ক্লায়েন্ট "
+"প্রোগ্রাম চালানোর জন্য রুট হিসেবে লগ-ইন করা ঠিক নয় (যদি শুধুমাত্র রুটের অনুমতি থাকে X "
+"সার্ভার চালু করার তখন এটি ঘটে)। একটি ভালো সমাধান হতে পারে, X সার্ভার শুধুমাত্র সেই "
+"ব্যবহারকারীদের দ্বারা চালু করা যাবে যারা যেকোনো একটি ভার্চুয়াল কনসোলে লগ-ইন করা "
+"আছে।"
diff --git a/debian/po/bs.po b/debian/po/bs.po
new file mode 100644
index 0000000..f1a549b
--- /dev/null
+++ b/debian/po/bs.po
@@ -0,0 +1,70 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xorg\n"
+"Report-Msgid-Bugs-To: xorg@packages.debian.org\n"
+"POT-Creation-Date: 2009-06-02 20:32+0200\n"
+"PO-Revision-Date: 2006-11-01 01:17+0100\n"
+"Last-Translator: Safir Secerovic <sapphire@linux.org.ba>\n"
+"Language-Team: Bosnian <lokal@linux.org.ba>\n"
+"Language: bs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: 3\n"
+"X-Poedit-Country: BOSNIA AND HERZEGOVINA\n"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Root Only"
+msgstr "Samo root"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Console Users Only"
+msgstr "Samo konzolni korisnici"
+
+#. Type: select
+#. Choices
+#: ../xserver-xorg-legacy.templates:2001
+msgid "Anybody"
+msgstr "Svako"
+
+#. Type: select
+#. Description
+#: ../xserver-xorg-legacy.templates:2002
+msgid "Users allowed to start the X server:"
+msgstr "Korisnici kojima je dopušteno pokretanje X severa:"
+
+#. Type: select
+#. Description
+#: ../xserver-xorg-legacy.templates:2002
+msgid ""
+"Because the X server runs with superuser privileges, it may be unwise to "
+"permit any user to start it, for security reasons.  On the other hand, it is "
+"even more unwise to run general-purpose X client programs as root, which is "
+"what may happen if only root is permitted to start the X server.  A good "
+"compromise is to permit the X server to be started only by users logged in "
+"to one of the virtual consoles."
+msgstr ""
+"Zbog činjenice što X server radi s privilegijama administratorskog "
+"korisnika, nije pametno dopustiti svakom korisniku da ga pokreće iz "
+"sigurnosnih razloga.  S druge strane, još manje je pametno pokretati X "
+"klijentske programe opšte namjene kao root, a što se može dogoditi ako samo "
+"root korisniku dopustite pokretanje X servera.  Dobar kompromis je dozvoliti "
+"pokretanje X servera samo korisnicima koji su ulogirani na jednu od "
+"virtuelnih konzola."
diff --git a/debian/po/ca.po b/debian/po/ca.po
new file mode 100644
index 0000000..cb040f0
--- /dev/null
+++ b/debian/po/ca.po
@@ -0,0 +1,79 @@


Reply to: