x11-apps: Changes to 'ubuntu'
debian/changelog | 13 +++++++++++++
debian/control | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 0a623541bfdd71a10ec4c82820164d8caefc178d
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Jan 10 12:02:30 2013 +0200
release to raring
diff --git a/debian/changelog b/debian/changelog
index a5136b2..aa9429a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-x11-apps (7.7~3ubuntu1) UNRELEASED; urgency=low
+x11-apps (7.7~3ubuntu1) raring; urgency=low
- * Merge from unreleased debian git.
+ * Sync from unreleased debian git. (LP: 1078401)
- -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 10 Jan 2013 11:53:54 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 10 Jan 2013 11:59:58 +0200
x11-apps (7.7~3) UNRELEASED; urgency=low
commit f943ab10881c53e7fcccd6fc4347e5ace4e6248c
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Jan 10 11:56:40 2013 +0200
update the changelog
diff --git a/debian/changelog b/debian/changelog
index 9f4c191..287a119 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-apps (7.7~3ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from unreleased debian git.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 10 Jan 2013 11:53:54 +0200
+
x11-apps (7.7~3) UNRELEASED; urgency=low
* Add transset to conflicts/replaces to fix upgrades.
commit 636a7fdb14993e8d0e8b77430dfc5cd81f197ff0
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Sat Dec 15 18:38:09 2012 -0500
debian/control: Add transset to conflicts/replaces to fix upgrades.
diff --git a/debian/changelog b/debian/changelog
index 8a3a160..bc749e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-apps (7.7~3) UNRELEASED; urgency=low
+
+ * Add transset to conflicts/replaces to fix upgrades.
+
+ -- Robert Hooker <sarvatt@ubuntu.com> Sat, 15 Dec 2012 18:36:39 -0500
+
x11-apps (7.7~2) unstable; urgency=low
* Team upload.
diff --git a/debian/control b/debian/control
index dc10c9b..7cc6d27 100644
--- a/debian/control
+++ b/debian/control
@@ -58,10 +58,10 @@ Recommends: xbitmaps
Suggests: mesa-utils
Conflicts: bitmap, oclock, x11perf, xbiff, xcalc, xclipboard, xclock, xconsole,
xcursorgen, xditview, xeyes, xgc, xload, xlogo, xmag, xman, xmore, xwd,
- xwud
+ xwud, transset
Replaces: xbase-clients (<= 1:7.2.ds2-3), bitmap, oclock, x11perf, xbiff,
xcalc, xclipboard, xclock, xconsole, xcursorgen, xditview, xeyes, xgc,
- xload, xlogo, xmag, xman, xmore, xwd, xwud
+ xload, xlogo, xmag, xman, xmore, xwd, xwud, transset
Description: X applications
This package provides a miscellaneous assortment of X applications
that ship with the X Window System, including:
Reply to: