x11-session-utils: Changes to 'ubuntu'
debian/changelog | 19 +++++++++++++++++++
debian/control | 9 ++++-----
debian/rules | 2 +-
debian/watch.rstart | 1 +
debian/watch.smproxy | 1 +
debian/watch.xsm | 1 +
6 files changed, 27 insertions(+), 6 deletions(-)
New commits:
commit c995c4fb4f59c3ff813e48b9bc09c79e4d765df8
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Feb 24 09:36:31 2011 +0200
releasing version 7.6+1ubuntu1
diff --git a/debian/changelog b/debian/changelog
index 6b3b2bf..c97a641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-x11-session-utils (7.6+1ubuntu1) UNRELEASED; urgency=low
+x11-session-utils (7.6+1ubuntu1) natty; urgency=low
* Merge from Debian experimental. Remaining Ubuntu changes:
- 100-smproxy-linking-fix.patch: Fix linking with --no-add-needed.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 24 Feb 2011 09:28:38 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 24 Feb 2011 09:36:08 +0200
x11-session-utils (7.6+1) unstable; urgency=low
commit e6dbab500e640b6c3dcada9468bc14ed82b13d00
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 9 19:00:29 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index ca3805b..f7fdaf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-session-utils (7.6~2) UNRELEASED; urgency=low
+x11-session-utils (7.6+1) unstable; urgency=low
* Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your
work!
@@ -6,8 +6,9 @@ x11-session-utils (7.6~2) UNRELEASED; urgency=low
* Drop XS prefix from Vcs-* control fields.
* Drop Pre-Depends on x11-common.
* Bump Standards-Version to 3.9.1.
+ * Upload to unstable.
- -- Julien Cristau <jcristau@debian.org> Wed, 09 Feb 2011 18:52:20 +0100
+ -- Julien Cristau <jcristau@debian.org> Wed, 09 Feb 2011 19:00:24 +0100
x11-session-utils (7.6~1) experimental; urgency=low
commit 2e4ade81cc93b0116601bab6ff16552c16e3b960
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 9 18:58:24 2011 +0100
Bump Standards-Version to 3.9.1.
diff --git a/debian/changelog b/debian/changelog
index 18e6d7f..ca3805b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x11-session-utils (7.6~2) UNRELEASED; urgency=low
* Pass "--destdir ." to uscan when downloading tarballs.
* Drop XS prefix from Vcs-* control fields.
* Drop Pre-Depends on x11-common.
+ * Bump Standards-Version to 3.9.1.
-- Julien Cristau <jcristau@debian.org> Wed, 09 Feb 2011 18:52:20 +0100
diff --git a/debian/control b/debian/control
index 95634de..c560b04 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends:
# smproxy: libxt-dev, libxmuu-dev, libsm-dev
# xsm: openssh-client | ssh, libxaw7-dev, libxt-dev, libsm-dev
# libice-dev, libx11-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-session-utils
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-session-utils.git
commit 815612c7efc05382f707ef30e08be71f78d90cc5
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 9 18:55:07 2011 +0100
Drop Pre-Depends on x11-common.
diff --git a/debian/changelog b/debian/changelog
index beac723..18e6d7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x11-session-utils (7.6~2) UNRELEASED; urgency=low
work!
* Pass "--destdir ." to uscan when downloading tarballs.
* Drop XS prefix from Vcs-* control fields.
+ * Drop Pre-Depends on x11-common.
-- Julien Cristau <jcristau@debian.org> Wed, 09 Feb 2011 18:52:20 +0100
diff --git a/debian/control b/debian/control
index ef96b79..95634de 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-session-utils.git
Package: x11-session-utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
-Pre-Depends: x11-common (>= 1:7.0.0)
Conflicts: smproxy, xsm (<= 1:1.0.1-1)
Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1), smproxy, xsm (<= 1:1.0.1-1)
Description: X session utilities
commit 09b37ec4b8722dcf881d5e7a06e81123f9624850
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 9 18:54:43 2011 +0100
Drop XS prefix from Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index d56d12d..beac723 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11-session-utils (7.6~2) UNRELEASED; urgency=low
* Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your
work!
* Pass "--destdir ." to uscan when downloading tarballs.
+ * Drop XS prefix from Vcs-* control fields.
-- Julien Cristau <jcristau@debian.org> Wed, 09 Feb 2011 18:52:20 +0100
diff --git a/debian/control b/debian/control
index 172b7e1..ef96b79 100644
--- a/debian/control
+++ b/debian/control
@@ -24,8 +24,8 @@ Build-Depends:
# xsm: openssh-client | ssh, libxaw7-dev, libxt-dev, libsm-dev
# libice-dev, libx11-dev
Standards-Version: 3.8.3
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-session-utils
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-session-utils.git
+Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-session-utils
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-session-utils.git
Package: x11-session-utils
Architecture: any
commit c4bf895852cad601e294c278b036b5782cdcdee1
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 9 18:53:23 2011 +0100
Pass "--destdir ." to uscan when downloading tarballs.
diff --git a/debian/changelog b/debian/changelog
index 675c988..d56d12d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11-session-utils (7.6~2) UNRELEASED; urgency=low
* Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your
work!
+ * Pass "--destdir ." to uscan when downloading tarballs.
-- Julien Cristau <jcristau@debian.org> Wed, 09 Feb 2011 18:52:20 +0100
diff --git a/debian/rules b/debian/rules
index 4db9217..6ddfdc7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -111,7 +111,7 @@ get-tarballs: $(addprefix get-tarball-,$(SUBDIRS))
.PHONY: get-tarball-%
get-tarball-%:
- uscan --no-conf --download --no-symlink --package $* --upstream-version $(shell awk -F = '/^PACKAGE_VERSION=/ { print $$2 }' < $*/configure ) --watchfile debian/watch.$* || test $$? = 1
+ uscan --no-conf --destdir . --download --no-symlink --package $* --upstream-version $(shell awk -F = '/^PACKAGE_VERSION=/ { print $$2 }' < $*/configure ) --watchfile debian/watch.$* || test $$? = 1
.PHONY: update-copyright
update-copyright: $(addsuffix /COPYING, $(SUBDIRS)) debian/copyright.head
commit 1626f98e8dec37770809d09120cf399944367abe
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 9 18:52:36 2011 +0100
Remove Brice Goglin and David Nusinow from Uploaders.
Thanks for your work!
diff --git a/debian/changelog b/debian/changelog
index dc9c088..675c988 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11-session-utils (7.6~2) UNRELEASED; urgency=low
+
+ * Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your
+ work!
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 09 Feb 2011 18:52:20 +0100
+
x11-session-utils (7.6~1) experimental; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index efd6b41..172b7e1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11-session-utils
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 (>= 5.0.0),
pkg-config,
commit fc4889428a298b7d8d7859a75748807e65b1421d
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 18 16:51:06 2010 +0100
Mention upstream git URL in a comment.
diff --git a/debian/watch.rstart b/debian/watch.rstart
index 3e0c1c4..2bc4db4 100644
--- a/debian/watch.rstart
+++ b/debian/watch.rstart
@@ -1,2 +1,3 @@
+#git=git://anongit.freedesktop.org/xorg/app/rstart
version=3
http://xorg.freedesktop.org/releases/individual/app/ rstart-(.*)\.tar\.gz
diff --git a/debian/watch.smproxy b/debian/watch.smproxy
index fdf0e6e..38a264d 100644
--- a/debian/watch.smproxy
+++ b/debian/watch.smproxy
@@ -1,2 +1,3 @@
+#git=git://anongit.freedesktop.org/xorg/app/smproxy
version=3
http://xorg.freedesktop.org/releases/individual/app/ smproxy-(.*)\.tar\.gz
diff --git a/debian/watch.xsm b/debian/watch.xsm
index a908365..9aa14ac 100644
--- a/debian/watch.xsm
+++ b/debian/watch.xsm
@@ -1,2 +1,3 @@
+#git=git://anongit.freedesktop.org/xorg/app/xsm
version=3
http://xorg.freedesktop.org/releases/individual/app/ xsm-(.*)\.tar\.gz
Reply to: