debian/README.source | 73 +++++++++++++++++++++++ debian/changelog | 14 ++++ debian/control | 6 - debian/fonts.alias | 50 ++++++++-------- debian/patches/01_cyrillic_fonts_aliases.diff | 81 -------------------------- debian/patches/series | 1 debian/rules | 11 +-- debian/xsfbs/repack.sh | 32 ++++++++++ debian/xsfbs/xsfbs.mk | 29 +++------ debian/xsfbs/xsfbs.sh | 78 ------------------------- 10 files changed, 164 insertions(+), 211 deletions(-)
New commits: commit cd85904bc8095bb4021e48d4642c71fd5cc290c0 Author: Brice Goglin <[email protected]> Date: Sun Jul 26 11:47:51 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index cdd2771..7954a6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xfonts-cyrillic (1:1.0.0-7) UNRELEASED; urgency=low +xfonts-cyrillic (1:1.0.0-7) unstable; urgency=low * Add README.source, bump Standards-Version to 3.8.2. * Store fonts.alias in the debian/ directory instead of @@ -10,7 +10,7 @@ xfonts-cyrillic (1:1.0.0-7) UNRELEASED; urgency=low * Remove obsolete build-deps on pkg-config and xutils. * Move package to the 'fonts' section. - -- Brice Goglin <[email protected]> Sun, 26 Jul 2009 11:47:15 +0200 + -- Brice Goglin <[email protected]> Sun, 26 Jul 2009 11:47:46 +0200 xfonts-cyrillic (1:1.0.0-6) unstable; urgency=low commit fa5f0bf02c5ef7060f2cf3dd5f249f83acdd7070 Author: Brice Goglin <[email protected]> Date: Sun Jul 26 11:47:44 2009 +0200 Move package to the 'fonts' section diff --git a/debian/changelog b/debian/changelog index f52b3ef..cdd2771 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ xfonts-cyrillic (1:1.0.0-7) UNRELEASED; urgency=low * Update DEB_BUILD_OPTIONS parsing to handle space-separated values and parallel=%. * Remove obsolete build-deps on pkg-config and xutils. + * Move package to the 'fonts' section. - -- Brice Goglin <[email protected]> Sun, 26 Jul 2009 11:45:43 +0200 + -- Brice Goglin <[email protected]> Sun, 26 Jul 2009 11:47:15 +0200 xfonts-cyrillic (1:1.0.0-6) unstable; urgency=low diff --git a/debian/control b/debian/control index a756d9b..a6c9468 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: xfonts-cyrillic -Section: x11 +Section: fonts Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]>, Julien Cristau <[email protected]>, Brice Goglin <[email protected]> commit b743ca0c7071b5024cb5c63de0fe1b1e6ced0ea7 Author: Brice Goglin <[email protected]> Date: Sun Jul 26 11:46:21 2009 +0200 Remove obsolete build-deps on pkg-config and xutils diff --git a/debian/changelog b/debian/changelog index 80c1599..f52b3ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ xfonts-cyrillic (1:1.0.0-7) UNRELEASED; urgency=low + Remove quilt from Build-Depends. * Update DEB_BUILD_OPTIONS parsing to handle space-separated values and parallel=%. + * Remove obsolete build-deps on pkg-config and xutils. - -- Brice Goglin <[email protected]> Sun, 26 Jul 2009 11:43:32 +0200 + -- Brice Goglin <[email protected]> Sun, 26 Jul 2009 11:45:43 +0200 xfonts-cyrillic (1:1.0.0-6) unstable; urgency=low diff --git a/debian/control b/debian/control index 9f8ef2a..a756d9b 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]>, Julien Cristau <[email protected]>, Brice Goglin <[email protected]> -Build-Depends: debhelper (>= 5.0.31), pkg-config, xutils, xfonts-utils +Build-Depends: debhelper (>= 5.0.31), xfonts-utils Standards-Version: 3.8.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-cyrillic Vcs-Browser: http://git.debian.org/?p=pkg-xorg/font/xfonts-cyrillic.git commit 11ad3111f4bbeb9232e5573de1f9ad2234736cbd Author: Brice Goglin <[email protected]> Date: Sun Jul 26 11:43:49 2009 +0200 Handle space-separated values and parallel=%. diff --git a/debian/changelog b/debian/changelog index 5b92472..80c1599 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ xfonts-cyrillic (1:1.0.0-7) UNRELEASED; urgency=low using 046_fix_cyrillic_font_aliases.diff to add it later, closes: #538672. + Remove quilt from Build-Depends. + * Update DEB_BUILD_OPTIONS parsing to handle space-separated values and + parallel=%. - -- Brice Goglin <[email protected]> Sun, 26 Jul 2009 11:30:56 +0200 + -- Brice Goglin <[email protected]> Sun, 26 Jul 2009 11:43:32 +0200 xfonts-cyrillic (1:1.0.0-6) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 2598739..b101825 100755 --- a/debian/rules +++ b/debian/rules @@ -17,13 +17,14 @@ include debian/xsfbs/xsfbs.mk SUBDIRS=font-cronyx-cyrillic-X11R7.0-1.0.0 font-misc-cyrillic-X11R7.0-1.0.0 font-screen-cyrillic-X11R7.0-1.0.0 font-winitzki-cyrillic-X11R7.0-1.0.0 CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) endif DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) commit 6d583e5fe4ee4f4959fd9dad458258a6455b4589 Author: Brice Goglin <[email protected]> Date: Sun Jul 26 11:32:05 2009 +0200 Store fonts.alias in the debian/ directory directly diff --git a/debian/changelog b/debian/changelog index 792d160..5b92472 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ xfonts-cyrillic (1:1.0.0-7) UNRELEASED; urgency=low * Add README.source, bump Standards-Version to 3.8.2. + * Store fonts.alias in the debian/ directory instead of + using 046_fix_cyrillic_font_aliases.diff to add it later, + closes: #538672. + + Remove quilt from Build-Depends. - -- Brice Goglin <[email protected]> Sun, 26 Jul 2009 11:23:50 +0200 + -- Brice Goglin <[email protected]> Sun, 26 Jul 2009 11:30:56 +0200 xfonts-cyrillic (1:1.0.0-6) unstable; urgency=low diff --git a/debian/control b/debian/control index 8ce6a71..9f8ef2a 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]>, Julien Cristau <[email protected]>, Brice Goglin <[email protected]> -Build-Depends: debhelper (>= 5.0.31), pkg-config, xutils, xfonts-utils, quilt +Build-Depends: debhelper (>= 5.0.31), pkg-config, xutils, xfonts-utils Standards-Version: 3.8.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-cyrillic Vcs-Browser: http://git.debian.org/?p=pkg-xorg/font/xfonts-cyrillic.git diff --git a/debian/fonts.alias b/debian/fonts.alias index f7d42df..496000c 100644 --- a/debian/fonts.alias +++ b/debian/fonts.alias @@ -9,31 +9,31 @@ ! ! $XFree86$ ! -fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r -variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-koi8-r -5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r -6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r -6x10 -cronyx-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r -6x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r -6x13bold -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-koi8-r -7x14 -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r -7x14b -misc-fixed-bold-r-normal--14-130-75-75-c-70-koi8-r -8x13 -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r -8x16 -misc-fixed-medium-r-normal--16-160-75-75-c-80-koi8-r -8x16bold -misc-fixed-bold-r-normal--16-160-75-75-c-80-koi8-r -9x15 -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r -9x15bold -misc-fixed-bold-r-normal--15-140-75-75-c-90-koi8-r -9x18 -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r -9x18bold -misc-fixed-bold-r-normal--18-120-100-100-c-90-koi8-r -10x16bold -cronyx-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r -10x20 -cronyx-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r -12x24 -misc-fixed-medium-r-normal--24-170-100-100-c-120-koi8-r -12x24bold -misc-fixed-bold-r-normal--24-170-100-100-c-120-koi8-r -nil2 -cronyx-nil-medium-r-normal--2-20-75-75-c-10-koi8-r +fixed-cyrillic -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r +variable-cyrillic -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-koi8-r +5x8-cyrillic -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r +6x9-cyrillic -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r +6x10-cyrillic -cronyx-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r +6x13-cyrillic -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r +6x13bold-cyrillic -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-koi8-r +7x14-cyrillic -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r +7x14b-cyrillic -misc-fixed-bold-r-normal--14-130-75-75-c-70-koi8-r +8x13-cyrillic -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r +8x16-cyrillic -misc-fixed-medium-r-normal--16-160-75-75-c-80-koi8-r +8x16bold-cyrillic -misc-fixed-bold-r-normal--16-160-75-75-c-80-koi8-r +9x15-cyrillic -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r +9x15bold-cyrillic -misc-fixed-bold-r-normal--15-140-75-75-c-90-koi8-r +9x18-cyrillic -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r +9x18bold-cyrillic -misc-fixed-bold-r-normal--18-120-100-100-c-90-koi8-r +10x16bold-cyrillic -cronyx-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r +10x20-cyrillic -cronyx-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r +12x24-cyrillic -misc-fixed-medium-r-normal--24-170-100-100-c-120-koi8-r +12x24bold-cyrillic -misc-fixed-bold-r-normal--24-170-100-100-c-120-koi8-r +nil2-cyrillic -cronyx-nil-medium-r-normal--2-20-75-75-c-10-koi8-r koi-fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r koi-variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-koi8-r -koi5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r -koi6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r +koi5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r +koi6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r koi6x10 -cronyx-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r koi6x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r koi6x13bold -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-koi8-r @@ -51,5 +51,5 @@ koi10x20 -cronyx-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r koi12x24 -misc-fixed-medium-r-normal--24-170-100-100-c-120-koi8-r koi12x24bold -misc-fixed-bold-r-normal--24-170-100-100-c-120-koi8-r koinil2 -cronyx-nil-medium-r-normal--2-20-75-75-c-10-koi8-r -screen8x16 -screen-fixed-medium-r-normal--16-120-100-100-c-80-koi8-r -screen8x16b -screen-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r +screen8x16-cyrillic -screen-fixed-medium-r-normal--16-120-100-100-c-80-koi8-r +screen8x16b-cyrillic -screen-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r diff --git a/debian/patches/01_cyrillic_fonts_aliases.diff b/debian/patches/01_cyrillic_fonts_aliases.diff deleted file mode 100644 index dd08e81..0000000 --- a/debian/patches/01_cyrillic_fonts_aliases.diff +++ /dev/null @@ -1,81 +0,0 @@ -$Id: 046_fix_cyrillic_font_aliases.diff 486 2005-08-03 04:51:11Z dnusinow $ - -Prevent font alias collisions between KOI8-R encodings and the stock ones. - -This patch by Branden Robinson. - -Not submitted upstream. Not sure they'd like it. - -Yes, I know this is crack, patching something in the debian directory, but -since I just ripped the original fonts.alias from an upstream tarball -anyway, we may as well treat it like it's outside of the debian dir. -Ideally upstream will just accept this and we won't have to do this crap - - David - -Index: a/debian/fonts.alias -=================================================================== ---- a/debian/fonts.alias.orig 2005-08-02 22:00:38.000000000 -0400 -+++ b/debian/fonts.alias 2005-08-02 23:45:30.000000000 -0400 -@@ -9,31 +9,31 @@ - ! - ! $XFree86$ - ! --fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r --variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-koi8-r --5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r --6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r --6x10 -cronyx-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r --6x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r --6x13bold -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-koi8-r --7x14 -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r --7x14b -misc-fixed-bold-r-normal--14-130-75-75-c-70-koi8-r --8x13 -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r --8x16 -misc-fixed-medium-r-normal--16-160-75-75-c-80-koi8-r --8x16bold -misc-fixed-bold-r-normal--16-160-75-75-c-80-koi8-r --9x15 -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r --9x15bold -misc-fixed-bold-r-normal--15-140-75-75-c-90-koi8-r --9x18 -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r --9x18bold -misc-fixed-bold-r-normal--18-120-100-100-c-90-koi8-r --10x16bold -cronyx-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r --10x20 -cronyx-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r --12x24 -misc-fixed-medium-r-normal--24-170-100-100-c-120-koi8-r --12x24bold -misc-fixed-bold-r-normal--24-170-100-100-c-120-koi8-r --nil2 -cronyx-nil-medium-r-normal--2-20-75-75-c-10-koi8-r -+fixed-cyrillic -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r -+variable-cyrillic -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-koi8-r -+5x8-cyrillic -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r -+6x9-cyrillic -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r -+6x10-cyrillic -cronyx-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r -+6x13-cyrillic -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r -+6x13bold-cyrillic -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-koi8-r -+7x14-cyrillic -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r -+7x14b-cyrillic -misc-fixed-bold-r-normal--14-130-75-75-c-70-koi8-r -+8x13-cyrillic -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r -+8x16-cyrillic -misc-fixed-medium-r-normal--16-160-75-75-c-80-koi8-r -+8x16bold-cyrillic -misc-fixed-bold-r-normal--16-160-75-75-c-80-koi8-r -+9x15-cyrillic -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r -+9x15bold-cyrillic -misc-fixed-bold-r-normal--15-140-75-75-c-90-koi8-r -+9x18-cyrillic -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r -+9x18bold-cyrillic -misc-fixed-bold-r-normal--18-120-100-100-c-90-koi8-r -+10x16bold-cyrillic -cronyx-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r -+10x20-cyrillic -cronyx-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r -+12x24-cyrillic -misc-fixed-medium-r-normal--24-170-100-100-c-120-koi8-r -+12x24bold-cyrillic -misc-fixed-bold-r-normal--24-170-100-100-c-120-koi8-r -+nil2-cyrillic -cronyx-nil-medium-r-normal--2-20-75-75-c-10-koi8-r - koi-fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r - koi-variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-koi8-r --koi5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r --koi6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r -+koi5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r -+koi6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r - koi6x10 -cronyx-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r - koi6x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r - koi6x13bold -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-koi8-r -@@ -51,5 +51,5 @@ - koi12x24 -misc-fixed-medium-r-normal--24-170-100-100-c-120-koi8-r - koi12x24bold -misc-fixed-bold-r-normal--24-170-100-100-c-120-koi8-r - koinil2 -cronyx-nil-medium-r-normal--2-20-75-75-c-10-koi8-r --screen8x16 -screen-fixed-medium-r-normal--16-120-100-100-c-80-koi8-r --screen8x16b -screen-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r -+screen8x16-cyrillic -screen-fixed-medium-r-normal--16-120-100-100-c-80-koi8-r -+screen8x16b-cyrillic -screen-fixed-bold-r-normal--16-120-100-100-c-80-koi8-r diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index dd2e87f..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_cyrillic_fonts_aliases.diff diff --git a/debian/rules b/debian/rules index 773d2ea..2598739 100755 --- a/debian/rules +++ b/debian/rules @@ -37,7 +37,7 @@ endif build: build-stamp -build-stamp: $(STAMP_DIR)/patch +build-stamp: dh_testdir for FILE in $(SUBDIRS); do \ echo "$$FILE" ; \ @@ -52,7 +52,7 @@ build-stamp: $(STAMP_DIR)/patch touch build-stamp -clean: xsfclean +clean: dh_testdir dh_testroot rm -f build-stamp commit 77a45bd87a1bafa2e12a4066b339270dd8223187 Author: Brice Goglin <[email protected]> Date: Sun Jul 26 11:27:38 2009 +0200 Fix rules dependencies diff --git a/debian/rules b/debian/rules index ebba171..773d2ea 100755 --- a/debian/rules +++ b/debian/rules @@ -36,8 +36,8 @@ else endif -build: genscripts patch build-stamp -build-stamp: +build: build-stamp +build-stamp: $(STAMP_DIR)/patch dh_testdir for FILE in $(SUBDIRS); do \ echo "$$FILE" ; \ commit 0daff16b21dd86a97ef7abb6ec8578f8006fd264 Author: Brice Goglin <[email protected]> Date: Sun Jul 26 11:24:30 2009 +0200 Bump Standards-Version to 3.8.2 now that we have README.source diff --git a/debian/changelog b/debian/changelog index 0df1a3d..792d160 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xfonts-cyrillic (1:1.0.0-7) UNRELEASED; urgency=low + + * Add README.source, bump Standards-Version to 3.8.2. + + -- Brice Goglin <[email protected]> Sun, 26 Jul 2009 11:23:50 +0200 + xfonts-cyrillic (1:1.0.0-6) unstable; urgency=low * Update patches to not use -p0, closes: #485272. diff --git a/debian/control b/debian/control index 5f390f9..8ce6a71 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]>, Julien Cristau <[email protected]>, Brice Goglin <[email protected]> Build-Depends: debhelper (>= 5.0.31), pkg-config, xutils, xfonts-utils, quilt -Standards-Version: 3.7.3 +Standards-Version: 3.8.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-cyrillic Vcs-Browser: http://git.debian.org/?p=pkg-xorg/font/xfonts-cyrillic.git commit 8f72294ada477f003888b6776883c1dd98289f3f Author: Julien Cristau <[email protected]> Date: Wed Jun 3 03:37:37 2009 +0200 Kill custom readlink function This was needed for very, very old versions of debianutils. Closes: #498890 diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 197eb74..781826f 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -303,16 +303,6 @@ EOF fi } -# we require a readlink command or shell function -if ! which readlink > /dev/null 2>&1; then - message "The readlink command was not found. Please install version" \ - "1.13.1 or later of the debianutils package." - readlink () { - # returns what symlink in $1 actually points to - perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1" - } -fi - check_symlink () { # syntax: check_symlink symlink # commit 7deebf983f53c505bc25171ab77fdc408f250a6e Author: Julien Cristau <[email protected]> Date: Tue May 26 15:58:19 2009 +0200 xsfbs: don't run dpkg --print-installation-architecture This is deprecated in new dpkg, and had no users anyway. diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 8840ff9..197eb74 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -57,8 +57,6 @@ EOF exit $SHELL_LIB_USAGE_ERROR fi -ARCHITECTURE="$(dpkg --print-installation-architecture)" - if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then RECONFIGURE="true" else commit 4178d948cd66a938222d0d7c6353ee8d60229e40 Author: David Nusinow <[email protected]> Date: Mon May 25 20:08:50 2009 -0400 Add README.source diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..34ab4bf --- /dev/null +++ b/debian/README.source @@ -0,0 +1,73 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. + +quilt is actually invoked by the Debian X packaging through a larger +set of scripts called XSFBS. XSFBS brings some other X specific +features such as managing dependencies and conflicts due to the video +and input driver ABIs. +XSFBS itself is maintained in a separate repository at + git://git.debian.org/pkg-xorg/xsfbs.git +and it is pulled inside the other Debian X repositories when needed. + +The XSFBS patching system requires a build dependency on quilt. Also +a dependency on $(STAMP_DIR)/patch has to be added to debian/rules +so that the XSFBS patching occurs before the actual build. So the +very first target of the build (likely the one running autoreconf) +should depend on $(STAMP_DIR)/patch. It should also not depend on +anything so that parallel builds are correctly supported (nothing +should probably run while patching is being done). And finally, the +clean target should depend on the xsfclean target so that patches +are unapplied on clean. + +When the upstream sources contain some DFSG-nonfree files, they are +listed in text files in debian/prune/ in the "debian-*" branch of +the Debian repository. XSFBS' scripts then take care of removing +these listed files during the build so as to generate a modified +DFSG-free .orig.tar.gz tarball. commit fa6396d6bf68b9a0154089146287245f9ad60a1e Author: Julien Cristau <[email protected]> Date: Wed Feb 25 21:31:03 2009 +0100 xsfbs: repack.sh needs to be executable diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh old mode 100644 new mode 100755 commit 2ed171f9f390de4e97141c0016d3ba615e8c943e Author: Julien Cristau <[email protected]> Date: Tue Feb 17 17:20:42 2009 +0100 xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so libx11's postinst was the only post-sarge user, and it's gone now. diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 72efa95..8840ff9 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -719,72 +719,6 @@ run () { fi } -register_x_lib_dir_with_ld_so () { - # syntax: register_x_lib_dir_with_ld_so - # - # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared - # libraries. - # - # Call this function from the postinst script of a package that places a - # shared library in /usr/X11R6/lib, before invoking ldconfig. - - local dir ldsoconf - - dir="/usr/X11R6/lib" - ldsoconf="/etc/ld.so.conf" - - # is the line not already present? - if ! fgrep -qsx "$dir" "$ldsoconf"; then - observe "adding $dir directory to $ldsoconf" - echo "$dir" >> "$ldsoconf" - fi -} - -deregister_x_lib_dir_with_ld_so () { - # syntax: deregister_x_lib_dir_with_ld_so - # - # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared - # libraries, if and only if no shared libaries remain there. - # - # Call this function from the postrm script of a package that places a shared - # library in /usr/X11R6/lib, in the event "$1" is "remove", and before - # invoking ldconfig. - - local dir ldsoconf fgrep_status cmp_status - - dir="/usr/X11R6/lib" - ldsoconf="/etc/ld.so.conf" - - # is the line present? - if fgrep -qsx "$dir" "$ldsoconf"; then - # are there any shared objects in the directory? - if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then - # glob expansion produced nothing, so no shared libraries are present - observe "removing $dir directory from $ldsoconf" - # rewrite the file (very carefully) - set +e - fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp" - fgrep_status=$? - set -e - case $fgrep_status in - 0|1) ;; # we don't actually care if any lines matched or not - *) die "error reading \"$ldsoconf\"; fgrep exited with status" \ - "$fgrep_status" ;; - esac - set +e - cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf" - cmp_status=$? - set -e - case $cmp_status in - 0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical - 1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ - *) die "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\";" \ - "cmp exited with status $cmp_status" ;; - esac - fi - fi -} - make_symlink_sane () { # syntax: make_symlink_sane symlink target # commit 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d Author: Julien Cristau <[email protected]> Date: Sun Feb 1 01:31:31 2009 +0100 xsfbs: add a repack script for uscan This will automatically prune upstream tarballs diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh new file mode 100644 index 0000000..5935cc9 --- /dev/null +++ b/debian/xsfbs/repack.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +set -e + +if ! [ -d debian/prune ]; then + exit 0 +fi + +if [ "x$1" != x--upstream-version ]; then + exit 1 +fi + +version="$2" +filename="$3" + +if [ -z "$version" ] || ! [ -f "$filename" ]; then + exit 1 +fi + +dir="$(pwd)" +tempdir="$(mktemp -d)" + +cd "$tempdir" +tar xf "$dir/$filename" +cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done + +tar czf "$dir/$filename" * +cd "$dir" +rm -rf "$tempdir" +echo "Done pruning upstream tarball" + +exit 0 commit 86e7669f5d912824e341ea487a6257ec5433eb90 Author: Julien Cristau <[email protected]> Date: Thu Jul 17 15:44:45 2008 +0200 xsfbs.mk: make 'log' a separate target 'prepare' runs genscripts, and we don't want that in unpatch, so create stampdir/log in a separate target, and make unpatch depend on that instead of prepare. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 984e81c..f0f8953 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts - mkdir -p $(STAMP_DIR)/log +$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts >$@ +.PHONY: log +stampdir_targets+=log +log: $(STAMP_DIR)/log +$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir + mkdir -p $(STAMP_DIR)/log + # Apply all patches to the upstream source. .PHONY: patch stampdir_targets+=patch @@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/prepare +unpatch: $(STAMP_DIR)/log rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit 50619e730fcaf422ffa4451468520526b2a830b8 Author: Julien Cristau <[email protected]> Date: Wed Jul 16 18:42:14 2008 +0200 xsfbs.mk: update the list of releases, and drop some unused code we haven't had a separate source tree since modularization. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 2350f80..984e81c 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$logn...@$$(cat /etc/mailname 2>/dev/null))}}) # Find out if this is an official build; an official build has nothing but -# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the +# digits, dots, and/or the codename of a release in the Debian part of the # version number. Anything else indicates an unofficial build. -OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) +OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) # Set up parameters for the Debian build environment. @@ -69,16 +69,6 @@ endif # $(STAMP_DIR) houses stamp files for complex targets. STAMP_DIR:=stampdir -# $(SOURCE_DIR) houses one or more source trees. -SOURCE_DIR:=build-tree - -# $(SOURCE_TREE) is the location of the source tree to be compiled. If there -# is more than one, others are found using this name plus a suffix to indicate -# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The -# "setup" target is responsible for creating such trees. -#SOURCE_TREE:=$(SOURCE_DIR)/xc -#FIXME We need to define this in our debian/rules file - # $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place # their files. DEBTREEDIR:=$(CURDIR)/debian/tmp commit 6c29758eb1a2798f6b77516b7a75dc399769d217 Author: Julien Cristau <[email protected]> Date: Wed Jul 16 18:22:01 2008 +0200 xsfbs.mk: more parallel make fixing diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index fa2431e..2350f80 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -119,8 +119,8 @@ $(STAMP_DIR)/stampdir: # Set up the package build directory as quilt expects to find it. .PHONY: prepare stampdir_targets+=prepare -prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir +prepare: $(STAMP_DIR)/prepare +$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts mkdir -p $(STAMP_DIR)/log >$@ commit 78b3958b14a5298165d8500d711342be1b7b6463 Author: Julien Cristau <[email protected]> Date: Wed Jul 16 18:22:01 2008 +0200 xsfbs.mk: fix the prepare target for parallel make diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index b871b3b..fa2431e 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -119,11 +119,9 @@ $(STAMP_DIR)/stampdir: # Set up the package build directory as quilt expects to find it. .PHONY: prepare stampdir_targets+=prepare -prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log +prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir - if [ ! -e $(STAMP_DIR)/log ]; then \ - mkdir $(STAMP_DIR)/log; \ - fi; \ + mkdir -p $(STAMP_DIR)/log >$@ # Apply all patches to the upstream source. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
