libxinerama: Changes to 'debian-unstable'
debian/changelog | 15 +++
debian/compat | 2
debian/control | 8 +-
debian/rules | 4 -
debian/xsfbs/xsfbs-autoreconf.mk | 150 ---------------------------------------
debian/xsfbs/xsfbs.mk | 4 -
6 files changed, 23 insertions(+), 160 deletions(-)
New commits:
commit 5f2bc8d63ca0ccc67f5d3f7e2d3c310d5176fd38
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 18 21:26:12 2008 +0200
libxinerama1{,-dbg} don't need to depend on x11-common.
diff --git a/debian/changelog b/debian/changelog
index d50bfa2..8d0fe5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxinerama (2:1.0.3-2) UNRELEASED; urgency=low
+
+ * libxinerama1{,-dbg} don't need to depend on x11-common.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 18 May 2008 21:25:34 +0200
+
libxinerama (2:1.0.3-1) unstable; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index 0f487a5..43fbff6 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxinerama.git
Package: libxinerama1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: X11 Xinerama extension library
libXinerama provides an X Window System client interface to the XINERAMA
extension to the X protocol.
@@ -28,7 +28,7 @@ Package: libxinerama1-dbg
Section: libdevel
Priority: extra
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxinerama1 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxinerama1 (= ${binary:Version})
Description: X11 Xinerama extension library (debug package)
libXinerama provides an X Window System client interface to the XINERAMA
extension to the X protocol.
commit c87ea43906787791a87a659c0a9d6312945ffb32
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 13 03:12:18 2008 +0200
Remove xsfbs-autoreconf.mk
It has never been used, and that doesn't look likely to change.
diff --git a/debian/xsfbs/xsfbs-autoreconf.mk b/debian/xsfbs/xsfbs-autoreconf.mk
deleted file mode 100644
index dce8fc8..0000000
--- a/debian/xsfbs/xsfbs-autoreconf.mk
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/make -f
-# $Id$
-
-# Automagical conversion of autoreconf results into quilt patches.
-
-# Copyright 2006 Eugene Konev
-#
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-# The idea behind this is storing changes produced by autoreconf as a
-# separate patch on quilt stack (on top of stack actually).
-# The only usable target here is 'autoreconf`. Other targets are not
-# supposed to be called directly. DO NOT invoke them, unless you know what
-# you are doing.
-# The autoreconf target will check if files with names in $(RECONF_CHECKFILES)
-# were changed during patching (from upstream version or from previously
-# autoreconfed version) and call actual autoreconfing if they were.
-# The actual autoreconfing target (doautoreconf) WILL FAIL after
-# calling autoreconf and pushing changes into quilt stack by design. It
-# should never be invoked by automatic build process.
-# The proposed use is adding autoreconf into clean's prerequisites before
-# xsfclean like:
-# - clean: xsfclean
-# + clean: autoreconf xsfclean
-# This will ensure it is called when you build package with dpkg-buildpackage.
-
-# This dir will be used for producing diff of autoreconfed tree
-RECONF_DIR := xsfautoreconf
-
-# This files will be checked for changes
-RECONF_CHECKFILES += configure.ac Makefile.am
-
-# This files will not be hardlinked but copied
-RECONF_NOLINKFILES += aclocal.m4
-
-# This files/dirs will be pruned after autoreconf run
-RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~
-
-# Internal target. Never invoke directly.
-stampdir_target+=check.md5sum
-$(STAMP_DIR)/check.md5sum:
- dh_testdir
- $(MAKE) -f debian/rules prepare
- for F in $(RECONF_CHECKFILES); do \
- find . -wholename ./$(STAMP_DIR) -prune -o -name $$F -print | \
- LC_ALL=C sort | xargs --no-run-if-empty md5sum >>$@; \
- done
-
-# Internal target. Never invoke directly.
-$(STAMP_DIR)/clean.md5sum:
- dh_testdir
- $(MAKE) -f debian/rules unpatch
- rm -f $(STAMP_DIR)/check.md5sum
- $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
- mv $(STAMP_DIR)/check.md5sum $@
-
-# Internal target. Never invoke directly.
-debian/patches/patched.md5sum:
- dh_testdir
- [ -f $(STAMP_DIR)/clean.md5sum ] || \
- $(MAKE) -f debian/rules $(STAMP_DIR)/clean.md5sum
-
- $(MAKE) -f debian/rules patch
- rm -f $(STAMP_DIR)/check.md5sum
- $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
- if ! diff $(STAMP_DIR)/clean.md5sum \
- $(STAMP_DIR)/check.md5sum > /dev/null; then \
- $(MAKE) -f debian/rules doautoreconf; \
- else \
- mv $(STAMP_DIR)/check.md5sum $@; \
- fi
-
-# Internal target. Never invoke directly.
-,PHONY: doautoreconf
-doautoreconf: patch
- quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1 || true
- if quilt applied | grep ^autoreconf.diff$$ > /dev/null; then \
- quilt pop -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt rename -p autoreconf.diff autoreconf-old.diff \
- >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt delete autoreconf-old.diff >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- fi
-
- if [ -e $(RECONF_DIR) ]; then \
- echo "ERROR: $(RECONF_DIR) already exists. Cleanup by hand"; \
- exit 1; \
- fi
-
- mkdir -p $(RECONF_DIR)/before
- find . -maxdepth 1 -mindepth 1 ! -wholename ./$(RECONF_DIR) \
- -a ! -wholename ./debian -a ! -wholename ./patches \
- -a ! -wholename ./.pc -a ! -wholename ./$(STAMP_DIR) | \
- xargs -i{} cp -al {} $(RECONF_DIR)/before/
-
- for F in $(RECONF_PRUNEFILES); do \
- find $(RECONF_DIR)/before -name $$F -print | \
- xargs --no-run-if-empty rm -r; \
- done
-
- cp -al $(RECONF_DIR)/before $(RECONF_DIR)/after
-
- for F in $(RECONF_NOLINKFILES); do \
- find . -wholename ./$(RECONF_DIR) -prune -o -wholename ./debian \
- -prune -o -wholename ./$(STAMP_DIR) -prune -o -name $$F \
- -print | \
- xargs --no-run-if-empty -i{} cp --remove-destination {} \
- $(RECONF_DIR)/after/{}; \
- done
-
- cd $(RECONF_DIR)/after && autoreconf -v --install && \
- for F in $(RECONF_PRUNEFILES); do \
- find . -name $$F -print | \
- xargs --no-run-if-empty rm -r; \
- done
-
- cd $(RECONF_DIR) && diff -Nru before after > autoreconf.diff || true
-
- quilt import $(RECONF_DIR)/autoreconf.diff \
- >>$(STAMP_DIR)/log/autoreconf 2>&1
-
- mv $(STAMP_DIR)/check.md5sum debian/patches/patched.md5sum
-
- rm -r $(RECONF_DIR) && rm -f patches/autoreconf-old.diff
-
- @echo
- @echo "****************************************************************"
- @echo " This target is made to fail INTENTIONALLY. It should NEVER "
- @echo " be invoked during automatic builds. "
- @echo
- @echo " This target was invoked because you added/removed/changed "
- @echo " patches which modify either configure.ac or Makefile.am and, "
- @echo " thus, require autoreconf run. And all autoreconfing should "
- @echo " happen before uploading. "
- @echo
- @echo " (See also debian/xsfbs/xsfbs-autoreconf.mk) "
- @echo
- @echo " If you see this message, autoreconfing actually SUCCEEDED, "
- @echo " and your build should finish successfully, when rerun. "
- @echo "****************************************************************"
- @echo
- exit 1;
-
-.PHONY: autoreconf
-autoreconf: debian/patches/patched.md5sum patch $(STAMP_DIR)/check.md5sum
- if ! diff $(STAMP_DIR)/check.md5sum \
- debian/patches/patched.md5sum > /dev/null; then \
- $(MAKE) -f debian/rules doautoreconf; \
- fi
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 51fa145..6582a42 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -307,6 +307,4 @@ else
echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
endif
-include debian/xsfbs/xsfbs-autoreconf.mk
-
# vim:set noet ai sts=8 sw=8 tw=0:
commit bef8b301bf7649b4156bef2dc26ebf9f7f9244ad
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 21 11:53:16 2008 +0100
xsfbs.mk: make 'serverabi' depend on 'install'
See bug#471193, thanks to Bernhard R. Link <brlink@debian.org>
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 4822173..51fa145 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -297,7 +297,7 @@ PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
.PHONY: serverabi
-serverabi:
+serverabi: install
ifeq ($(SERVERMINVERS),)
@echo error: xserver-xorg-dev needs to be installed
@exit 1
commit a82f4587588fcda7238a7ba551dfff85ef50d592
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Aug 26 21:17:43 2006 +0000
* NMU ACK: Closes: #381225. Thanks Pierre!
diff --git a/debian/changelog b/debian/changelog
index 094c5c9..f0cda7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,10 @@ libxinerama (1:1.0.1-5) UNRELEASED; urgency=low
[ Drew Parsons ]
* dbg package has priority extra.
- -- Drew Parsons <dparsons@debian.org> Sat, 19 Aug 2006 22:11:38 +1000
+ [ David Nusinow ]
+ * NMU ACK: Closes: #381225. Thanks Pierre!
+
+ -- David Nusinow <dnusinow@debian.org> Sat, 26 Aug 2006 17:17:25 +0000
libxinerama (1:1.0.1-4.1) unstable; urgency=low
commit 8ca49709cb4545b40ede6f615ddcd455b27cd050
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Aug 26 21:16:24 2006 +0000
Merge MadCoder's NMU to the 7.1 branch so it doesn't get lost. Thanks Pierre
diff --git a/debian/changelog b/debian/changelog
index bb433fe..094c5c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,16 @@ libxinerama (1:1.0.1-5) UNRELEASED; urgency=low
-- Drew Parsons <dparsons@debian.org> Sat, 19 Aug 2006 22:11:38 +1000
+libxinerama (1:1.0.1-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add the missing copyright file (Closes: #381225).
+ * Bump Standards-Version to 3.7.2.
+ * Remove x11-common from libxinerama-dev depends, because it is already
+ present in the Pre-Depends.
+
+ -- Pierre Habouzit <madcoder@debian.org> Sun, 13 Aug 2006 01:29:04 +0200
+
libxinerama (1:1.0.1-4) unstable; urgency=low
* Reorder makeshlib command in rules file so that ldconfig is run
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..2472a37
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,24 @@
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software.
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+ BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ Except as contained in this notice, the name of Digital Equipment Corporation
+ shall not be used in advertising or otherwise to promote the sale, use or other
+ dealings in this Software without prior written authorization from Digital
+ Equipment Corporation.
commit c13c58e644b621413695aabc61348680e86e2f6d
Author: Drew Parsons <dparsons@debian.org>
Date: Sat Aug 19 12:29:06 2006 +0000
All dbg packages in lib should have priority extra,
see http://lists.debian.org/debian-devel/2006/08/msg00737.html
diff --git a/debian/changelog b/debian/changelog
index 28f0c00..bb433fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
libxinerama (1:1.0.1-5) UNRELEASED; urgency=low
+ [ Andres Salomon ]
* Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
idempotency fix.
* Run dh_install w/ --list-missing.
@@ -10,7 +11,10 @@ libxinerama (1:1.0.1-5) UNRELEASED; urgency=low
* Bump debhelper compat to 5.
* Fix dh_strip call to skip the -dbg package.
- -- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 01:21:06 -0400
+ [ Drew Parsons ]
+ * dbg package has priority extra.
+
+ -- Drew Parsons <dparsons@debian.org> Sat, 19 Aug 2006 22:11:38 +1000
libxinerama (1:1.0.1-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0432947..7d0e866 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Description: X11 Xinerama extension library
Package: libxinerama1-dbg
Architecture: any
+Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxinerama1 (= ${Source-Version})
Description: X11 Xinerama extension library (debug package)
libXinerama provides an X Window System client interface to the XINERAMA
commit 1751cf9add044f99d3c5b1472778c6b9736fc7d2
Author: Branden Robinson <branden@debian.org>
Date: Tue Aug 1 15:29:08 2006 +0000
Use only the major version, minor version, and major patch number
components of the Policy Manual revision in Standards-Version, because "the
minor patch level will be changed when only cosmetic, typographical or
other edits are made which neither change the meaning of the document nor
affect the contents of packages". See Policy Manual §5.6.11.
(The real reason for this commit, as with r2615, is to test tweaks to the
repository's commit-email.pl script.)
diff --git a/debian/control b/debian/control
index 40ea43b..0432947 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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 (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxext-dev (>= 1:0.99.1-1), x11proto-xinerama-dev, pkg-config
-Standards-Version: 3.7.2.0
+Standards-Version: 3.7.2
Package: libxinerama1
Architecture: any
commit 505620af00fd5a57620585b14d0d73432686d323
Author: Branden Robinson <branden@debian.org>
Date: Tue Aug 1 14:10:51 2006 +0000
Whitespace police.
(The real reason for this commit is to test tweaks to the repository's
commit-email.pl script.)
diff --git a/debian/changelog b/debian/changelog
index 5d7ece8..28f0c00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ libxinerama (1:1.0.1-5) UNRELEASED; urgency=low
* Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
idempotency fix.
- * Run dh_install w/ --list-missing.
+ * Run dh_install w/ --list-missing.
* Drop duplicate x11-common dep in -dev package.
* Bump standards version to 3.7.2.0.
* Version x11-common pre-dep in -dev package to 1:7.0.0 to match
commit 963fabcb4331bfc32768685ef36e67df6de92f30
Author: Andres Salomon <dilinger@debian.org>
Date: Wed Jul 26 04:05:33 2006 +0000
* Drop duplicate x11-common dep in -dev package.
* Bump standards version to 3.7.2.0.
* Version x11-common pre-dep in -dev package to 1:7.0.0 to match
the rest of Debian.
* Bump debhelper compat to 5.
* Fix dh_strip call to skip the -dbg package.
diff --git a/debian/changelog b/debian/changelog
index 4e7c099..5d7ece8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,12 @@ libxinerama (1:1.0.1-5) UNRELEASED; urgency=low
* Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
idempotency fix.
* Run dh_install w/ --list-missing.
+ * Drop duplicate x11-common dep in -dev package.
+ * Bump standards version to 3.7.2.0.
+ * Version x11-common pre-dep in -dev package to 1:7.0.0 to match
+ the rest of Debian.
+ * Bump debhelper compat to 5.
+ * Fix dh_strip call to skip the -dbg package.
-- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 01:21:06 -0400
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..40ea43b
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,68 @@
+Source: libxinerama
+Section: x11
+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 (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxext-dev (>= 1:0.99.1-1), x11proto-xinerama-dev, pkg-config
+Standards-Version: 3.7.2.0
+
+Package: libxinerama1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
+Description: X11 Xinerama extension library
+ libXinerama provides an X Window System client interface to the XINERAMA
+ extension to the X protocol.
+ .
+ The Xinerama (also known as panoramiX) extension allows for multiple screens
+ attached to a single display to be treated as belonging together, and to give
+ desktop applications a better idea of the monitor layout.
+ .
+ More information about X.Org can be found at:
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This module can be found as the module 'lib/Xinerama' at
+ :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+
+Package: libxinerama1-dbg
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxinerama1 (= ${Source-Version})
+Description: X11 Xinerama extension library (debug package)
+ libXinerama provides an X Window System client interface to the XINERAMA
+ extension to the X protocol.
+ .
+ The Xinerama (also known as panoramiX) extension allows for multiple screens
+ attached to a single display to be treated as belonging together, and to give
+ desktop applications a better idea of the monitor layout.
+ .
+ This package contains the debug versions of the library found in
+ libxinerama1. Non-developers likely have little use for this package.
+ .
+ More information about X.Org can be found at:
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This module can be found as the module 'lib/Xinerama' at
+ :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+
+Package: libxinerama-dev
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxinerama1 (= ${Source-Version}), libx11-dev, libxext-dev, x11proto-xinerama-dev
+Pre-Depends: x11-common (>= 1:7.0.0)
+Description: X11 Xinerama extension library (development headers)
+ libXinerama provides an X Window System client interface to the XINERAMA
+ extension to the X protocol.
+ .
+ The Xinerama (also known as panoramiX) extension allows for multiple screens
+ attached to a single display to be treated as belonging together, and to give
+ desktop applications a better idea of the monitor layout.
+ .
+ This package contains the development headers for the library found in
+ libxinerama1. Non-developers likely have little use for this package.
+ .
+ More information about X.Org can be found at:
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This module can be found as the module 'lib/Xinerama' at
+ :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
diff --git a/debian/rules b/debian/rules
index 72ebef5..4f6c1f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,7 +75,7 @@ binary-arch: build install
dh_install --sourcedir=debian/tmp --list-missing
dh_installchangelogs
dh_link
- dh_strip --dbg-package=$(PACKAGE)
+ dh_strip --dbg-package=$(PACKAGE)-dbg
dh_compress
dh_fixperms
dh_makeshlibs
commit 7e20ce4777ab83841dd450f52a858007e05fd603
Author: Andres Salomon <dilinger@debian.org>
Date: Mon Jul 17 05:29:25 2006 +0000
When building arch-dependent stuff, run dh_install w/ --list-missing.
diff --git a/debian/changelog b/debian/changelog
index 5614b47..4e7c099 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
libxinerama (1:1.0.1-5) UNRELEASED; urgency=low
* Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
- idempotency fix.
+ idempotency fix.
+ * Run dh_install w/ --list-missing.
- -- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 00:19:20 -0400
+ -- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 01:21:06 -0400
libxinerama (1:1.0.1-4) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 7e38427..72ebef5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp
+ dh_install --sourcedir=debian/tmp --list-missing
dh_installchangelogs
dh_link
dh_strip --dbg-package=$(PACKAGE)
commit d7f21cb04f977636b33e72e70f77b022d5f9e7be
Author: Andres Salomon <dilinger@debian.org>
Date: Mon Jul 17 04:44:49 2006 +0000
Idempotency fixes; everywhere where we're using a separate build directory,
we tend to create it via "mkdir obj-$(foo)". This doesn't work if rebuilding,
because the directory already exists. Instead, only create it if there's
no directory there already.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..5614b47
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,51 @@
+libxinerama (1:1.0.1-5) UNRELEASED; urgency=low
+
+ * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
+ idempotency fix.
+
+ -- Andres Salomon <dilinger@debian.org> Mon, 17 Jul 2006 00:19:20 -0400
+
+libxinerama (1:1.0.1-4) unstable; urgency=low
+
+ * Reorder makeshlib command in rules file so that ldconfig is run
+ properly. Thanks Drew Parsons and Steve Langasek.
+
+ -- David Nusinow <dnusinow@debian.org> Tue, 18 Apr 2006 21:49:59 -0400
+
+libxinerama (1:1.0.1-3) unstable; urgency=low
+
+ * Remove references to xss in -dbg and -dev package descriptions. Thanks
+ Josh Triplett. (closes: #362057)
+
+ -- David Nusinow <dnusinow@debian.org> Tue, 11 Apr 2006 20:24:37 -0400
+
+libxinerama (1:1.0.1-2) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org> Thu, 23 Mar 2006 22:44:41 -0500
+
+libxinerama (1:1.0.1-1) experimental; urgency=low
+
+ * First modular upload to Debian
+
+ -- David Nusinow <dnusinow@debian.org> Thu, 29 Dec 2005 20:53:24 -0500
+
+libxinerama (1:1.1.0+cvs.20050821-1) breezy; urgency=low
+
+ * Update to new upstream version; change x11proto-panoramix-dev B-D to
+ -xinerama-.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Sun, 21 Aug 2005 21:13:57 +1000
+
+libxinerama (1:1.1.0-2) breezy; urgency=low
+
+ * Bump Build-Depends on libx11-dev and libxext-dev to avoid _XOPEN_SOURCE.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Sat, 23 Jul 2005 00:39:34 +1000
+
+libxinerama (1:1.1.0-1) breezy; urgency=low
+
+ * First libxinerama release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com> Mon, 16 May 2005 22:10:17 +1000
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..7e38427
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,93 @@
+#!/usr/bin/make -f
+# debian/rules for the Debian libxinerama package.
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
+# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
+# Copyright © 2005 David Nusinow <dnusinow@debian.org>
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# set this to the name of the main shlib's binary package
+PACKAGE = libxinerama1
+
+include debian/xsfbs/xsfbs.mk
+
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+
+ 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) \
+ CFLAGS="$(CFLAGS)"
+ cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ rm -f config.cache config.log config.status
+ rm -f */config.cache */config.log */config.status
+ rm -f conftest* */conftest*
+ rm -rf autom4te.cache */autom4te.cache
+ rm -rf obj-*
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+
+ dh_installdocs
+ dh_install --sourcedir=debian/tmp
+ dh_installchangelogs
+ dh_link
+ dh_strip --dbg-package=$(PACKAGE)
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_shlibdeps
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture-independent files here.
+binary-indep: build install
+# Nothing to do
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Reply to: