[nitrogen] Committed wrong patch last time.

James Wrigley jamesnz at fedoraproject.org
Fri Jan 17 18:50:08 UTC 2014 

commit ec7f70ba37816d83f8c6443ffb4a28c602394a4b
Author: JamesNZ <jamesnz at fedoraproject.org>
Date:   Sat Jan 18 07:50:06 2014 +1300

    Committed wrong patch last time.

 nitrogen-update-autoconf.patch |   52 ++++++++++++++++++++++++++--------------
 1 files changed, 34 insertions(+), 18 deletions(-)
---
diff --git a/nitrogen-update-autoconf.patch b/nitrogen-update-autoconf.patch
index 5d8be44..0ebc064 100644
--- a/nitrogen-update-autoconf.patch
+++ b/nitrogen-update-autoconf.patch
@@ -1,6 +1,6 @@
 diff -ur ../nitrogen-orig/ABOUT-NLS ./ABOUT-NLS
 --- ../nitrogen-orig/ABOUT-NLS	2013-09-27 13:24:14.000000000 +1200
-+++ ./ABOUT-NLS	2013-12-21 08:18:35.271022000 +1300
++++ ./ABOUT-NLS	2013-12-18 08:56:41.421771000 +1300
 @@ -0,0 +1,1282 @@
 +1 Notes on the Free Translation Project
 +***************************************
@@ -1284,9 +1284,10 @@ diff -ur ../nitrogen-orig/ABOUT-NLS ./ABOUT-NLS
 +`coordinator at translationproject.org' to make the `.pot' files available
 +to the translation teams.
 +
+Only in .: aclocal.m4
 diff -ur ../nitrogen-orig/bootstrap ./bootstrap
 --- ../nitrogen-orig/bootstrap	2013-09-27 13:24:14.000000000 +1200
-+++ ./bootstrap	2013-12-21 08:24:14.084892334 +1300
++++ ./bootstrap	2013-12-20 09:31:23.959368687 +1300
 @@ -7,7 +7,7 @@
  export WANT_AUTOMAKE=1.9
  
@@ -1296,11 +1297,12 @@ diff -ur ../nitrogen-orig/bootstrap ./bootstrap
  sh autoconf
  sh autoheader
  sh automake --include-deps --add-missing --copy
+Only in .: bootstrap~
 diff -ur ../nitrogen-orig/ChangeLog ./ChangeLog
 --- ../nitrogen-orig/ChangeLog	2013-09-27 13:24:14.000000000 +1200
-+++ ./ChangeLog	2013-12-21 08:18:35.272022000 +1300
++++ ./ChangeLog	2013-12-18 08:56:42.329733000 +1300
 @@ -1,3 +1,8 @@
-+2013-12-19  gettextize  <bug-gnu-gettext at gnu.org>
++2013-12-18  gettextize  <bug-gnu-gettext at gnu.org>
 +
 +	* Makefile.am (EXTRA_DIST): Add m4/ChangeLog.
 +	* configure.ac (AC_CONFIG_FILES): Add po/Makefile.in.
@@ -1310,7 +1312,7 @@ diff -ur ../nitrogen-orig/ChangeLog ./ChangeLog
      * Fixed bug in Xinerama mode where X resources would be leaked on
 diff -ur ../nitrogen-orig/config.rpath ./config.rpath
 --- ../nitrogen-orig/config.rpath	2013-09-27 13:24:14.000000000 +1200
-+++ ./config.rpath	2013-12-21 08:18:35.273022000 +1300
++++ ./config.rpath	2013-12-18 08:56:41.424771000 +1300
 @@ -0,0 +1,690 @@
 +#! /bin/sh
 +# Output a system dependent set of variables, describing how to set the
@@ -2002,9 +2004,10 @@ diff -ur ../nitrogen-orig/config.rpath ./config.rpath
 +hardcode_minus_L="$hardcode_minus_L"
 +
 +EOF
+Only in .: configure
 diff -ur ../nitrogen-orig/configure.ac ./configure.ac
 --- ../nitrogen-orig/configure.ac	2013-09-27 13:24:14.000000000 +1200
-+++ ./configure.ac	2013-12-21 08:18:35.273022000 +1300
++++ ./configure.ac	2013-12-18 08:58:52.094299000 +1300
 @@ -1,21 +1,20 @@
 -AC_PREREQ(2.59)
 +AC_PREREQ([2.69])
@@ -2121,7 +2124,7 @@ diff -ur ../nitrogen-orig/configure.ac ./configure.ac
 +AC_SUBST([NITROGEN_CFLAGS])
  
 -AC_CONFIG_FILES(Makefile src/Makefile data/Makefile data/nitrogen.desktop data/icons/Makefile po/Makefile.in)
