debian/README.source | 55 ++++++++++++++++++++++++++++++++++++++++ debian/changelog | 11 ++++++++ debian/control | 9 +++--- debian/patches/no_eglfbdev.diff | 23 ++++++++++++++++ debian/patches/series | 1 debian/rules | 2 - 6 files changed, 96 insertions(+), 5 deletions(-)
New commits: commit 26ae95305dd0d4699a31dfc1e8882293ca057bea Author: Sven Joachim <[email protected]> Date: Sun Sep 1 20:09:32 2013 +0200 New patch no_eglfbdev.diff Don't build the eglfbdev demo program which does not compile on non-Linux architectures and is not installed anyway. This requires a quilt build dependency, so also install a README.source file copied from libdrm. The symlink dance mentioned there is actually necessary when building from git. diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..f9bb7c6 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,55 @@ +------------------------------------------------------ +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. + +While building from git, dpkg-source can complain about symlinks vs. +normal files mismatches. To work around this issue, before uploading, +and without committing: + + find -type l | while read dest; do src=$(readlink -f $dest); rm $dest; cp $src $dest; done + +------------------------------------ +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 using 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. diff --git a/debian/changelog b/debian/changelog index b53ebb4..e54bad7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ mesa-demos (8.1.0-2) UNRELEASED; urgency=low * Don't build mesa-utils-extra on hurd, libegl1-mesa-dev is not available there. + * New patch no_eglfbdev.diff: don't build the eglfbdev demo program + which does not compile on non-Linux architectures and is not + installed anyway. + - Add a build dependency on quilt and a README.Source boilerplate. -- Sven Joachim <[email protected]> Sun, 01 Sep 2013 19:31:58 +0200 diff --git a/debian/control b/debian/control index 5427584..d6f3b40 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Debian X Strike Force <[email protected]> Uploaders: Maarten Lankhorst <[email protected]> Standards-Version: 3.9.4 Build-Depends: debhelper (>= 9), + quilt, pkg-config, autoconf, automake, diff --git a/debian/patches/no_eglfbdev.diff b/debian/patches/no_eglfbdev.diff new file mode 100644 index 0000000..8118994 --- /dev/null +++ b/debian/patches/no_eglfbdev.diff @@ -0,0 +1,23 @@ +commit bd22f7d5cb176f68424d7d2463df34d19ffaf09c +Author: Sven Joachim <[email protected]> +Date: Sun Sep 1 19:38:48 2013 +0200 + + Don't build the eglfbdev demo + + It does not compile on non-Linux architectures and is not installed + anyway. + +--- + src/egl/opengles1/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +--- a/src/egl/opengles1/Makefile.am ++++ b/src/egl/opengles1/Makefile.am +@@ -43,7 +43,6 @@ noinst_PROGRAMS = \ + clear \ + drawtex_screen \ + drawtex_x11 \ +- eglfbdev \ + es1_info \ + gears_screen \ + gears_x11 \ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..833cff7 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +no_eglfbdev.diff diff --git a/debian/rules b/debian/rules index 8f1c5bc..f49aedf 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f %: - dh $@ --with=autoreconf + dh $@ --with=autoreconf,quilt override_dh_auto_configure: dh_auto_configure -- --disable-silent-rules commit 2761fcbd8a8cf272433215fbbec0866011fdd394 Author: Sven Joachim <[email protected]> Date: Sun Sep 1 19:36:02 2013 +0200 Only build mesa-utils-extra on Linux and kFreeBSD architectures There is no libegl1-mesa-dev on hurd-i386, making the package unbuildable. diff --git a/debian/changelog b/debian/changelog index fa84ff9..b53ebb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mesa-demos (8.1.0-2) UNRELEASED; urgency=low + + * Don't build mesa-utils-extra on hurd, libegl1-mesa-dev is not + available there. + + -- Sven Joachim <[email protected]> Sun, 01 Sep 2013 19:31:58 +0200 + mesa-demos (8.1.0-1) unstable; urgency=low [ Sven Joachim ] diff --git a/debian/control b/debian/control index ec72e8f..5427584 100644 --- a/debian/control +++ b/debian/control @@ -14,9 +14,9 @@ Build-Depends: debhelper (>= 9), libgl1-mesa-dev, libglew-dev, libglu1-mesa-dev, - libegl1-mesa-dev, - libgles1-mesa-dev, - libgles2-mesa-dev, + libegl1-mesa-dev [linux-any kfreebsd-any], + libgles1-mesa-dev [linux-any kfreebsd-any], + libgles2-mesa-dev [linux-any kfreebsd-any], Homepage: http://mesa3d.org/ Vcs-Git: git://git.debian.org/git/pkg-xorg/app/mesa-demos.git Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/mesa-demos.git @@ -35,7 +35,7 @@ Description: Miscellaneous Mesa GL utilities Package: mesa-utils-extra Section: x11 Priority: optional -Architecture: any +Architecture: linux-any kfreebsd-any Depends: ${shlibs:Depends}, ${misc:Depends}, -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
