libsm: Changes to 'debian-unstable'
debian/README.source | 2 +-
debian/changelog | 13 +++++++++++++
debian/control | 9 ++++++---
debian/libsm-dev.install | 6 +++---
debian/libsm6.install | 2 +-
debian/rules | 2 ++
debian/xsfbs/xsfbs.mk | 35 ++++++++++++++++++++++-------------
7 files changed, 48 insertions(+), 21 deletions(-)
New commits:
commit 5ad23779a9d5ae8bb59fcaa4a4d1a6f27258c20f
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 14:50:01 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 5240ae3..22727eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-libsm (2:1.2.0-2) UNRELEASED; urgency=low
+libsm (2:1.2.0-2) unstable; urgency=low
+
+ * Team upload.
[ Steve Langasek ]
* Build for multiarch.
@@ -7,7 +9,7 @@ libsm (2:1.2.0-2) UNRELEASED; urgency=low
* Remove David Nusinow and Brice Goglin from Uploaders.
* Bump Standards-Version to 3.9.2.
- -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 14:46:28 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 14:49:47 +0200
libsm (2:1.2.0-1) unstable; urgency=low
commit a07ade37abbef2fb411fa38a30eb4a280095edb4
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 14:48:01 2011 +0200
Bump Standards-Version to 3.9.2.
diff --git a/debian/changelog b/debian/changelog
index 06046b0..5240ae3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libsm (2:1.2.0-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Remove David Nusinow and Brice Goglin from Uploaders.
+ * Bump Standards-Version to 3.9.2.
-- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 14:46:28 +0200
diff --git a/debian/control b/debian/control
index 9872e03..cfc2482 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
quilt,
# doc:
xmlto, xorg-sgml-doctools (>= 1:1.5), w3m,
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libsm
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libsm.git
commit 86084955ced1d4800471a474b4590cb7d3351d9b
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 14:47:21 2011 +0200
Remove David Nusinow and Brice Goglin from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 9405b6d..06046b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ libsm (2:1.2.0-2) UNRELEASED; urgency=low
[ Steve Langasek ]
* Build for multiarch.
+ [ Julien Cristau ]
+ * Remove David Nusinow and Brice Goglin from Uploaders.
+
-- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 14:46:28 +0200
libsm (2:1.2.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 1d39463..9872e03 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libsm
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8.1.3),
pkg-config,
commit c4c13b69eca51beb82bd84abc9f45eb7b4b843b3
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 14:46:42 2011 +0200
Add multiarch changelog entry
diff --git a/debian/changelog b/debian/changelog
index c6e1f31..9405b6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libsm (2:1.2.0-2) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 14:46:28 +0200
+
libsm (2:1.2.0-1) unstable; urgency=low
[ Julien Cristau ]
commit f530e33def98b710315ea32ad377c494e1eacf53
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Wed Mar 23 16:06:24 2011 -0700
build for multiarch
diff --git a/debian/control b/debian/control
index bc3ee91..1d39463 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>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 8.1.3),
pkg-config,
x11proto-core-dev (>= 6.8.99.15+cvs.20050722),
xtrans-dev,
@@ -24,6 +24,8 @@ Package: libsm6
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: X11 Session Management library
This package provides the main interface to the X11 Session Management
library, which allows for applications to both manage sessions, and make use
@@ -40,6 +42,7 @@ Section: debug
Architecture: any
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6 (= ${binary:Version})
+Multi-Arch: same
Description: X11 Session Management library (debug package)
This package provides the main interface to the X11 Session Management
library, which allows for applications to both manage sessions, and make use
diff --git a/debian/libsm-dev.install b/debian/libsm-dev.install
index 57831b9..a2c6474 100644
--- a/debian/libsm-dev.install
+++ b/debian/libsm-dev.install
@@ -1,7 +1,7 @@
usr/include/X11/*
-usr/lib/libSM.a
-usr/lib/libSM.so
-usr/lib/pkgconfig/sm.pc
+usr/lib/*/libSM.a
+usr/lib/*/libSM.so
+usr/lib/*/pkgconfig/sm.pc
usr/share/doc/libSM/*.html usr/share/doc/libsm-dev/
usr/share/doc/libSM/*.css usr/share/doc/libsm-dev/
usr/share/doc/libSM/*.txt usr/share/doc/libsm-dev/
diff --git a/debian/libsm6.install b/debian/libsm6.install
index f6c0204..46cf7ff 100644
--- a/debian/libsm6.install
+++ b/debian/libsm6.install
@@ -1 +1 @@
-usr/lib/libSM.so.6*
+usr/lib/*/libSM.so.6*
diff --git a/debian/rules b/debian/rules
index e0dc3d5..2bc259b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
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)
@@ -48,6 +49,7 @@ build/config.status: autogen-stamp
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
--with-xmlto --without-fop \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
CFLAGS="$(CFLAGS)"
.PHONY: build
commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun May 2 02:14:45 2010 +0200
Add xorg-driver-{video,input} to Provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 77c4a39..3c59c20 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
# these two can be removed post-squeeze
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
commit b045afbd8277ad0c44e29d7c45802053c4335ccd
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 16 22:14:46 2010 +0200
Update serverabi rule for xserver 1.7.6.901
Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for
drivers. The ${xserver:Depends} variable is deprecated.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 351fea5..77c4a39 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
+# Compute dependencies for drivers
+#
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
+
+# these two can be removed post-squeeze
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
.PHONY: serverabi
serverabi: install
-ifeq ($(SERVERMINVERS),)
- @echo error: xserver-xorg-dev needs to be installed
+ifeq ($(VIDEODEP),)
+ @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
@exit 1
else
- echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+ echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars
+ echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars
+ # the following is there for compatibility...
echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
+ echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars
endif
# vim:set noet ai sts=8 sw=8 tw=0:
commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 13 14:06:33 2010 +0200
xsfbs.mk: don't use a directory as a make target
The timestamp on the directory gets updated each time a file is added in
it, which causes useless rebuilds.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e16b10..351fea5 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts
>$@
-.PHONY: log
-stampdir_targets+=log
-log: $(STAMP_DIR)/log
-$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+.PHONY: logdir
+stampdir_targets+=logdir
+logdir: $(STAMP_DIR)/logdir
+$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir
mkdir -p $(STAMP_DIR)/log
+ >$@
# Apply all patches to the upstream source.
.PHONY: patch
@@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/log
+unpatch: $(STAMP_DIR)/logdir
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Apr 1 20:49:15 2010 +0200
Fix typo.
diff --git a/debian/README.source b/debian/README.source
index 34ab4bf..b09a1ab 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -25,7 +25,7 @@ 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
+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.
Reply to: