[PATCH 0/2] xlockmore: Fix URLs and update to 5.46

[PATCH 0/2] xlockmore: Fix URLs and update to 5.46

[Leo Famulari]

I didn't mean to push this before emailing — especially the update
patch. Sorry!

I'm not sure how to revert while being sure not to screw
other users' checkouts (or Hydra's checkout) so I'll wait for any 
instructions.

This updates the source URLs for xlockmore.

Also, there is a new version (5.46).

Leo Famulari (2):
  gnu: xlockmore: Add alternate URL.
  gnu: xlockmore: Update to 5.46.

 gnu/packages/xdisorg.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

-- 
2.6.2

[PATCH 1/2] gnu: xlockmore: Add alternate URL.

[Leo Famulari]

* gnu/packages/xdisorg.scm (xlockmore)[source]: Add alternate URL.
---
 gnu/packages/xdisorg.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index c426a01..18fbe1d 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -411,8 +411,13 @@ things less distracting.")
     (version "5.45")
     (source (origin
              (method url-fetch)
-             (uri (string-append "http://www.tux.org/~bagleyd/xlock/xlockmore-"
-                                 version "/xlockmore-" version ".tar.bz2"))
+             (uri (list (string-append
+                          "http://www.tux.org/~bagleyd/xlock/xlockmore-"
+                          version ".tar.xz")
+                        (string-append
+                          "http://www.tux.org/~bagleyd/xlock/xlockmore-old"
+                          "/xlockmore-" version
+                          "/xlockmore-" version ".tar.bz2")))
              (sha256
               (base32
                "1xqm61bbfn5q056w57vp16gvai8nqpcw570ysxlm5h46nh6ai0bz"))))
-- 
2.6.2

[PATCH 2/2] gnu: xlockmore: Update to 5.46.

[Leo Famulari]

* gnu/packages/xdisorg.scm (xlockmore): Update to 5.46.
---
 gnu/packages/xdisorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 18fbe1d..dc01637 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -408,7 +408,7 @@ things less distracting.")
 (define-public xlockmore
   (package
     (name "xlockmore")
-    (version "5.45")
+    (version "5.46")
     (source (origin
              (method url-fetch)
              (uri (list (string-append
@@ -420,7 +420,7 @@ things less distracting.")
                           "/xlockmore-" version ".tar.bz2")))
              (sha256
               (base32
-               "1xqm61bbfn5q056w57vp16gvai8nqpcw570ysxlm5h46nh6ai0bz"))))
+               "1ps0dmnh912x8mwns94y2607xk90rjxrjn5s1pkmmpjg5h9bxcrj"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags (list (string-append "--enable-appdefaultdir="
-- 
2.6.2

Re: [PATCH 0/2] xlockmore: Fix URLs and update to 5.46

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> I didn't mean to push this before emailing — especially the update
> patch. Sorry!
>
> I'm not sure how to revert while being sure not to screw
> other users' checkouts (or Hydra's checkout) so I'll wait for any 
> instructions.

The only safe way to revert is to “git revert” and push again.  This
results in two commits: one that performs the change, and another that
undoes it.

I don’t think it’s necessary here, though, as the patch looks fine to
me.

~~ Ricardo

Re: [PATCH 0/2] xlockmore: Fix URLs and update to 5.46

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> I don’t think it’s necessary here, though, as the patch looks fine to
> me.

Seconded.

In general, I think it’s fine to to minor upgrades of leaf packages
directly (see ‘HACKING’.)

Ludo’.