debian/README.source | 73
+++++++++
debian/changelog | 6
debian/control | 4
debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff | 4
debian/patches/05_xmore_fix_segv_without_xprint.diff | 6
debian/patches/series | 4
debian/xsfbs/repack.sh | 32 ++++
debian/xsfbs/xsfbs.sh | 78
----------
8 files changed, 118 insertions(+), 89 deletions(-)
New commits:
commit d707de5dc059aeef50929604f9b153c55b6c80bb
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Jun 10 15:30:59 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 51a0b8c..0c0c6a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.4+1) UNRELEASED; urgency=low
+x11-apps (7.4+1) unstable; urgency=low
[ Brice Goglin ]
* xwd 1.0.2.
@@ -11,7 +11,7 @@ x11-apps (7.4+1) UNRELEASED; urgency=low
* Add README.source, bump Standards-Version to 3.8.1.
* Fix patches to apply with -p1; silences lintian.
- -- Brice Goglin <bgog...@debian.org> Tue, 01 Jul 2008 20:37:59 +0200
+ -- Julien Cristau <jcris...@debian.org> Wed, 10 Jun 2009 15:30:56 +0200
x11-apps (7.3+4) unstable; urgency=low
commit 897f5f5089dc774a1f64a1b5b4c5f3dfda496b74
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Jun 10 15:29:58 2009 +0200
Document that xwd doesn't need xmuu anymore
diff --git a/debian/control b/debian/control
index 169086e..4855682 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libpng12-dev,
# xmag: libxaw7-dev, libxt-dev
# xman: libxaw7-dev, libxt-dev
# xmore: libxaw7-dev, libxt-dev
-# xwd: libxmuu-dev, libx11-dev
+# xwd: libx11-dev
# xwud: libx11-dev
Standards-Version: 3.8.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-apps
commit 0435cd45a3b15eef111f03b0c14daaa400d28316
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Jun 10 15:23:26 2009 +0200
Fix patches to apply with -p1; silences lintian.
diff --git a/debian/changelog b/debian/changelog
index 47f6770..51a0b8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x11-apps (7.4+1) UNRELEASED; urgency=low
* xload 1.0.2
+ drop patch 04_SECURITY_setuid.diff, included upstream.
* Add README.source, bump Standards-Version to 3.8.1.
+ * Fix patches to apply with -p1; silences lintian.
-- Brice Goglin <bgog...@debian.org> Tue, 01 Jul 2008 20:37:59 +0200
diff --git a/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff
b/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff
index f67abc4..1678de2 100644
--- a/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff
+++ b/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff
@@ -12,8 +12,8 @@ Not submitted upstream to XFree86 or X.Org.
Index: xwd/dsimple.c
===================================================================
---- xwd/dsimple.c.orig 2007-02-11 08:15:57.000000000 +0100
-+++ xwd/dsimple.c 2007-02-11 08:16:10.000000000 +0100
+--- a/xwd/dsimple.c.orig 2007-02-11 08:15:57.000000000 +0100
++++ b/xwd/dsimple.c 2007-02-11 08:16:10.000000000 +0100
@@ -188,8 +188,7 @@
if (d == NULL) {
fprintf (stderr, "%s: unable to open display '%s'\n",
diff --git a/debian/patches/05_xmore_fix_segv_without_xprint.diff
b/debian/patches/05_xmore_fix_segv_without_xprint.diff
index 9fd1cd9..ea9afd2 100644
--- a/debian/patches/05_xmore_fix_segv_without_xprint.diff
+++ b/debian/patches/05_xmore_fix_segv_without_xprint.diff
@@ -1,8 +1,8 @@
This patch by Eugene Konev.
-diff -u a/xbase-clients/xmore/xmore.c b/xbase-clients/xmore/xmore.c
---- a/xbase-clients/xmore/xmore.c Sun Apr 30 13:40:29 2006 +0800
-+++ b/app/xbase-clients/xmore/xmore.c Sun Apr 30 13:40:40 2006 +0800
+diff -u a/xmore/xmore.c b/xmore/xmore.c
+--- a/xmore/xmore.c Sun Apr 30 13:40:29 2006 +0800
++++ b/xmore/xmore.c Sun Apr 30 13:40:40 2006 +0800
@@ -150,7 +150,9 @@ static void
static void
printshellDestroyXtProc(Widget w, XtPointer client_data, XtPointer callData)
diff --git a/debian/patches/series b/debian/patches/series
index 67ee9ed..7a16eb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
-01_xwd_do_not_spew_usage_on_connection_error.diff -p0
+01_xwd_do_not_spew_usage_on_connection_error.diff
#02_xedit_manpage_typos.diff
03_xconsole_implicit_pointer_conversion.diff
-05_xmore_fix_segv_without_xprint.diff -p2
+05_xmore_fix_segv_without_xprint.diff
06_xclock_geometry.diff
commit 9eb4742668b0a2ebfcd8280ff63f6b75327f2474
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Jun 10 15:08:27 2009 +0200
Bump Standards-Version
diff --git a/debian/changelog b/debian/changelog
index 4fbcd35..47f6770 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x11-apps (7.4+1) UNRELEASED; urgency=low
the apps in parallel. Install is still sequential, at least for now.
* xload 1.0.2
+ drop patch 04_SECURITY_setuid.diff, included upstream.
+ * Add README.source, bump Standards-Version to 3.8.1.
-- Brice Goglin <bgog...@debian.org> Tue, 01 Jul 2008 20:37:59 +0200
diff --git a/debian/control b/debian/control
index 1310492..169086e 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libpng12-dev,
# xmore: libxaw7-dev, libxt-dev
# xwd: libxmuu-dev, libx11-dev
# xwud: libx11-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-apps
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-apps.git
commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau <jcris...@debian.org>
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 <jcris...@debian.org>
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 <dnusi...@debian.org>
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 <jcris...@debian.org>
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 <jcris...@debian.org>
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 <jcris...@debian.org>
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
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