-+AC_CONFIG_FILES([Makefile po/Makefile.in
++AC_CONFIG_FILES([Makefile po/Makefile.in 
 +                 data/Makefile
 +                 data/icons/Makefile
 +                 src/Makefile])
@@ -2134,7 +2137,7 @@ diff -ur ../nitrogen-orig/configure.ac ./configure.ac
  echo ""
 diff -ur ../nitrogen-orig/data/Makefile.am ./data/Makefile.am
 --- ../nitrogen-orig/data/Makefile.am	2013-09-27 13:24:14.000000000 +1200
-+++ ./data/Makefile.am	2013-12-21 08:23:52.190805897 +1300
++++ ./data/Makefile.am	2013-12-20 09:08:36.052568731 +1300
 @@ -1,13 +1,13 @@
  SUBDIRS = icons
  
@@ -2146,28 +2149,33 @@ diff -ur ../nitrogen-orig/data/Makefile.am ./data/Makefile.am
 +#UPDATE_DESKTOP = update-desktop-database $(datadir)/applications || :
  
 -install-data-hook: 
-+#install-data-hook: 
- 	$(UPDATE_DESKTOP)
+-	$(UPDATE_DESKTOP)
 -uninstall-hook: 
+-	$(UPDATE_DESKTOP)
++#install-data-hook: 
++#	$(UPDATE_DESKTOP)
 +#uninstall-hook: 
- 	$(UPDATE_DESKTOP)
++#	$(UPDATE_DESKTOP)
  
  EXTRA_DIST = icon-theme-installer
+Only in ./data: Makefile.am~
+Only in .: m4
 diff -ur ../nitrogen-orig/Makefile.am ./Makefile.am
 --- ../nitrogen-orig/Makefile.am	2013-09-27 13:24:14.000000000 +1200
-+++ ./Makefile.am	2013-12-21 08:18:35.272022000 +1300
++++ ./Makefile.am	2013-12-18 08:56:42.235737000 +1300
 @@ -1,3 +1,5 @@
  SUBDIRS = po src data
  #DIST_SUBDIRS = data
 -EXTRA_DIST = config.rpath bootstrap
-+EXTRA_DIST = m4/ChangeLog  m4/ChangeLog  m4/ChangeLog  m4/ChangeLog  config.rpath bootstrap
++EXTRA_DIST = m4/ChangeLog  m4/ChangeLog  m4/ChangeLog  config.rpath bootstrap
 +
 +ACLOCAL_AMFLAGS = -I m4
+Only in ./po: boldquot.sed~
 diff -ur ../nitrogen-orig/po/ChangeLog ./po/ChangeLog
 --- ../nitrogen-orig/po/ChangeLog	2013-09-27 13:24:14.000000000 +1200
-+++ ./po/ChangeLog	2013-12-21 08:18:35.274022000 +1300
++++ ./po/ChangeLog	2013-12-18 08:56:41.808755000 +1300
 @@ -1,3 +1,8 @@
-+2013-12-19  gettextize  <bug-gnu-gettext at gnu.org>
++2013-12-18  gettextize  <bug-gnu-gettext at gnu.org>
 +
 +	* Makefile.in.in: New file, from gettext-0.18.3.
 +	* Rules-quot: Upgrade to gettext-0.18.3.
@@ -2175,9 +2183,13 @@ diff -ur ../nitrogen-orig/po/ChangeLog ./po/ChangeLog
  2007-05-25  gettextize  <bug-gnu-gettext at gnu.org>
  
  	* Makefile.in.in: New file, from gettext-0.16.1.
+Only in ./po: ChangeLog~
+Only in ./po: en at boldquot.header~
+Only in ./po: en at quot.header~
+Only in ./po: insert-header.sin~
 diff -ur ../nitrogen-orig/po/Makefile.in.in ./po/Makefile.in.in
 --- ../nitrogen-orig/po/Makefile.in.in	2013-09-27 13:24:14.000000000 +1200
-+++ ./po/Makefile.in.in	2013-12-21 08:18:35.274022000 +1300
++++ ./po/Makefile.in.in	2013-12-18 08:56:41.690760000 +1300
 @@ -1,5 +1,5 @@
  # Makefile for PO directory in any package using GNU gettext.
 -# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
@@ -2352,7 +2364,7 @@ diff -ur ../nitrogen-orig/po/Makefile.in.in ./po/Makefile.in.in
  
 diff -ur ../nitrogen-orig/po/Makevars ./po/Makevars
 --- ../nitrogen-orig/po/Makevars	2013-09-27 13:24:14.000000000 +1200
-+++ ./po/Makevars	2013-12-21 08:18:35.274022000 +1300
++++ ./po/Makevars	2013-12-18 08:54:52.440336000 +1300
 @@ -39,3 +39,15 @@
  # This is the list of locale categories, beyond LC_MESSAGES, for which the
  # message catalogs shall be used.  It is usually empty.
@@ -2369,9 +2381,12 @@ diff -ur ../nitrogen-orig/po/Makevars ./po/Makevars
 +#   --previous            to keep previous msgids of translated messages,
 +#   --quiet               to reduce the verbosity.
 +MSGMERGE_OPTIONS =
+Only in ./po: Makevars~
+Only in ./po: quot.sed~
+Only in ./po: remove-potcdate.sin~
 diff -ur ../nitrogen-orig/po/Rules-quot ./po/Rules-quot
 --- ../nitrogen-orig/po/Rules-quot	2013-09-27 13:24:14.000000000 +1200
-+++ ./po/Rules-quot	2013-12-21 08:18:35.275022000 +1300
++++ ./po/Rules-quot	2013-12-18 08:56:41.795756000 +1300
 @@ -14,13 +14,13 @@
  
  .insert-header.po-update-en:
@@ -2388,3 +2403,4 @@ diff -ur ../nitrogen-orig/po/Rules-quot ./po/Rules-quot
  	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
  	    rm -f $$tmpdir/$$lang.new.po; \
  	  else \
+Only in ./po: Rules-quot~

More information about the scm-commits mailing list