x11-apps: Changes to 'debian-unstable'
debian/changelog | 9 +++++++--
debian/control | 27 +++++++++++++++++++--------
debian/rules | 3 ---
3 files changed, 26 insertions(+), 13 deletions(-)
New commits:
commit 056228dc33d007c2036a2455a8ec76c534ff6350
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 30 16:35:41 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index c7593be..d7759be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.7~1) UNRELEASED; urgency=low
+x11-apps (7.7~1) unstable; urgency=low
[ Robert Hooker ]
* Fix recommends. Previously it was recommending xbitmap which didn't
@@ -19,7 +19,7 @@ x11-apps (7.7~1) UNRELEASED; urgency=low
* Update build-dep list and comments.
* Drop dh_testroot from debian/rules clean.
- -- Robert Hooker <sarvatt@ubuntu.com> Wed, 04 Apr 2012 14:24:17 -0400
+ -- Julien Cristau <jcristau@debian.org> Mon, 30 Apr 2012 16:35:36 +0200
x11-apps (7.6+5) unstable; urgency=low
commit 75d0b3e25f180652f12e22102db78c03cf322056
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 30 16:35:34 2012 +0200
Drop dh_testroot from debian/rules clean.
diff --git a/debian/changelog b/debian/changelog
index 2cc42fe..c7593be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ x11-apps (7.7~1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Update build-dep list and comments.
+ * Drop dh_testroot from debian/rules clean.
-- Robert Hooker <sarvatt@ubuntu.com> Wed, 04 Apr 2012 14:24:17 -0400
diff --git a/debian/rules b/debian/rules
index 537a8ff..7933d68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,15 +55,12 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
clean: xsfclean
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 *-build
-
dh_clean
install: build
commit ad50454ad4f365c405cadc51a3cd825983bee1ff
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 30 16:28:47 2012 +0200
Update build-dep list and comments.
diff --git a/debian/changelog b/debian/changelog
index b8d4d56..2cc42fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
x11-apps (7.7~1) UNRELEASED; urgency=low
+ [ Robert Hooker ]
* Fix recommends. Previously it was recommending xbitmap which didn't
exist, the package is xbitmaps.
* oclock 1.0.3
@@ -14,6 +15,9 @@ x11-apps (7.7~1) UNRELEASED; urgency=low
* xwud 1.0.4
* Drop oclock-ftbfs.diff, upstream.
+ [ Julien Cristau ]
+ * Update build-dep list and comments.
+
-- Robert Hooker <sarvatt@ubuntu.com> Wed, 04 Apr 2012 14:24:17 -0400
x11-apps (7.6+5) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d051c06..099d8f1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,23 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, libpng12-dev,
- libx11-dev (>= 2:1.0.0), libxaw7-dev (>= 1:1.0.1),
- libxcursor-dev (>= 1.1.5.2), libxext-dev (>= 1:1.0.0),
- libxft-dev (>= 2.1.8.2-6), libxkbfile-dev (>= 1:1.0.1),
- libxmuu-dev (>= 1:1.0.1), libxrender-dev (>= 1:0.9.0.2-2),
- libxt-dev (>= 1:1.0.0), xbitmaps, quilt, libxmu-dev,
+Build-Depends:
+ debhelper (>= 5.0.0),
+ pkg-config,
+ libpng12-dev,
+ libx11-dev (>= 2:1.0.0),
+ libxaw7-dev (>= 1:1.0.1),
+ libxcursor-dev (>= 1.1.5.2),
+ libxext-dev (>= 1:1.0.0),
+ libxft-dev (>= 2.1.8.2-6),
+ libxkbfile-dev (>= 1:1.0.1),
+ libxmuu-dev (>= 1:1.0.1),
+ libxrender-dev (>= 1:0.9.0.2-2),
+ libxt-dev (>= 1:1.1.0),
+ libxmu-dev,
+ xbitmaps,
+ x11proto-core-dev (>= 7.0.17),
+ quilt,
xutils-dev (>= 1:7.5+4),
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
@@ -16,7 +27,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libpng12-dev,
# Individual apps:
# bitmap: libx11-dev, libxmu-dev, xbitmaps, libxt-dev
# ico: libx11-dev
-# oclock: libx11-dev, libxmu-dev, libxext-dev
+# oclock: libx11-dev, libxmu-dev, libxext-dev, libxkbfile-dev
# x11perf: libx11-dev, libxmuu-dev, libxrender-dev, libxft-dev, libxext-dev
# xbiff: xbitmaps, libxext-dev
# xcalc: libxt-dev, libxaw7-dev
@@ -33,7 +44,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: libx11-dev
+# xwd: libx11-dev, x11proto-core-dev
# xwud: libx11-dev
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-apps
Reply to: