twm: Changes to 'debian-experimental'

2007-03-08 Thread Brice Goglin
 debian/changelog   |3 ++-
 debian/twm.postinst.in |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 64d0d8c3fa54de41a90a6c74c9fd59e934eed708
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Thu Mar 8 23:13:12 2007 +0100

Also update update-alternatives parameters since the manpage
suffix has been changed, and add closer.

diff --git a/debian/changelog b/debian/changelog
index 693d9f7..bcac6a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ twm (1:1.0.3-1) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * New upstream release.
-  * Install the manpage as twm.1 instead of twm.1x.
+  * Install the manpage as twm.1 instead of twm.1x and update
+update-alternatives parameters (closes: #396940).
   * Use dh_install --list-missing.
 
   [ Brice Goglin ]
diff --git a/debian/twm.postinst.in b/debian/twm.postinst.in
index 4967710..e143aff 100644
--- a/debian/twm.postinst.in
+++ b/debian/twm.postinst.in
@@ -29,7 +29,7 @@ update-alternatives --remove x-window-ma
 
 update-alternatives --install /usr/bin/x-window-manager x-window-manager \
   /usr/bin/twm 40 --slave /usr/share/man/man1/x-window-manager.1.gz \
-  x-window-manager.1.gz /usr/share/man/man1/twm.1x.gz
+  x-window-manager.1.gz /usr/share/man/man1/twm.1.gz
 
 exit 0
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



twm: Changes to 'debian-experimental'

2007-03-08 Thread Brice Goglin
 debian/changelog |6 +-
 debian/rules |3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 526315b0b3e465d9154d7dbd571df29eea0afef0
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Thu Mar 8 21:28:26 2007 +0100

* Drop useless -DLIBXCURSOR from debian/rules (closes: #384073).

diff --git a/debian/changelog b/debian/changelog
index e6fe720..693d9f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 twm (1:1.0.3-1) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * New upstream release.
   * Install the manpage as twm.1 instead of twm.1x.
   * Use dh_install --list-missing.
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Sat,  3 Mar 2007 00:02:50 +0100
+  [ Brice Goglin ]
+  * Drop useless -DLIBXCURSOR from debian/rules (closes: #384073).
+
+ -- Brice Goglin <[EMAIL PROTECTED]>  Thu,  8 Mar 2007 21:14:07 +0100
 
 twm (1:1.0.1-4) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index dc5758d..dbe6ce5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,9 +33,6 @@ endif
 
 confflags += --enable-man-pages=3
 
-# so very wrong
-CFLAGS += -DLIBXCURSOR=\\\"libXcursor.so.1\\\"
-
 build: patch build-stamp
 build-stamp:
dh_testdir


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



twm: Changes to 'debian-experimental'

2007-03-02 Thread Julien Cristau
New branch 'debian-experimental' available with the following commits:
commit 70b43d65e449c666ed6763242b677df8cdab6c46
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 3 00:07:09 2007 +0100

New upstream release (twm 1.0.3).

Use dh_install --list-missing.
Install the manpage as twm(1) instead of twm(1x).

commit c78cc336126db85254ae072abcafb4253db72df9
Merge: df375e519524201692f270e02388516696cd9505 
72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Mar 3 00:00:58 2007 +0100

Merge branch 'xsfbs-unstable' of ../../xsfbs/ into debian-experimental

commit df375e519524201692f270e02388516696cd9505
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 2 23:58:59 2007 +0100

autoreconf

commit 40ae9bfc5a11681af167f8c8978013d6654cf021
Merge: b50c75cb5b6367186996d42d70b2c04a76ac9828 
5f70aaffa0fa88a4b08ea40cfdbde5f34d20d366
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 2 23:54:40 2007 +0100

Merge tag 'twm-1.0.3' into debian-experimental

commit b50c75cb5b6367186996d42d70b2c04a76ac9828
Merge: 901ba79d9be8db0ef2f4670286ec3754b1e3d454 
ab7a497d995347e340c28c4eb0d1f0f9ee298e41
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 2 23:54:11 2007 +0100

Merge tag 'XORG-7_1' into debian-experimental

Conflicts:

man/Makefile.am

commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 2 20:28:15 2007 +0100

Fix copy/paste typo in the input driver provides.

commit 4a943db2564c4f573ce2f5f676a841267e961f16
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Thu Mar 1 22:06:04 2007 -0500

Fix one missed bit from the serverabiver -> serverminver rename

commit 1344bb9deda5ba54215d0ec5b164706999236b0b
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Feb 28 23:08:17 2007 -0500

Fix typo that prevented the input abi versioning from working.
Good catch Julien

commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Feb 27 21:50:20 2007 -0500

Add support for X server input ABI versioning

commit 00fc799ec3107c0c29286b75e780bef82c1fa137
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Feb 21 22:47:30 2007 -0500

Fix name of serverminver

commit dacefd5a6bb9f786c78f35358273e3214c7492e9
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Feb 21 21:37:52 2007 -0500

Update serverabi generation to also account for driver Provides

* Have the drivers use the file serverminver instead of serverabiver in 
order
  to generate the versioned dependency on the server. This is clearer
  naming.
* Use serverabiver to actually store the server's video ABI version. This
  is used to generate the Provides: line for drivers so the server can
  depend on them properly. This goes in to the substvar
  xviddriver:Provides.

commit 9ed8b0c26438b90f187ef7c165d5a76cf8f340eb
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sat Feb 17 16:01:41 2007 +0100

Add new "serverabi" rule to generate drivers dependency on the server.

commit 502f9412dcaa6abd23b94372d86824c895cea3b8
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Feb 4 20:43:28 2007 -0500

Move the files so they'll be put in debian/xsfbs automatically when pulled
in to our git repos

commit d5595eaaa4dc5d692ead5d2889513d325142e4db
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Aug 22 03:04:13 2006 +

Pull patches from ubuntu for ARCHITECTURE, LAPTOP, RECONFIGURE, FIRSTINST, 
and UPGRADE variables

commit 34afaedccc1aeb05d2c6a3869f51e78b2dd0d210
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Fri Jun 9 02:34:26 2006 +

Fix for bug #371152. Thanks Joey Hess.

commit f64226c1d9c22e2f6d908bf46e059561748d4418
Author: Branden Robinson <[EMAIL PROTECTED]>
Date:   Tue Jun 6 18:14:45 2006 +

Add high-level documentation to XSFBS shell library, intended to reduce
user confusion when reading X package maintainer scripts outside the source
tree.

Update Vim modeline.

commit 64309731c5939687e4492f0d960802d32ec1
Author: Branden Robinson <[EMAIL PROTECTED]>
Date:   Tue Jun 6 18:05:40 2006 +

Note probable out-of-dateness of maplink() function body.

commit b07ee1042902cef9587a76dcbf1df1ee0bde0770
Author: Branden Robinson <[EMAIL PROTECTED]>
Date:   Tue Jun 6 18:02:50 2006 +

Set svn:keywords property to "Id" (keyword already present).

commit 5a669d90089e7430c41f3e0d72e672aa2be6cbd8
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Apr 16 00:19:59 2006 +

Fix the last commit and fix spelling error. Thanks Brice Goglin for the 
spelling catch.

commit 7770385a76ddfb208fc6b0f5e8b42b42d6b5a5a0
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sat Apr 15 23:53:37 2006 +

Make us error out if we call patch and don't have quilt installed

commit 43c2db2476d959a5837a50b3ee329afc1d1b1f7d
Author: David Nusinow <[EMAIL P