X Strike Force X.Org X11 SVN commit: r2625 - in trunk/lib/libx11/debian: . patches
Author: dnusinow
Date: 2006-08-02 23:25:05 -0400 (Wed, 02 Aug 2006)
New Revision: 2625
Modified:
trunk/lib/libx11/debian/changelog
trunk/lib/libx11/debian/compat
trunk/lib/libx11/debian/control
trunk/lib/libx11/debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff
trunk/lib/libx11/debian/rules
Log:
* Run dh_install with --list-missing
* Bump debhelper compat to 5
* Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
idempotency fix.
Modified: trunk/lib/libx11/debian/changelog
===================================================================
--- trunk/lib/libx11/debian/changelog 2006-08-03 02:07:46 UTC (rev 2624)
+++ trunk/lib/libx11/debian/changelog 2006-08-03 03:25:05 UTC (rev 2625)
@@ -1,13 +1,22 @@
libx11 (2:1.0.0-8) UNRELEASED; urgency=low
+ [ Denis Barbier ]
* Add 014_add_Khmer_digraphs.diff. Khmer keyboards have to generate
several characters with a single keystroke, so define them in
en_US.UTF-8/Compose. They will be added later to all UTF-8 files.
Thanks Paul Wise. (closes: #355957)
* Add support for Khmer locale in 003_recognize_glibc_2.3.2_locale_names.diff
- -- Denis Barbier <barbier@debian.org> Thu, 6 Jul 2006 21:32:54 +0200
+ [ David Nusinow ]
+ * Run dh_install with --list-missing
+ * Bump debhelper compat to 5
+ [ Andres Salomon ]
+ * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
+ idempotency fix.
+
+ -- David Nusinow <dnusinow@debian.org> Wed, 2 Aug 2006 23:09:51 +0000
+
libx11 (2:1.0.0-7) unstable; urgency=high
* Security update. Fix for setuid privledge escalation vulernabilities.
Modified: trunk/lib/libx11/debian/compat
===================================================================
--- trunk/lib/libx11/debian/compat 2006-08-03 02:07:46 UTC (rev 2624)
+++ trunk/lib/libx11/debian/compat 2006-08-03 03:25:05 UTC (rev 2625)
@@ -1 +1 @@
-4
+5
Modified: trunk/lib/libx11/debian/control
===================================================================
--- trunk/lib/libx11/debian/control 2006-08-03 02:07:46 UTC (rev 2624)
+++ trunk/lib/libx11/debian/control 2006-08-03 03:25:05 UTC (rev 2625)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, xtrans-dev, x11proto-bigreqs-dev, x11proto-core-dev, x11proto-kb-dev, x11proto-input-dev, x11proto-xext-dev, x11proto-xf86bigfont-dev, libxdmcp-dev (>= 1:1.0.0-1), libxau-dev (>= 1:1.0.0-1), x11proto-xcmisc-dev, quilt
-Standards-Version: 3.7.2.0
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xtrans-dev, x11proto-bigreqs-dev, x11proto-core-dev, x11proto-kb-dev, x11proto-input-dev, x11proto-xext-dev, x11proto-xf86bigfont-dev, libxdmcp-dev (>= 1:1.0.0-1), libxau-dev (>= 1:1.0.0-1), x11proto-xcmisc-dev, quilt
+Standards-Version: 3.7.2
Package: libx11-6
Architecture: any
Modified: trunk/lib/libx11/debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff
===================================================================
--- trunk/lib/libx11/debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff 2006-08-03 02:07:46 UTC (rev 2624)
+++ trunk/lib/libx11/debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff 2006-08-03 03:25:05 UTC (rev 2625)
@@ -1,8 +1,8 @@
-Index: libx11-1.0.0/nls/locale.dir.pre
+Index: libx11/nls/locale.dir.pre
===================================================================
---- libx11-1.0.0.orig/nls/locale.dir.pre 2006-02-27 12:58:41.000000000 +0700
-+++ libx11-1.0.0/nls/locale.dir.pre 2006-02-27 13:00:26.000000000 +0700
-@@ -434,7 +434,7 @@
+--- libx11.orig/nls/locale.dir.pre 2006-08-02 23:11:05.000000000 +0000
++++ libx11/nls/locale.dir.pre 2006-08-02 23:11:08.000000000 +0000
+@@ -435,7 +435,7 @@
pt_BR.UTF-8/XLC_LOCALE: pt_BR.UTF-8
en_US.UTF-8/XLC_LOCALE: pt_PT.UTF-8
en_US.UTF-8/XLC_LOCALE: ro_RO.UTF-8
@@ -11,10 +11,10 @@
en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8
en_US.UTF-8/XLC_LOCALE: rw_RW.UTF-8
en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
-Index: libx11-1.0.0/nls/ru_RU.UTF-8/XLC_LOCALE.pre
+Index: libx11/nls/ru_RU.UTF-8/XLC_LOCALE.pre
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libx11-1.0.0/nls/ru_RU.UTF-8/XLC_LOCALE.pre 2006-02-27 13:00:26.000000000 +0700
++++ libx11/nls/ru_RU.UTF-8/XLC_LOCALE.pre 2006-08-02 23:11:08.000000000 +0000
@@ -0,0 +1,169 @@
+XCOMM
+XCOMM XLocale Database Sample for ru_RU.UTF-8
@@ -185,10 +185,10 @@
+}
+
+END XLC_XLOCALE
-Index: libx11-1.0.0/nls/ru_RU.UTF-8/XI18N_OBJS
+Index: libx11/nls/ru_RU.UTF-8/XI18N_OBJS
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libx11-1.0.0/nls/ru_RU.UTF-8/XI18N_OBJS 2006-02-27 13:00:26.000000000 +0700
++++ libx11/nls/ru_RU.UTF-8/XI18N_OBJS 2006-08-02 23:11:08.000000000 +0000
@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME
+#
@@ -197,10 +197,10 @@
+XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open
+XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister
+XOM common/xomGeneric _XomGenericOpenOM # XOM_open
-Index: libx11-1.0.0/configure.ac
+Index: libx11/configure.ac
===================================================================
---- libx11-1.0.0.orig/configure.ac 2006-02-27 12:59:08.000000000 +0700
-+++ libx11-1.0.0/configure.ac 2006-02-27 13:00:26.000000000 +0700
+--- libx11.orig/configure.ac 2006-08-02 23:11:08.000000000 +0000
++++ libx11/configure.ac 2006-08-02 23:11:08.000000000 +0000
@@ -391,6 +391,7 @@
nls/mulelao-1/Makefile
nls/nokhchi-1/Makefile
@@ -209,10 +209,10 @@
nls/tatar-cyr/Makefile
nls/th_TH/Makefile
nls/th_TH.UTF-8/Makefile
-Index: libx11-1.0.0/nls/Makefile.am
+Index: libx11/nls/Makefile.am
===================================================================
---- libx11-1.0.0.orig/nls/Makefile.am 2006-02-27 12:58:00.000000000 +0700
-+++ libx11-1.0.0/nls/Makefile.am 2006-02-27 13:00:26.000000000 +0700
+--- libx11.orig/nls/Makefile.am 2006-08-02 23:11:02.000000000 +0000
++++ libx11/nls/Makefile.am 2006-08-02 23:11:08.000000000 +0000
@@ -52,6 +52,7 @@
mulelao-1 \
nokhchi-1 \
@@ -221,16 +221,16 @@
tatar-cyr \
th_TH \
th_TH.UTF-8 \
-Index: libx11-1.0.0/nls/ru_RU.UTF-8/Compose.pre
+Index: libx11/nls/ru_RU.UTF-8/Compose.pre
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libx11-1.0.0/nls/ru_RU.UTF-8/Compose.pre 2006-02-27 13:00:26.000000000 +0700
++++ libx11/nls/ru_RU.UTF-8/Compose.pre 2006-08-02 23:11:08.000000000 +0000
@@ -0,0 +1 @@
+include "/usr/share/X11/locale/en_US.UTF-8/Compose"
-Index: libx11-1.0.0/nls/ru_RU.UTF-8/Makefile.am
+Index: libx11/nls/ru_RU.UTF-8/Makefile.am
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libx11-1.0.0/nls/ru_RU.UTF-8/Makefile.am 2006-02-27 13:00:26.000000000 +0700
++++ libx11/nls/ru_RU.UTF-8/Makefile.am 2006-08-02 23:11:08.000000000 +0000
@@ -0,0 +1,3 @@
+x11thislocaledir = $(X11_LOCALEDATADIR)/ru_RU.UTF-8
+
Modified: trunk/lib/libx11/debian/rules
===================================================================
--- trunk/lib/libx11/debian/rules 2006-08-03 02:07:46 UTC (rev 2624)
+++ trunk/lib/libx11/debian/rules 2006-08-03 03:25:05 UTC (rev 2625)
@@ -51,7 +51,7 @@
build-stamp:
dh_testdir
- mkdir obj-$(DEB_BUILD_GNU_TYPE)
+ test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
@@ -90,7 +90,7 @@
dh_install --sourcedir=debian/tmp -s
dh_installchangelogs -s
dh_link -s
- dh_strip --dbg-package=$(PACKAGE) -s
+ dh_strip --dbg-package=$(PACKAGE)-dbg -s
dh_compress -s
dh_fixperms -s
dh_makeshlibs -s
@@ -107,7 +107,7 @@
dh_installdocs -i
dh_installchangelogs -i
- dh_install --sourcedir=debian/tmp $(dhinstallindepflags)
+ dh_install --sourcedir=debian/tmp $(dhinstallindepflags) --list-missing
dh_link -i
dh_compress -i
dh_fixperms -i
Reply to: