[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-input-synaptics: Changes to 'ubuntu'



 debian/changelog |    8 +++++++-
 debian/gbp.conf  |    3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit dc1669205f737d6c761f5d9220ac811d05a0c660
Author: Christopher James Halse Rogers <raof@ubuntu.com>
Date:   Thu Jun 3 09:46:22 2010 +1000

    Add changelog entry for gbp.conf

diff --git a/debian/changelog b/debian/changelog
index d431c65..e16c7ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xserver-xorg-input-synaptics (1.2.2-2ubuntu1) UNRELEASED; urgency=low
 
+  [ Robert Hooker ]
   * Merge from debian unstable, remaining changes:
     - Split out our synaptics quirks into 51-synaptics-quirks.conf
     - Add the udev rule back for tagging specific machines to be quirked
@@ -12,7 +13,12 @@ xserver-xorg-input-synaptics (1.2.2-2ubuntu1) UNRELEASED; urgency=low
     - 114_jumpy_cursor_first_part.patch: Adds a property to enable filtering
       jumpy cursor problems on some machines.
 
- -- Robert Hooker <sarvatt@ubuntu.com>  Mon, 31 May 2010 07:50:04 -0400
+  [ Christopher James Halse Rogers ]
+  * debian/gbp.conf:
+    - Make git-buildpackage less annoying by specifying “ubuntu” as our debian
+      branch.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Thu, 03 Jun 2010 09:44:22 +1000
 
 xserver-xorg-input-synaptics (1.2.2-2) unstable; urgency=low
 

commit 645cbc53330099898f28671debb0eb62687a15c4
Author: Christopher James Halse Rogers <raof@ubuntu.com>
Date:   Tue Jun 1 13:19:03 2010 +1000

    Add git-buildpackage conf.  Ubuntu is the right branch, damnit

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..b2efa2f
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+debian-branch=ubuntu
+


Reply to: