openSUSE Commits
Threads by month
- ----- 2024 -----
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2010
- 1 participants
- 1023 discussions
Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at Wed Nov 10 18:31:52 CET 2010.
--------
--- yast2-network/yast2-network.changes 2010-10-13 09:55:28.000000000 +0200
+++ yast2-network/yast2-network.changes 2010-11-03 17:14:52.000000000 +0100
@@ -1,0 +2,19 @@
+Wed Nov 3 17:03:37 CET 2010 - mzugec(a)suse.cz
+
+- support for ordering in bonding slaves (bnc#640611)
+- 2.20.1
+
+-------------------------------------------------------------------
+Wed Oct 27 13:53:54 CEST 2010 - mzugec(a)suse.cz
+
+- AY: when no network profile, don't change network configuration
+(bnc#649494)
+- 2.19.41
+
+-------------------------------------------------------------------
+Tue Oct 26 14:44:47 CEST 2010 - mzugec(a)suse.cz
+
+- added "No IP" option for bridge devices (bnc#648620)
+- 2.19.40
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-network-2.19.39.tar.bz2
New:
----
yast2-network-2.20.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.0H6oHz/_old 2010-11-10 18:30:35.000000000 +0100
+++ /var/tmp/diff_new_pack.0H6oHz/_new 2010-11-10 18:30:35.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.19.39)
+# spec file for package yast2-network (Version 2.20.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,11 @@
Name: yast2-network
-Version: 2.19.39
+Version: 2.20.1
Release: 1
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.19.39.tar.bz2
+Source0: yast2-network-2.20.1.tar.bz2
Prefix: /usr
@@ -72,7 +73,7 @@
This package contains autogenerated documentation for yast2-network
%prep
-%setup -n yast2-network-2.19.39
+%setup -n yast2-network-2.20.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -142,5 +143,4 @@
%doc %{prefix}/share/doc/packages/yast2-network
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
-
%changelog
++++++ yast2-network-2.19.39.tar.bz2 -> yast2-network-2.20.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.19.39/VERSION new/yast2-network-2.20.1/VERSION
--- old/yast2-network-2.19.39/VERSION 2010-10-13 09:49:33.000000000 +0200
+++ new/yast2-network-2.20.1/VERSION 2010-11-03 17:10:55.000000000 +0100
@@ -1 +1 @@
-2.19.39
+2.20.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.19.39/src/lan/address.ycp new/yast2-network-2.20.1/src/lan/address.ycp
--- old/yast2-network-2.19.39/src/lan/address.ycp 2010-10-13 09:49:33.000000000 +0200
+++ new/yast2-network-2.20.1/src/lan/address.ycp 2010-11-03 17:11:08.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network card adresss configuration dialogs
* Authors: Michal Svec <msvec(a)suse.cz>
*
- * $Id: address.ycp 62621 2010-10-12 15:44:43Z mzugec $
+ * $Id: address.ycp 62737 2010-11-03 16:07:25Z mzugec $
*/
{
@@ -159,6 +159,27 @@
}
+integer getISlaveIndex(string slave){
+ list<term> items = (list<term>)UI::QueryWidget(`msbox_items, `Items);
+ integer index = -1;
+ integer pos=0;
+ foreach(term it, (list<term>)items, {
+ if(it[0, 0]:""==slave){
+ index = pos;
+ break;
+ }
+ pos=pos+1;
+ });
+ return index;
+}
+
+void enableSlaveButtons(){
+ list<term> items = (list<term>)UI::QueryWidget(`msbox_items, `Items);
+ string current = tostring(UI::QueryWidget(`msbox_items, `CurrentItem));
+ integer index = getISlaveIndex(current);
+ UI::ChangeWidget(`up, `Enabled, index>0);
+ UI::ChangeWidget(`down, `Enabled, index<size(items)-1);
+}
/**
* Default function to init the value of slave devices box.
@@ -167,11 +188,11 @@
void InitSlave(string key)
{
settings["SLAVES"] = LanItems::bond_slaves;
- UI::ChangeWidget(`id("BONDSLAVE"), `SelectedItems, settings["SLAVES"]:[]);
+ UI::ChangeWidget(`msbox_items, `SelectedItems, settings["SLAVES"]:[]);
- settings["BONDOPTION"] = LanItems::bond_option;
+ settings["BONDOPTION"] = LanItems::bond_option;
- list items = createUnconfigured(settings["SLAVES"]:[]);
+ list items = createUnconfigured(settings["SLAVES"]:[]);
map <string, any> configurations = NetworkInterfaces::FilterDevices("netcard");
foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), {
foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), {
@@ -182,8 +203,72 @@
});
});
- UI::ChangeWidget(`id(key), `Items, items);
-y2internal("slaves %1", settings["SLAVES"]:[]);
+ // reorder the items
+ list l2=[];
+ list l1=[];
+ foreach(term t, (list<term>) items, {
+ if (contains(settings["SLAVES"]:[], t[0,0]:"")){
+ l1=add(l1, t);
+ } else {
+ l2=add(l2, t);
+ }
+ });
+
+ items=[];
+ foreach(string s, settings["SLAVES"]:[],{
+ foreach(term t, (list<term>) l1,{
+ if (t[0,0]:""==s) items=add(items, t);
+ });
+ });
+
+ items=union(items,l2);
+ UI::ChangeWidget(`msbox_items, `Items, items);
+ enableSlaveButtons();
+}
+
+symbol HandleSlave(string key, map event)
+{
+ if (event["EventReason"]:"" =="SelectionChanged"){
+ enableSlaveButtons();
+ } else if (event["EventReason"]:""=="Activated" && event["WidgetClass"]:nil==`PushButton){
+ list<term> items = (list<term>)UI::QueryWidget(`msbox_items, `Items);
+ string current = tostring(UI::QueryWidget(`msbox_items, `CurrentItem));
+ integer index = getISlaveIndex(current);
+ list<term> new_items=[];
+ integer pos=0;
+ switch(event["ID"]:`nil){
+ case `up:
+ while(index>pos+1){
+ new_items=add(new_items, items[pos]:nil);
+ pos=pos+1;
+ }
+ new_items=add(new_items, items[index]:nil);
+ new_items=add(new_items, items[index-1]:nil);
+ new_items=(list<term>)union(new_items, (list<term>)sublist(items, index));
+ break;
+ case `down:
+ while(index>pos){
+ new_items=add(new_items, items[pos]:nil);
+ pos=pos+1;
+ }
+ new_items=add(new_items, items[index+1]:nil);
+ new_items=add(new_items, items[index]:nil);
+ new_items=(list<term>)union(new_items, (list<term>)sublist(items, index+1));
+ break;
+ default:
+ y2warning("unknown action");
+ return nil;
+ }
+ items = new_items;
+ UI::ChangeWidget(`msbox_items, `Items, items);
+ enableSlaveButtons();
+
+ } else
+ {
+ y2debug("event:%1", event);
+ }
+
+ return nil;
}
/**
@@ -193,7 +278,7 @@
*/
void StoreSlave(string key, map event)
{
- settings["SLAVES"] = (list<string>)UI::QueryWidget (`id(key), `SelectedItems);
+ settings["SLAVES"] = (list<string>)UI::QueryWidget (`msbox_items, `SelectedItems);
settings["BONDOPTION"] = UI::QueryWidget (`id("BONDOPTION"), `Value);
LanItems::bond_slaves = settings["SLAVES"]:[];
LanItems::bond_option = settings["BONDOPTION"]:"";
@@ -228,8 +313,11 @@
* @param key id of the widget
*/
void initBootProto (string key) {
+/*
if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty());
- else if (LanItems::type!="eth") UI::ReplaceWidget(`rp, `Left(
+ else
+*/
+ if (LanItems::type!="eth") UI::ReplaceWidget(`rp, `Left(
`RadioButton(`id(`none),`opt(`notify), _("No IP Address (for Bonding Devices)"))));
switch(settings["BOOTPROTO"]:""){
case "static": UI::ChangeWidget(`id(`bootproto), `CurrentButton, `static);
@@ -464,14 +552,14 @@
if (UI::QueryWidget(`bootproto, `CurrentButton) == `static)
{
string ipa = (string) UI::QueryWidget (`ipaddr, `Value);
- if (! IP::Check(ipa)){
+ if (ipa!="" && !IP::Check(ipa)){
Popup::Error(_("No valid IP address."));
UI::SetFocus(`ipaddr);
return false;
}
string mask=(string) UI::QueryWidget (`netmask, `Value);
- if(!validPrefixOrNetmask(ipa, mask)){
+ if((ipa!="" && mask!="") && !validPrefixOrNetmask(ipa, mask)){
Popup::Error(_("No valid netmask or prefix length."));
UI::SetFocus(`netmask);
return false;
@@ -653,11 +741,15 @@
"help": help["etherdevice"]:"",
],
"BONDSLAVE": $[
- "widget": `multi_selection_box,
+ "widget": `custom,
+ "custom_widget" : `Frame(_("Bond Slaves and Order"), `VBox(
+ `MultiSelectionBox(`id(`msbox_items), `opt(`notify), "", []),
+ `HBox(`PushButton(`id(`up), `opt(`disabled), _("Up") ), `PushButton(`id(`down), `opt(`disabled), _("Down") ) )
+ )),
"label": _("Bond &Slaves"),
- "opt": [`shrinkable],
- "items" : [ ],
+// "opt": [`shrinkable],
"init": InitSlave,
+ "handle": HandleSlave,
"store": StoreSlave,
"help": help["bondslave"]:"",
],
@@ -845,9 +937,12 @@
"TUNNEL_SET_OWNER" : LanItems::tunnel_set_owner,
"TUNNEL_SET_GROUP" : LanItems::tunnel_set_group
];
- } else {
+ }
+/*
+ else {
if(settings["BOOTPROTO"]:"" == "static" && settings["IPADDR"]:"" == "" && !no_dhcp) settings["BOOTPROTO"] = "dhcp";
}
+*/
// #65524
if (LanItems::operation == `add && force_static_ip)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.19.39/src/lan/help.ycp new/yast2-network-2.20.1/src/lan/help.ycp
--- old/yast2-network-2.19.39/src/lan/help.ycp 2010-02-08 16:19:14.000000000 +0100
+++ new/yast2-network-2.20.1/src/lan/help.ycp 2010-10-26 14:40:50.000000000 +0200
@@ -175,7 +175,7 @@
/* Address dialog help 6/8 */
"netmask":
_("<p>For <b>Static Address Setup</b> enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and
-the network mask (usually <tt>255.255.255.0</tt> or just lenght of prefix <tt>/24</tt>). For special case - unconfigured interface use <tt>0.0.0.0</tt> and <tt>/32</tt>.Optionally, you can enter
+the network mask (usually <tt>255.255.255.0</tt> or just lenght of prefix <tt>/24</tt>).Optionally, you can enter
a fully qualified hostname for this IP address. The hostname will be written to <tt>/etc/hosts</tt>.</p>
")
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.19.39/src/modules/Routing.ycp new/yast2-network-2.20.1/src/modules/Routing.ycp
--- old/yast2-network-2.19.39/src/modules/Routing.ycp 2009-12-08 09:20:52.000000000 +0100
+++ new/yast2-network-2.20.1/src/modules/Routing.ycp 2010-11-02 09:35:23.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Routing data (/etc/sysconfig/network/routes)
* Authors: Michal Svec <msvec(a)suse.cz>
*
- * $Id: Routing.ycp 59982 2009-12-07 15:28:12Z kmachalkova $
+ * $Id: Routing.ycp 62691 2010-10-27 11:55:09Z mzugec $
*
* See routes(5)
* Does not work with interface-specific routes yet (ifroute-lo...)
@@ -30,6 +30,8 @@
*/
global list<map> Routes = [];
+// modified by AY (bnc#649494)
+boolean modified = nil;
/**
* Enable IP forwarding
* .sysconfig.sysctl.IP_FORWARD
@@ -58,6 +60,8 @@
*/
global define boolean Modified() {
boolean ret = (Routes != Orig_Routes || Forward != Orig_Forward);
+ // probably called without Read() (bnc#649494)
+ if (Orig_Routes==nil && Orig_Forward==nil && modified!=true) ret = false;
y2debug("ret=%1", ret);
return ret;
}
@@ -226,6 +230,8 @@
Orig_Routes = nil;
Orig_Forward = nil;
+ modified=true;
+
return true;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package upower for openSUSE:Factory
checked in at Wed Nov 10 18:30:18 CET 2010.
--------
--- GNOME/upower/upower.changes 2010-10-31 19:04:59.000000000 +0100
+++ upower/upower.changes 2010-11-10 14:22:09.000000000 +0100
@@ -1,0 +2,19 @@
+Wed Nov 10 14:06:14 CET 2010 - vuntz(a)opensuse.org
+
+- Update to version 0.9.7:
+ + New Features:
+ - Add support for controlling leds keyboard backlights
+ - Port from EggDebug to the GLib built-in logging framework
+ + Bugfixes:
+ - Fix building with gobject-introspection 0.9.10
+ - Fix up all the warnings when building with new versions of
+ gobject-introspection
+ - Keyboard backlight of zero is not an error
+ - libupower-glib: Reject invalid object paths to avoid
+ asserting libdbus
+ - Remove the UP_DEVICE_SUPPLY_CHARGED_THRESHOLD heuristic
+ + Updated translations.
+- Add gobject-introspection-devel BuildRequires to build
+ introspection data.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
upower-0.9.6.tar.bz2
New:
----
upower-0.9.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ upower.spec ++++++
--- /var/tmp/diff_new_pack.Jw2unC/_old 2010-11-10 18:24:54.000000000 +0100
+++ /var/tmp/diff_new_pack.Jw2unC/_new 2010-11-10 18:24:54.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package upower (Version 0.9.6)
+# spec file for package upower (Version 0.9.7)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,13 +20,14 @@
Name: upower
Summary: Power Device Enumeration Framework
-Version: 0.9.6
-Release: 2
+Version: 0.9.7
+Release: 1
License: GPLv2+
Url: http://upower.freedesktop.org/
Group: System/Daemons
Source: %{name}-%{version}.tar.bz2
BuildRequires: dbus-1-glib-devel
+BuildRequires: gobject-introspection-devel
BuildRequires: gtk-doc
BuildRequires: intltool
BuildRequires: libgudev-1_0-devel
@@ -130,6 +131,7 @@
%files -n libupower-glib1
%defattr(-,root,root,-)
%{_libdir}/libupower-glib.so.*
+%{_libdir}/girepository-1.0/UPowerGlib-1.0.typelib
%files -n libupower-glib-devel
%defattr(-,root,root,-)
@@ -138,6 +140,7 @@
%{_includedir}/libupower-glib/
%{_libdir}/pkgconfig/upower-glib.pc
%{_libdir}/libupower-glib.so
+%{_datadir}/gir-1.0/UPowerGlib-1.0.gir
%files -n DeviceKit-power
%defattr(-,root,root,-)
++++++ upower-0.9.6.tar.bz2 -> upower-0.9.7.tar.bz2 ++++++
++++ 7135 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-country for openSUSE:Factory
checked in at Wed Nov 10 18:24:39 CET 2010.
--------
--- yast2-country/yast2-country.changes 2010-10-19 14:54:07.000000000 +0200
+++ yast2-country/yast2-country.changes 2010-11-10 07:57:31.000000000 +0100
@@ -1,0 +2,20 @@
+Wed Nov 10 07:56:37 CET 2010 - jsuchome(a)suse.cz
+
+- fixed broken build
+- 2.20.5
+
+-------------------------------------------------------------------
+Tue Nov 9 15:19:22 CET 2010 - jsuchome(a)suse.cz
+
+- call mkinitrd also when hwclock changes (bnc#638128, bnc#638185)
+- 2.20.4
+
+-------------------------------------------------------------------
+Mon Nov 8 14:24:53 UTC 2010 - lslezak(a)suse.cz
+
+- don't install recommended packages for already installed packages
+ when adding a new language (bnc#439373)
+- start the package manager when there are unresolved dependencies
+- 2.20.3
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-country-2.20.2.tar.bz2
New:
----
yast2-country-2.20.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.iLqNAA/_old 2010-11-10 18:24:05.000000000 +0100
+++ /var/tmp/diff_new_pack.iLqNAA/_new 2010-11-10 18:24:05.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-country (Version 2.20.2)
+# spec file for package yast2-country (Version 2.20.5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-country
-Version: 2.20.2
+Version: 2.20.5
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-country-2.20.2.tar.bz2
+Source0: yast2-country-2.20.5.tar.bz2
Prefix: /usr
@@ -80,7 +80,7 @@
timezone) for yast2.
%prep
-%setup -n yast2-country-2.20.2
+%setup -n yast2-country-2.20.5
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-country-2.20.2.tar.bz2 -> yast2-country-2.20.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.20.2/VERSION new/yast2-country-2.20.5/VERSION
--- old/yast2-country-2.20.2/VERSION 2010-10-19 14:42:10.000000000 +0200
+++ new/yast2-country-2.20.5/VERSION 2010-11-10 07:56:51.000000000 +0100
@@ -1 +1 @@
-2.20.2
+2.20.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.20.2/language/src/language.ycp new/yast2-country-2.20.5/language/src/language.ycp
--- old/yast2-country-2.20.2/language/src/language.ycp 2010-04-15 07:21:15.000000000 +0200
+++ new/yast2-country-2.20.5/language/src/language.ycp 2010-11-08 20:04:17.000000000 +0100
@@ -7,7 +7,7 @@
*
* Purpose: client for language configuration in running system
*
- * $Id: language.ycp 58858 2009-10-01 06:23:49Z jsuchome $
+ * $Id: language.ycp 62766 2010-11-08 16:09:36Z lslezak $
*/
{
@@ -74,16 +74,20 @@
Progress::NextStage ();
boolean enough_space = true;
+ boolean solved = true;
if (Language::PackagesModified () && !no_packages)
{
if (Mode::commandline ())
{
// if not commandline, packages were already initialized in
// select_language
- enough_space = Language::PackagesInit (
+ solved = Language::PackagesInit (
splitstring (Language::languages, ","));
+ enough_space = Language::EnoughSpace();
+
+ y2milestone("Packages solved: %1, enough space; %2", solved, enough_space);
}
- if (enough_space)
+ if (enough_space && solved)
{
Language::PackagesCommit ();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.20.2/language/src/modules/Language.ycp new/yast2-country-2.20.5/language/src/modules/Language.ycp
--- old/yast2-country-2.20.2/language/src/modules/Language.ycp 2010-10-12 15:26:55.000000000 +0200
+++ new/yast2-country-2.20.5/language/src/modules/Language.ycp 2010-11-08 20:04:17.000000000 +0100
@@ -6,7 +6,7 @@
* Thomas Roelz <tom(a)suse.de>
* Maintainer: Jiri Suchomel <jsuchome(a)suse.cz>
*
- * $Id: Language.ycp 60270 2010-01-07 14:09:34Z jsuchome $
+ * $Id: Language.ycp 62766 2010-11-08 16:09:36Z lslezak $
*/
{
@@ -889,20 +889,68 @@
y2milestone ("Saved data for language: <%1>", loc);
}
+boolean reset_recommended = true;
+
+// unselect all selected packages (bnc#439373)
+//
+// this is a workaround for installing recommened packages for already
+// installed packages - we cannot simply set the solver flag
+// as the laguage packages are also recommended, this would cause that
+// no language package would be installed
+//
+// do this just once at the beginning
+void ResetRecommendedPackaged()
+{
+ if (!reset_recommended)
+ {
+ return;
+ }
+
+ Pkg::PkgSolve(true);
+
+ list<map> selected_packages = Pkg::ResolvableProperties("", `package, "");
+
+ y2milestone("Unselecting already recommended packages");
+
+ // unselect them
+ foreach(map package, selected_packages,
+ {
+ if (package["status"]:`unknown == `selected)
+ {
+ y2milestone("Unselecting package: %1", package["name"]:"");
+ Pkg::PkgNeutral(package["name"]:"");
+ }
+ }
+ );
+
+ reset_recommended = false;
+}
+
/**
* Initializes source and target,
* computes the packages necessary to install and uninstall,
- * checks for disk space (#50745)
- * @return false when there is not enough disk space for new packages
+ * @return false if the solver failed (unresolved dependencies)
*/
global define boolean PackagesInit (list<string> selected_languages) {
PackageSystem::EnsureSourceInit ();
PackageSystem::EnsureTargetInit ();
+ ResetRecommendedPackaged();
+
Pkg::SetAdditionalLocales (selected_languages);
- Pkg::PkgSolve (true);
+ boolean solved = Pkg::PkgSolve (true);
+
+ return solved;
+}
+
+/*
+ * checks for disk space (#50745)
+ * @return false when there is not enough disk space for new packages
+ */
+global define boolean EnoughSpace()
+{
boolean ok = true;
foreach (string mountpoint, list<integer> usage, Pkg::TargetGetDU (), {
if (usage[2]:0 > usage[0]:0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.20.2/language/src/select_language.ycp new/yast2-country-2.20.5/language/src/select_language.ycp
--- old/yast2-country-2.20.2/language/src/select_language.ycp 2010-10-12 15:28:43.000000000 +0200
+++ new/yast2-country-2.20.5/language/src/select_language.ycp 2010-11-08 20:04:17.000000000 +0100
@@ -15,7 +15,7 @@
* Summary:
* This client shows main dialog for choosing the language.
*
- * $Id: select_language.ycp 62605 2010-10-12 13:28:43Z jsuchome $
+ * $Id: select_language.ycp 62766 2010-11-08 16:09:36Z lslezak $
*
*/
{
@@ -35,6 +35,7 @@
import "Stage";
import "Timezone";
import "Wizard";
+ import "PackagesUI";
string language = Language::language;
@@ -619,7 +620,22 @@
}
else if (Language::PackagesModified () && !Mode::config ())
{
- if (!Language::PackagesInit (selected_languages))
+ if (!Language::PackagesInit(selected_languages))
+ {
+ // error message - package solver failed
+ Report::Error (_("There are unresolved package dependencies."));
+
+ // run the package selector
+
+ // disable repomanagement during installation
+ boolean repomgmt = !Mode::installation();
+ // start the package selector
+ PackagesUI::RunPackageSelector($[ "enable_repo_mgr" : repomgmt, "mode" : `summaryMode ]);
+
+ ret = `not_next;
+ continue;
+ }
+ if (!Language::EnoughSpace())
{
// error message
Report::Error (_("There is not enough space to install all additional packages.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.20.2/timezone/data/timezone_raw.ycp new/yast2-country-2.20.5/timezone/data/timezone_raw.ycp
--- old/yast2-country-2.20.2/timezone/data/timezone_raw.ycp 2010-10-19 14:40:58.000000000 +0200
+++ new/yast2-country-2.20.5/timezone/data/timezone_raw.ycp 2010-10-19 14:42:36.000000000 +0200
@@ -3,7 +3,7 @@
* Authors: Thomas Roelz <tom(a)suse.de>
* Summary: The untranslated timezone database.
*
- * $Id: timezone_raw.ycp 47033 2008-04-24 12:20:48Z jsuchome $
+ * $Id: timezone_raw.ycp 62652 2010-10-19 12:42:35Z jsuchome $
*
* *****************************************************************
* In case of changes please keep the following files in sync:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.20.2/timezone/src/Timezone.ycp new/yast2-country-2.20.5/timezone/src/Timezone.ycp
--- old/yast2-country-2.20.2/timezone/src/Timezone.ycp 2010-08-17 10:15:22.000000000 +0200
+++ new/yast2-country-2.20.5/timezone/src/Timezone.ycp 2010-11-10 07:55:58.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Klaus Kaempf <kkaempf(a)suse.de>
* Thomas Roelz <tom(a)suse.de>
*
- * $Id: Timezone.ycp 62382 2010-08-17 08:15:21Z jsuchome $
+ * $Id: Timezone.ycp 62785 2010-11-09 14:48:32Z jsuchome $
*/
{
@@ -59,6 +59,8 @@
*/
global boolean windows_partition = false;
+// if mkinitrd should be called at the end
+global boolean call_mkinitrd = false;
// translation of correct timezone to the one that could be shown in map widget
global map <string,string> yast2zonetab = $[
@@ -754,6 +756,11 @@
y2milestone( "Save Saved data for timezone: <%1>", timezone );
+ if (call_mkinitrd && !Stage::initial ())
+ {
+ CallMkinitrd ();
+ }
+
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.20.2/timezone/src/dialogs.ycp new/yast2-country-2.20.5/timezone/src/dialogs.ycp
--- old/yast2-country-2.20.2/timezone/src/dialogs.ycp 2010-08-17 10:15:22.000000000 +0200
+++ new/yast2-country-2.20.5/timezone/src/dialogs.ycp 2010-11-09 15:48:32.000000000 +0100
@@ -11,7 +11,7 @@
* Summary:
* Dialogs for timeone and time configuration.
*
- * $Id: dialogs.ycp 62382 2010-08-17 08:15:21Z jsuchome $
+ * $Id: dialogs.ycp 62785 2010-11-09 14:48:32Z jsuchome $
*/
{
textdomain "country";
@@ -392,10 +392,7 @@
if (Timezone::hwclock == "--localtime" && !Stage::initial ())
{
- // busy message
- Popup::ShowFeedback ("", _("Updating initrd..."));
- Timezone::CallMkinitrd ();
- Popup::ClearFeedback ();
+ Timezone::call_mkinitrd = true;
}
}
}
@@ -439,6 +436,7 @@
boolean changed_time = false;
string timezone = Timezone::timezone;
string timezone_old = timezone;
+ string timezone_initial = timezone;
string hwclock = Timezone::hwclock;
y2milestone ( "timezone_old %1", timezone_old );
@@ -875,6 +873,12 @@
Timezone::user_decision = true;
Timezone::user_hwclock = true;
Timezone::ntp_used = ntp_used;
+ // See bnc#638185c5: refresh_initrd should be called if HWCLOCK is changed (--localtime <-> --utc) and/or
+ // if --localtime is set and TIMEZONE will be changed.
+ if (hwclock_s != hwclock_s_initial || (hwclock_s == `hwclock_localtime && timezone != timezone_initial))
+ {
+ Timezone::call_mkinitrd = true;
+ }
if (ntp_used && ntp_server != "")
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package parted for openSUSE:Factory
checked in at Wed Nov 10 18:23:47 CET 2010.
--------
--- parted/parted.changes 2010-09-17 16:52:04.000000000 +0200
+++ parted/parted.changes 2010-11-09 13:22:31.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 9 12:16:04 UTC 2010 - puzel(a)novell.com
+
+- updated always_print_geom.diff to print also physical/logical
+ sector size (patch by Arvin Schnell)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ parted.spec ++++++
--- /var/tmp/diff_new_pack.lZKxYd/_old 2010-11-10 18:23:06.000000000 +0100
+++ /var/tmp/diff_new_pack.lZKxYd/_new 2010-11-10 18:23:06.000000000 +0100
@@ -19,7 +19,7 @@
Name: parted
Version: 2.3
-Release: 3
+Release: 4
License: GPLv3+
Summary: GNU partitioner
Url: http://www.gnu.org/software/parted/
++++++ always_print_geom.diff ++++++
--- /var/tmp/diff_new_pack.lZKxYd/_old 2010-11-10 18:23:06.000000000 +0100
+++ /var/tmp/diff_new_pack.lZKxYd/_new 2010-11-10 18:23:06.000000000 +0100
@@ -2,12 +2,14 @@
===================================================================
--- parted/parted.c.orig 2010-07-08 13:29:24.000000000 +0200
+++ parted/parted.c 2010-07-08 13:29:28.000000000 +0200
-@@ -1437,8 +1437,20 @@ do_print (PedDevice** dev)
+@@ -1437,8 +1437,22 @@ do_print (PedDevice** dev)
wchar_t* table_rendered;
disk = ped_disk_new (*dev);
- if (!disk)
+ if (!disk) {
++ printf (_("Sector size (logical/physical): %lldB/%lldB\n"),
++ (*dev)->sector_size, (*dev)->phys_sector_size);
+ if (ped_unit_get_default () == PED_UNIT_CHS ||
+ ped_unit_get_default () == PED_UNIT_CYLINDER) {
+ PedCHSGeometry* chs = &(*dev)->bios_geom;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package freeglut for openSUSE:Factory
checked in at Wed Nov 10 18:19:52 CET 2010.
--------
--- freeglut/freeglut.changes 2010-08-31 15:43:25.000000000 +0200
+++ freeglut/freeglut.changes 2010-11-09 10:33:53.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Nov 9 09:32:17 UTC 2010 - sndirsch(a)novell.com
+
+- xdriinfo 1.0.4
+ * This minor maintenance release provides the usual recent
+ collection of build configuration improvements and janitorial
+ cleanups.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xdriinfo-1.0.3.tar.bz2
New:
----
xdriinfo-1.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ freeglut.spec ++++++
--- /var/tmp/diff_new_pack.ddORoc/_old 2010-11-10 18:19:33.000000000 +0100
+++ /var/tmp/diff_new_pack.ddORoc/_new 2010-11-10 18:19:33.000000000 +0100
@@ -22,13 +22,13 @@
BuildRequires: Mesa-devel gcc-c++ libdrm-devel pkgconfig xorg-x11-devel
Summary: Freely licensed alternative to the GLUT library
Version: 100529
-Release: 1
+Release: 2
Url: http://freeglut.sourceforge.net/
%define USE_EXTERNAL_MESA 1
Source0: freeglut-%{version}.tar.bz2
Source1: glutman.tar.bz2
Source2: glxdemos.tar.bz2
-Source3: xdriinfo-1.0.3.tar.bz2
+Source3: xdriinfo-1.0.4.tar.bz2
Source4: compat70.tar.bz2
Source5: baselibs.conf
Patch1: glxdemos.diff
++++++ xdriinfo-1.0.3.tar.bz2 -> xdriinfo-1.0.4.tar.bz2 ++++++
++++ 8752 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdriinfo-1.0.3/ChangeLog new/xdriinfo-1.0.4/ChangeLog
--- old/xdriinfo-1.0.3/ChangeLog 2009-10-17 01:27:04.000000000 +0200
+++ new/xdriinfo-1.0.4/ChangeLog 2010-11-09 08:02:58.000000000 +0100
@@ -1,3 +1,111 @@
+commit 1c67a45b6d9974469e3cbfc6da06e88d8b11ded2
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Nov 8 23:02:10 2010 -0800
+
+ xdriinfo 1.0.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit eda29cff30b4d86a6ae202d9ec7b9e53053038d7
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Nov 8 00:01:53 2010 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM sttaements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit dcdb41471ddb985fe837f12ddea33ddd59e7499e
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 23:59:52 2010 -0800
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+ AC_TYPE_SIGNAL was not used in xdriinfo
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit cc5faefb86c79aea188ebb0cd1d1c5b2f9ac54fb
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 23:58:42 2010 -0800
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 672494b0974d6d0b04cdf1d1003d996e48623fee
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Sun Nov 7 23:58:05 2010 -0800
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 60771e4bf3f70d28c8b4b1833655261c853e35d7
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Nov 26 09:19:53 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 154841cf9c1aa8abb1e010f8b16fd71736a1f750
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Wed Oct 28 14:09:08 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit 22dd0b3f6fce230a58a7552d56b5f582ef5e8abe
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Mon Oct 26 22:08:38 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit 7b698f1a4e5706db509d3db63fa94f5648e7a690
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Oct 22 12:34:15 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit 87def102d6aa06ac730791426c61a7af00772ffb
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Sun Sep 27 15:33:12 2009 -0400
+
+ Makefile.am: do not include autogen.sh in distribution #24183
+
+ This is a private build script that should not be distributed
+
commit a5041bd0be9d1b54f4e6683c141745f5ed0d6294
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
Date: Fri Oct 16 16:20:33 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdriinfo-1.0.3/INSTALL new/xdriinfo-1.0.4/INSTALL
--- old/xdriinfo-1.0.3/INSTALL 2006-07-11 04:52:28.000000000 +0200
+++ new/xdriinfo-1.0.4/INSTALL 2010-11-09 08:02:58.000000000 +0100
@@ -1,16 +1,19 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
-This file is free documentation; the Free Software Foundation gives
+ This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
-These are generic installation instructions.
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +26,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -67,51 +67,66 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
Compilers and Options
=====================
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
Installation Names
==================
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
@@ -125,7 +140,7 @@
Optional Features
=================
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -137,14 +152,36 @@
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
Specifying the System Type
==========================
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -159,7 +196,7 @@
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
@@ -170,9 +207,9 @@
Sharing Defaults
================
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +218,7 @@
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -190,21 +227,29 @@
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
`--version'
`-V'
@@ -231,6 +276,16 @@
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdriinfo-1.0.3/Makefile.am new/xdriinfo-1.0.4/Makefile.am
--- old/xdriinfo-1.0.3/Makefile.am 2009-10-17 01:19:10.000000000 +0200
+++ new/xdriinfo-1.0.4/Makefile.am 2010-11-08 08:58:27.000000000 +0100
@@ -34,37 +34,22 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
+EXTRA_DIST = $(appman_PRE) autogen.sh
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-MAINTAINERCLEANFILES=ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
-
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+dist-hook: ChangeLog INSTALL
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdriinfo-1.0.3/config.h.in new/xdriinfo-1.0.4/config.h.in
--- old/xdriinfo-1.0.3/config.h.in 2009-10-17 01:20:52.000000000 +0200
+++ new/xdriinfo-1.0.4/config.h.in 2010-11-09 08:02:46.000000000 +0100
@@ -42,6 +42,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
@@ -54,9 +57,6 @@
/* Patch version of this package */
#undef PACKAGE_VERSION_PATCHLEVEL
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdriinfo-1.0.3/configure.ac new/xdriinfo-1.0.4/configure.ac
--- old/xdriinfo-1.0.3/configure.ac 2009-10-17 01:20:22.000000000 +0200
+++ new/xdriinfo-1.0.4/configure.ac 2010-11-09 08:01:46.000000000 +0100
@@ -20,29 +20,25 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xdriinfo, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xdriinfo)
-AM_INIT_AUTOMAKE([dist-bzip2])
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([xdriinfo], [1.0.4],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xdriinfo])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-
-AC_TYPE_SIGNAL
-
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XDRIINFO, x11 glproto)
-AC_SUBST(XDRIINFO_CFLAGS)
-AC_SUBST(XDRIINFO_LIBS)
# Checks for non-pkg-config packages (Mesa or vendor OpenGL)
AC_SEARCH_LIBS([glXGetProcAddressARB], [GL], [],
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package cronie for openSUSE:Factory
checked in at Wed Nov 10 18:19:22 CET 2010.
--------
--- cronie/cronie.changes 2010-11-08 14:16:13.000000000 +0100
+++ cronie/cronie.changes 2010-11-09 16:38:25.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 9 15:38:33 UTC 2010 - cristian.rodriguez(a)opensuse.org
+
+- use full RELRO here.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cronie.spec ++++++
--- /var/tmp/diff_new_pack.whtMVD/_old 2010-11-10 18:18:28.000000000 +0100
+++ /var/tmp/diff_new_pack.whtMVD/_new 2010-11-10 18:18:28.000000000 +0100
@@ -30,7 +30,7 @@
AutoReqProv: on
PreReq: permissions %fillup_prereq %insserv_prereq cron
Version: 1.4.6
-Release: 3
+Release: 4
%{expand: %%define cronie_version %version}
Summary: Cron Daemon
Source0: %name-%version.tar.xz
@@ -68,7 +68,7 @@
%package -n cron
License: MIT and BSD and GPLv2
Version: 4.2
-Release: 5
+Release: 6
Summary: Auxiliary package
Group: System/Daemons
Requires: %{name} = %{cronie_version}-%{release}
@@ -97,7 +97,8 @@
%build
autoreconf -fiv
# fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked
-CFLAGS="$RPM_OPT_FLAGS -DCRON_VERSION=\\\"%{version}\\\""
+export CFLAGS="$RPM_OPT_FLAGS -DCRON_VERSION=\\\"%{version}\\\""
+export LDFLAGS="-Wl,-z,relro,-z,now,-z,defs"
%configure --with-audit --enable-anacron --with-pam --with-selinux --with-inotify --enable-pie SPOOL_DIR="/var/spool/cron/tabs"
%{__make} %{?_smp_mflags}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package mozilla-nss for openSUSE:Factory
checked in at Wed Nov 10 18:17:54 CET 2010.
--------
--- GNOME/mozilla-nss/mozilla-nss.changes 2010-09-25 08:29:20.000000000 +0200
+++ mozilla-nss/mozilla-nss.changes 2010-11-09 10:11:39.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 9 08:51:51 UTC 2010 - wr(a)rosenauer.org
+
+- replaced expired PayPal test certificate (fixing testsuite)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
PayPalEE.cert
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozilla-nss.spec ++++++
--- /var/tmp/diff_new_pack.1Ftu3V/_old 2010-11-10 18:16:21.000000000 +0100
+++ /var/tmp/diff_new_pack.1Ftu3V/_new 2010-11-10 18:16:21.000000000 +0100
@@ -30,7 +30,7 @@
%endif
License: GPLv2+ ; LGPLv2.1+ ; MPL
Version: 3.12.8
-Release: 1
+Release: 2
# bug437293
%ifarch ppc64
Obsoletes: mozilla-nss-64bit
@@ -49,6 +49,7 @@
Source7: cert9.db
Source8: key4.db
Source9: pkcs11.txt
+Source10: PayPalEE.cert
Patch1: nss-opt.patch
Patch3: system-nspr.patch
Patch4: char.patch
@@ -178,8 +179,9 @@
#make generate
%build
-export FREEBL_NO_DEPEND=1
cd mozilla/security/nss
+cp %SOURCE10 tests/libpkix/certs/PayPalEE.cert
+export FREEBL_NO_DEPEND=1
export NSPR_INCLUDE_DIR=`nspr-config --includedir`
export NSPR_LIB_DIR=`nspr-config --libdir`
export OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Wed Nov 10 18:15:56 CET 2010.
--------
--- xorg-x11/xorg-x11.changes 2010-11-06 18:43:04.000000000 +0100
+++ xorg-x11/xorg-x11.changes 2010-11-09 10:30:25.000000000 +0100
@@ -1,0 +2,22 @@
+Tue Nov 9 09:28:41 UTC 2010 - sndirsch(a)novell.com
+
+- xclipboard 1.1.1
+ * This minor maintenance release provides the usual recent
+ collection of build configuration improvements and janitorial
+ cleanups.
+- xgamma 1.0.4
+ * This minor maintenance release provides the usual recent
+ collection of build configuration improvements and janitorial
+ cleanups.
+
+-------------------------------------------------------------------
+Mon Nov 8 22:26:30 UTC 2010 - sndirsch(a)novell.com
+
+- xwd 1.0.4/
+ xwud 1.0.3/
+ mkfontdir 1.0.6
+ * This minor maintenance release provides the usual recent
+ collection of build configuration improvements and janitorial
+ cleanups.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
mkfontdir-1.0.5.tar.bz2
xclipboard-1.1.0.tar.bz2
xgamma-1.0.3.tar.bz2
xwd-1.0.3.tar.bz2
xwud-1.0.2.tar.bz2
New:
----
mkfontdir-1.0.6.tar.bz2
xclipboard-1.1.1.tar.bz2
xgamma-1.0.4.tar.bz2
xwd-1.0.4.tar.bz2
xwud-1.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.toSQgG/_old 2010-11-10 18:13:21.000000000 +0100
+++ /var/tmp/diff_new_pack.toSQgG/_new 2010-11-10 18:13:21.000000000 +0100
@@ -23,7 +23,7 @@
BuildRequires: bison
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 30
+Release: 31
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -46,7 +46,7 @@
Source10: lbxproxy-1.0.2.tar.bz2
Source11: listres-1.0.2.tar.bz2
Source12: luit-1.1.0.tar.bz2
-Source14: mkfontdir-1.0.5.tar.bz2
+Source14: mkfontdir-1.0.6.tar.bz2
Source15: mkfontscale-1.0.8.tar.bz2
Source16: oclock-1.0.2.tar.bz2
Source17: proxymngr-1.0.2.tar.bz2
@@ -63,7 +63,7 @@
Source28: xauth-1.0.5.tar.bz2
Source29: xbiff-1.0.2.tar.bz2
Source30: xcalc-1.0.3.tar.bz2
-Source31: xclipboard-1.1.0.tar.bz2
+Source31: xclipboard-1.1.1.tar.bz2
Source32: xclock-1.0.5.tar.bz2
Source33: xcmsdb-1.0.3.tar.bz2
Source34: xconsole-1.0.4.tar.bz2
@@ -83,7 +83,7 @@
Source49: xfs-1.1.1.tar.bz2
Source50: xfsinfo-1.0.3.tar.bz2
Source51: xfwp-X11R7.0-1.0.1.tar.bz2
-Source52: xgamma-1.0.3.tar.bz2
+Source52: xgamma-1.0.4.tar.bz2
Source53: xgc-1.0.3.tar.bz2
Source54: xhost-1.0.4.tar.bz2
Source55: xinit-1.3.0.tar.bz2
@@ -120,9 +120,9 @@
Source87: xtrap-X11R7.1-1.0.2.tar.bz2
Source88: xvidtune-1.0.2.tar.bz2
Source89: xvinfo-1.1.1.tar.bz2
-Source90: xwd-1.0.3.tar.bz2
+Source90: xwd-1.0.4.tar.bz2
Source91: xwininfo-1.1.1.tar.bz2
-Source92: xwud-1.0.2.tar.bz2
+Source92: xwud-1.0.3.tar.bz2
Source93: mkcomposecache-1.2.1.tar.bz2
Source94: rendercheck-1.3.tar.bz2
Source96: xbacklight-1.1.1.tar.bz2
++++++ mkfontdir-1.0.5.tar.bz2 -> mkfontdir-1.0.6.tar.bz2 ++++++
++++ 8417 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontdir-1.0.5/ChangeLog new/mkfontdir-1.0.6/ChangeLog
--- old/mkfontdir-1.0.5/ChangeLog 2009-10-11 07:48:28.000000000 +0200
+++ new/mkfontdir-1.0.6/ChangeLog 2010-11-07 20:16:22.000000000 +0100
@@ -1,3 +1,108 @@
+commit 3122bbfac0a6ef937b0d3058bf65a901f420ec7d
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 11:14:14 2010 -0800
+
+ Drop CVS version tag from mkfontdir.cpp too
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 5a57ccd8ee6f7b5692b2b3f9b3135c05282dae4b
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 11:12:11 2010 -0800
+
+ config: Add missing AC_CONFIG_SRCDIR
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM sttaements under the Automake initialization section.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 8ee1e27b63c5f90bcf8a9b55b947f3b0a00eaf91
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 11:10:09 2010 -0800
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_SED & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit b03b1b175d551a4990d1c3ee2cf710592112095e
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 11:09:27 2010 -0800
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 103f1b40357aee8099fd6071e11b710c516f6053
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Sun Nov 7 11:06:20 2010 -0800
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit e252249722a5eda00bf6b10601d4dbdae9de1d00
+Author: Jesse Adkins <jesserayadkins(a)gmail.com>
+Date: Tue Sep 28 13:29:49 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com>
+
+commit 8fd1d5d18a567c46982e5c9f3918e24a38e7329e
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Nov 26 09:19:52 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit c6975a3be5cb34a3d1fd5bbf65816923bd5b2394
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Wed Oct 28 14:09:07 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit 47b4daf16e246c1fc23073a5cc692da702dcc2d8
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Mon Oct 26 22:08:38 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit c258f52cfb477d7bd48dca503b8a8842e6b17513
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Oct 22 12:34:14 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
commit e8be20c2cd3ba3ac94b3a9d9b5a22b31aa2686a8
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
Date: Sat Oct 10 22:47:34 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontdir-1.0.5/INSTALL new/mkfontdir-1.0.6/INSTALL
--- old/mkfontdir-1.0.5/INSTALL 2006-07-11 04:51:18.000000000 +0200
+++ new/mkfontdir-1.0.6/INSTALL 2010-11-07 20:16:22.000000000 +0100
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontdir-1.0.5/Makefile.am new/mkfontdir-1.0.6/Makefile.am
--- old/mkfontdir-1.0.5/Makefile.am 2009-10-11 07:35:36.000000000 +0200
+++ new/mkfontdir-1.0.6/Makefile.am 2010-11-07 20:08:49.000000000 +0100
@@ -27,6 +27,7 @@
$(AM_V_GEN)$(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < $< | $(SED) s/XCOMM/\#/ > $@
EXTRA_DIST = mkfontdir.cpp
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(bin_SCRIPTS)
appmandir = $(APP_MAN_DIR)
@@ -36,34 +37,19 @@
EXTRA_DIST += $(appman_PRE)
CLEANFILES += $(appman_DATA)
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man .cpp
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontdir-1.0.5/configure.ac new/mkfontdir-1.0.6/configure.ac
--- old/mkfontdir-1.0.5/configure.ac 2009-10-11 07:47:17.000000000 +0200
+++ new/mkfontdir-1.0.6/configure.ac 2010-11-07 20:15:56.000000000 +0100
@@ -20,20 +20,22 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(mkfontdir, [1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] mkfontdir)
-AM_INIT_AUTOMAKE([dist-bzip2 foreign])
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([mkfontdir], [1.0.6],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [mkfontdir])
+AC_CONFIG_SRCDIR([Makefile.am])
+
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AC_PROG_INSTALL
-
-AC_PATH_PROG(SED, sed)
AC_SUBST([bindir])
AC_OUTPUT([Makefile])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontdir-1.0.5/mkfontdir.cpp new/mkfontdir-1.0.6/mkfontdir.cpp
--- old/mkfontdir-1.0.5/mkfontdir.cpp 2006-07-11 04:51:18.000000000 +0200
+++ new/mkfontdir-1.0.6/mkfontdir.cpp 2010-11-07 20:13:38.000000000 +0100
@@ -1,4 +1,3 @@
XCOMM!/bin/sh
-XCOMM $XFree86: xc/programs/mkfontdir/mkfontdir,v 1.2 2003/07/18 14:51:43 tsi Exp $
exec BINDIR/mkfontscale -b -s -l "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontdir-1.0.5/mkfontdir.man new/mkfontdir-1.0.6/mkfontdir.man
--- old/mkfontdir-1.0.5/mkfontdir.man 2008-01-07 23:44:06.000000000 +0100
+++ new/mkfontdir-1.0.6/mkfontdir.man 2010-10-07 05:32:54.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: mkfontdir.man,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $
.\" Copyright 1993, 1994, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,8 +22,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/mkfontdir/mkfontdir.man,v 1.14 2001/11/01 23:35:34 dawes Exp $
-.\"
.TH MKFONTDIR __appmansuffix__ __xorgversion__
.SH NAME
mkfontdir \- create an index of X font files in a directory
++++++ xclipboard-1.1.0.tar.bz2 -> xclipboard-1.1.1.tar.bz2 ++++++
++++ 9068 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclipboard-1.1.0/COPYING new/xclipboard-1.1.1/COPYING
--- old/xclipboard-1.1.0/COPYING 2006-07-11 04:52:04.000000000 +0200
+++ new/xclipboard-1.1.1/COPYING 2010-11-08 08:49:21.000000000 +0100
@@ -1,12 +1,21 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 1989, 1994, 1998 The Open Group
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclipboard-1.1.0/ChangeLog new/xclipboard-1.1.1/ChangeLog
--- old/xclipboard-1.1.0/ChangeLog 2009-10-15 07:38:03.000000000 +0200
+++ new/xclipboard-1.1.1/ChangeLog 2010-11-09 07:53:49.000000000 +0100
@@ -1,3 +1,149 @@
+commit 4c5ba0adecd411786b11bd34122cd498ba980c01
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Nov 8 22:53:01 2010 -0800
+
+ xclipboard 1.1.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit de80ed3de8490eabcba3618f10c18b2d646e1669
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 23:55:47 2010 -0800
+
+ include "config.h" in *.c files for autoconf definitions
+
+ Actually enables the #ifdef XKB code that commit f16c6dd23a
+ attempted to enable
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 254b55b9a7ec350c3b2f857217ef93ffced3b91d
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 23:50:49 2010 -0800
+
+ Purge CVS version tags
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 0272c10c35be588a76c27253ba1c94750b89cf61
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 23:47:47 2010 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM sttaements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 163f783b9bef4348d8488b6b927c67406c8a40b6
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 23:46:00 2010 -0800
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit d043044ab9949b6e15479ede69023f78f00081ee
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 23:45:13 2010 -0800
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 4aa31642993ed592a22214791e06516d3316b226
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Sun Nov 7 23:43:21 2010 -0800
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 2fa9cd45301c6f56a89845776fb88b5d9922d811
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Aug 6 08:37:48 2010 -0700
+
+ Fill in COPYING file with copyright notices from source code
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 5802b699a985522f2b1e4580b9a6b194b129b62e
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Sat Dec 19 20:48:47 2009 -0500
+
+ configure.ac: use backticks rather than $() for cmd subs
+
+ Use "$PKG_CONFIG" rather than hard coded "pkg-config"
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+
+commit 7c961835a6ae4aedfe6d340f24f8855f91d9b87d
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Nov 26 09:19:53 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit b673f5c871ab3cd6366dacfd001636836618a03b
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Wed Oct 28 14:09:08 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit 5210e2aa9a83647bdb2d3407963a0a844c25ea4e
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Tue Oct 27 15:07:24 2009 -0400
+
+ Deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit 6734b4d24af6ca98ab41b824a858be5338c541b6
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Mon Oct 26 22:08:38 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit ebb429922a8e5d0108f53ccbb34215f554641326
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Oct 22 12:34:15 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
commit 96d1fe9241f6b68d52c9b3020dd926319d830558
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
Date: Wed Oct 14 22:37:17 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclipboard-1.1.0/INSTALL new/xclipboard-1.1.1/INSTALL
--- old/xclipboard-1.1.0/INSTALL 2006-07-11 04:52:04.000000000 +0200
+++ new/xclipboard-1.1.1/INSTALL 2010-11-09 07:53:49.000000000 +0100
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclipboard-1.1.0/Makefile.am new/xclipboard-1.1.1/Makefile.am
--- old/xclipboard-1.1.0/Makefile.am 2009-10-14 04:46:20.000000000 +0200
+++ new/xclipboard-1.1.1/Makefile.am 2010-11-08 08:49:21.000000000 +0100
@@ -58,38 +58,22 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclipboard-1.1.0/app-defaults/XClipboard new/xclipboard-1.1.1/app-defaults/XClipboard
--- old/xclipboard-1.1.0/app-defaults/XClipboard 2009-01-13 06:46:49.000000000 +0100
+++ new/xclipboard-1.1.1/app-defaults/XClipboard 2010-11-08 08:49:21.000000000 +0100
@@ -1,4 +1,3 @@
-! $Xorg: XClipboard.ad,v 1.3 2000/08/17 19:54:12 cpqbld Exp $
*Command*Font: -*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
*Label*Font: -*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
*Text*Font: -*-courier-medium-r-normal--*-120-*-*-*-*-iso8859-1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclipboard-1.1.0/config.h.in new/xclipboard-1.1.1/config.h.in
--- old/xclipboard-1.1.0/config.h.in 2009-10-15 07:37:41.000000000 +0200
+++ new/xclipboard-1.1.1/config.h.in 2010-11-09 07:53:30.000000000 +0100
@@ -42,6 +42,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclipboard-1.1.0/configure.ac new/xclipboard-1.1.1/configure.ac
--- old/xclipboard-1.1.0/configure.ac 2009-10-15 07:37:03.000000000 +0200
+++ new/xclipboard-1.1.1/configure.ac 2010-11-09 07:52:09.000000000 +0100
@@ -21,21 +21,20 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xclipboard, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xclipboard)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT([xclipboard], [1.1.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xclipboard])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
@@ -44,19 +43,14 @@
AC_DEFINE([XKB], [1], [Define to use libxkbfile calls like XKBStdBell()])
fi
PKG_CHECK_MODULES(XCLIPBOARD, [xaw7 xmu xt x11 ${XKBPKG}])
-AC_SUBST(XCLIPBOARD_CFLAGS)
-AC_SUBST(XCLIPBOARD_LIBS)
PKG_CHECK_MODULES(APPDEFS, xt)
-xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
AC_ARG_WITH(appdefaultdir,
AC_HELP_STRING([--with-appdefaultdir=<pathname>],
[specify directory for app-defaults files (default is autodetected)]),
[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
AC_SUBST(appdefaultdir)
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclipboard-1.1.0/xclipboard.c new/xclipboard-1.1.1/xclipboard.c
--- old/xclipboard-1.1.0/xclipboard.c 2009-01-13 06:46:49.000000000 +0100
+++ new/xclipboard-1.1.1/xclipboard.c 2010-11-08 08:54:32.000000000 +0100
@@ -1,7 +1,5 @@
/*
- * $Xorg: xclipboard.c,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $
- *
- *
+
Copyright 1989, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
@@ -29,7 +27,10 @@
* Reauthored by: Keith Packard, MIT X Consortium.
* UTF-8 and CTEXT support: Stanislav Maslovski <stanislav.maslovski(a)gmail.com>
*/
-/* $XFree86: xc/programs/xclipboard/xclipboard.c,v 1.8tsi Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <stdio.h>
#include <X11/Intrinsic.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclipboard-1.1.0/xclipboard.man new/xclipboard-1.1.1/xclipboard.man
--- old/xclipboard-1.1.0/xclipboard.man 2006-07-11 04:52:04.000000000 +0200
+++ new/xclipboard-1.1.1/xclipboard.man 2010-11-08 08:49:21.000000000 +0100
@@ -1,4 +1,3 @@
-.\" $Xorg: xclipboard.man,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $
.\" Copyright 1988, 1994, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,7 +22,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/xclipboard/xclipboard.man,v 1.8 2001/12/14 20:01:16 dawes Exp $
.\"
.TH XCLIPBOARD 1 __xorgversion__
.SH NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclipboard-1.1.0/xcutsel.c new/xclipboard-1.1.1/xcutsel.c
--- old/xclipboard-1.1.0/xcutsel.c 2009-01-13 06:46:49.000000000 +0100
+++ new/xclipboard-1.1.1/xcutsel.c 2010-11-08 08:54:20.000000000 +0100
@@ -1,7 +1,5 @@
/*
- * $Xorg: xcutsel.c,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $
- *
- *
+
Copyright 1989, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
@@ -26,7 +24,10 @@
* *
* Author: Ralph Swick, DEC/Project Athena
*/
-/* $XFree86: xc/programs/xclipboard/xcutsel.c,v 1.7 2001/04/01 14:00:19 tsi Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <stdio.h>
#include <stdlib.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclipboard-1.1.0/xcutsel.man new/xclipboard-1.1.1/xcutsel.man
--- old/xclipboard-1.1.0/xcutsel.man 2006-07-11 04:52:04.000000000 +0200
+++ new/xclipboard-1.1.1/xcutsel.man 2010-11-08 08:49:21.000000000 +0100
@@ -1,4 +1,3 @@
-.\" $Xorg: xcutsel.man,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $
.\" Copyright 1994, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,7 +22,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/xclipboard/xcutsel.man,v 1.7 2001/01/27 18:21:09 dawes Exp $
.\"
.TH XCUTSEL 1 __xorgversion__
.SH NAME
++++++ xgamma-1.0.3.tar.bz2 -> xgamma-1.0.4.tar.bz2 ++++++
++++ 8590 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgamma-1.0.3/ChangeLog new/xgamma-1.0.4/ChangeLog
--- old/xgamma-1.0.3/ChangeLog 2009-10-14 01:47:18.000000000 +0200
+++ new/xgamma-1.0.4/ChangeLog 2010-11-09 08:48:37.000000000 +0100
@@ -1,3 +1,110 @@
+commit 61701510136abb205116555a835f98a3c2f40183
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Nov 8 23:48:04 2010 -0800
+
+ xgamma 1.0.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 2a3dc77313922babd364a8550312ec00ba262826
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Nov 8 00:13:50 2010 -0800
+
+ Purge CVS version tags
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 97387d8350fccd1de0b2dec2bf6886e82f054527
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Nov 8 00:12:15 2010 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM sttaements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 69ee0754e697737d002d8f7008d5dc94fd66041e
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Nov 8 00:10:49 2010 -0800
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 4361837a352b40332ab84b6716a69413716720dc
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Nov 8 00:10:09 2010 -0800
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 06d2420091d23a95eba8de84f24e042238facbe5
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Mon Nov 8 00:09:32 2010 -0800
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 6b903fc93f1a2bd9a06ba541c2b99289938fc43a
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Nov 26 09:19:54 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 48440e1241fef815aecc104d341e7b14c648eac5
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Wed Oct 28 14:09:08 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit a2340ac1eff4e101867629827758781a0037d570
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Mon Oct 26 22:08:39 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit d2f13e6ffe55ac118e689c12dc1cb484690b73f2
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Oct 22 12:34:15 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
commit a5a77b47fdf30d77513c60d54c8d04da0cd59686
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
Date: Tue Oct 13 16:45:58 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgamma-1.0.3/INSTALL new/xgamma-1.0.4/INSTALL
--- old/xgamma-1.0.3/INSTALL 2006-07-11 04:52:59.000000000 +0200
+++ new/xgamma-1.0.4/INSTALL 2010-11-09 08:48:37.000000000 +0100
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgamma-1.0.3/Makefile.am new/xgamma-1.0.4/Makefile.am
--- old/xgamma-1.0.3/Makefile.am 2009-10-14 01:41:36.000000000 +0200
+++ new/xgamma-1.0.4/Makefile.am 2010-11-08 09:13:22.000000000 +0100
@@ -35,39 +35,24 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE) ChangeLog
+EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-MAINTAINERCLEANFILES=ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
-
-
-SED = sed
+dist-hook: ChangeLog INSTALL
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgamma-1.0.3/config.h.in new/xgamma-1.0.4/config.h.in
--- old/xgamma-1.0.3/config.h.in 2009-10-14 01:46:39.000000000 +0200
+++ new/xgamma-1.0.4/config.h.in 2010-11-09 08:48:23.000000000 +0100
@@ -42,6 +42,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgamma-1.0.3/configure.ac new/xgamma-1.0.4/configure.ac
--- old/xgamma-1.0.3/configure.ac 2009-10-14 01:45:45.000000000 +0200
+++ new/xgamma-1.0.4/configure.ac 2010-11-09 08:47:08.000000000 +0100
@@ -21,26 +21,24 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xgamma,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xgamma)
-AM_INIT_AUTOMAKE([dist-bzip2])
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([xgamma], [1.0.4],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xgamma])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XGAMMA, x11 xxf86vm)
-AC_SUBST(XGAMMA_CFLAGS)
-AC_SUBST(XGAMMA_LIBS)
AC_OUTPUT([Makefile])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgamma-1.0.3/xgamma.c new/xgamma-1.0.4/xgamma.c
--- old/xgamma-1.0.3/xgamma.c 2009-01-22 16:10:24.000000000 +0100
+++ new/xgamma-1.0.4/xgamma.c 2010-11-08 09:13:22.000000000 +0100
@@ -21,7 +21,6 @@
*
* Written by David Bateman
*/
-/* $XFree86: xc/programs/xgamma/xgamma.c,v 1.3 1999/03/21 07:35:38 dawes Exp $ */
#include <stdio.h>
#include <errno.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgamma-1.0.3/xgamma.man new/xgamma-1.0.4/xgamma.man
--- old/xgamma-1.0.3/xgamma.man 2007-05-19 08:51:52.000000000 +0200
+++ new/xgamma-1.0.4/xgamma.man 2010-11-08 09:13:40.000000000 +0100
@@ -18,8 +18,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The XFree86 Project.
.\"
-.\" $XFree86: xc/programs/xgamma/xgamma.man,v 1.6 2001/01/24 00:06:45 dawes Exp $
-.\"
.TH xgamma 1 __vendorversion__
.SH NAME
xgamma - Alter a monitor's gamma correction through the X server
++++++ xwd-1.0.3.tar.bz2 -> xwd-1.0.4.tar.bz2 ++++++
++++ 8735 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwd-1.0.3/ChangeLog new/xwd-1.0.4/ChangeLog
--- old/xwd-1.0.3/ChangeLog 2009-10-17 05:00:09.000000000 +0200
+++ new/xwd-1.0.4/ChangeLog 2010-11-07 19:18:34.000000000 +0100
@@ -1,3 +1,133 @@
+commit d58fa4c8f990abbb12df3cca34ed413683604470
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 10:17:48 2010 -0800
+
+ xwd 1.0.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 5f10318237d4327d429db6d94527278466452de2
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 10:16:29 2010 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM sttaements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit ee07a99593b89559e3f77c301fce245da3bcd21f
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 10:13:24 2010 -0800
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 78ff57bae1a7cfa3f650ed1bd25e48e1b690a30b
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 10:11:24 2010 -0800
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit a9371f05f4c63a7c68ff97a1ef06c82c8fc78b6d
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Sun Nov 7 10:10:39 2010 -0800
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit e5edfc867b49b785e7859823047f19e4af9c465d
+Author: Jesse Adkins <jesserayadkins(a)gmail.com>
+Date: Tue Sep 28 13:29:50 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 6bb4b240be83cb0074d10602b2532de062ac7966
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Nov 26 09:19:55 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit a8fbe89bbcccf29964e108f5c113c4b1ce094670
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Wed Oct 28 14:09:09 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit 4ecee142fb9641b0a165816bf7a26e9bb32b3639
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Mon Oct 26 22:08:39 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit 0f7c35e98702dbe2249eb0beeb3419c2b8905fdb
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Oct 22 12:34:16 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit d42b2891295ef8d58dee73d9c37ca3a22a81dc3a
+Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org>
+Date: Wed Oct 21 12:47:22 2009 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+ > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+ > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+ > > was quite annoying to work around since 'autoreconf -fvi' replaces
+ > > it and git wants to commit it. Should these files even be in git?
+ > > Can I nuke them for the betterment of humanity and since they get
+ > > created by autoreconf anyways?
+ >
+ > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+
+ As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+ AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+ of the INSTALL file. It is also part of the 24206 solution.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu(a)freedesktop.org>
+
commit 5ba93bf07a4ffb84d86f6d4fad419e81a57358c6
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
Date: Fri Oct 16 19:59:20 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwd-1.0.3/INSTALL new/xwd-1.0.4/INSTALL
--- old/xwd-1.0.3/INSTALL 2006-07-11 04:54:43.000000000 +0200
+++ new/xwd-1.0.4/INSTALL 2010-11-07 19:18:33.000000000 +0100
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwd-1.0.3/Makefile.am new/xwd-1.0.4/Makefile.am
--- old/xwd-1.0.3/Makefile.am 2009-10-17 04:53:23.000000000 +0200
+++ new/xwd-1.0.4/Makefile.am 2010-11-07 19:11:24.000000000 +0100
@@ -45,38 +45,22 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwd-1.0.3/config.h.in new/xwd-1.0.4/config.h.in
--- old/xwd-1.0.3/config.h.in 2009-10-17 04:59:52.000000000 +0200
+++ new/xwd-1.0.4/config.h.in 2010-11-07 19:18:12.000000000 +0100
@@ -42,6 +42,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwd-1.0.3/configure.ac new/xwd-1.0.4/configure.ac
--- old/xwd-1.0.3/configure.ac 2009-10-17 04:59:11.000000000 +0200
+++ new/xwd-1.0.4/configure.ac 2010-11-07 19:17:32.000000000 +0100
@@ -21,26 +21,24 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xwd, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xwd)
-AM_INIT_AUTOMAKE([dist-bzip2])
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([xwd], [1.0.4],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xwd])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XWD, x11)
-AC_SUBST(XWD_CFLAGS)
-AC_SUBST(XWD_LIBS)
AC_OUTPUT([Makefile])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwd-1.0.3/dsimple.c new/xwd-1.0.4/dsimple.c
--- old/xwd-1.0.3/dsimple.c 2008-11-19 07:32:14.000000000 +0100
+++ new/xwd-1.0.4/dsimple.c 2010-10-07 05:38:46.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: dsimple.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */
/*
Copyright 1993, 1998 The Open Group
@@ -26,7 +25,6 @@
from The Open Group.
*/
-/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.6 2001/12/14 20:02:09 dawes Exp $ */
#include <X11/Xos.h>
#include <X11/Xlib.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwd-1.0.3/dsimple.h new/xwd-1.0.4/dsimple.h
--- old/xwd-1.0.3/dsimple.h 2008-06-24 05:30:11.000000000 +0200
+++ new/xwd-1.0.4/dsimple.h 2010-10-07 05:38:46.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: dsimple.h,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */
/*
Copyright 1993, 1998 The Open Group
@@ -26,7 +25,6 @@
from The Open Group.
*/
-/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.8 2002/12/24 17:43:01 tsi Exp $ */
/*
* Just_display.h: This file contains the definitions needed to use the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwd-1.0.3/list.c new/xwd-1.0.4/list.c
--- old/xwd-1.0.3/list.c 2009-01-22 16:11:35.000000000 +0100
+++ new/xwd-1.0.4/list.c 2010-10-07 05:38:46.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: list.c,v 1.5 2001/02/09 02:06:03 xorgcvs Exp $ */
/** ------------------------------------------------------------------------
This file contains routines for manipulating generic lists.
Lists are implemented with a "harness". In other words, each
@@ -34,7 +33,6 @@
from The Open Group.
----------------------------------------------------------------------- **/
-/* $XFree86: xc/programs/xwd/list.c,v 3.6 2001/12/14 20:02:33 dawes Exp $ */
#include <stdio.h>
#include <stdlib.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwd-1.0.3/list.h new/xwd-1.0.4/list.h
--- old/xwd-1.0.3/list.h 2006-07-11 04:54:43.000000000 +0200
+++ new/xwd-1.0.4/list.h 2010-10-07 05:38:46.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: list.h,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ */
/** ------------------------------------------------------------------------
This file contains routines for manipulating generic lists.
Lists are implemented with a "harness". In other words, each
@@ -34,7 +33,6 @@
from The Open Group.
-------------------------------------------------------------------- **/
-/* $XFree86$ */
#ifndef LIST_DEF
#define LIST_DEF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwd-1.0.3/multiVis.c new/xwd-1.0.4/multiVis.c
--- old/xwd-1.0.3/multiVis.c 2009-01-22 16:11:35.000000000 +0100
+++ new/xwd-1.0.4/multiVis.c 2010-10-07 05:38:46.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: multiVis.c,v 1.5 2001/02/09 02:06:03 xorgcvs Exp $ */
/** ------------------------------------------------------------------------
This file contains functions to create a list of regions which
tile a specified window. Each region contains all visible
@@ -34,7 +33,6 @@
from The Open Group.
------------------------------------------------------------------------ **/
-/* $XFree86: xc/programs/xwd/multiVis.c,v 1.9 2003/05/27 22:27:14 tsi Exp $ */
#include <stdlib.h>
#include <X11/Xlib.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwd-1.0.3/multiVis.h new/xwd-1.0.4/multiVis.h
--- old/xwd-1.0.3/multiVis.h 2006-07-11 04:54:43.000000000 +0200
+++ new/xwd-1.0.4/multiVis.h 2010-10-07 05:38:46.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: multiVis.h,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ */
/** ------------------------------------------------------------------------
This file contains routines for manipulating generic lists.
Lists are implemented with a "harness". In other words, each
@@ -34,7 +33,6 @@
from The Open Group.
------------------------------------------------------------------------ **/
-/* $XFree86$ */
extern int GetMultiVisualRegions(
Display *, Window, int, int, unsigned int,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwd-1.0.3/wsutils.h new/xwd-1.0.4/wsutils.h
--- old/xwd-1.0.3/wsutils.h 2006-07-11 04:54:43.000000000 +0200
+++ new/xwd-1.0.4/wsutils.h 2010-10-07 05:38:46.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: wsutils.h,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ */
/** ------------------------------------------------------------------------
This file contains routines for manipulating generic lists.
Lists are implemented with a "harness". In other words, each
@@ -34,7 +33,6 @@
from The Open Group.
------------------------------------------------------------------------ **/
-/* $XFree86$ */
/******************************************************************************
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwd-1.0.3/xwd.c new/xwd-1.0.4/xwd.c
--- old/xwd-1.0.3/xwd.c 2009-01-22 16:11:35.000000000 +0100
+++ new/xwd-1.0.4/xwd.c 2010-10-07 05:38:46.000000000 +0200
@@ -1,5 +1,3 @@
-/* $Xorg: xwd.c,v 1.5 2001/02/09 02:06:03 xorgcvs Exp $ */
-
/*
Copyright 1987, 1998 The Open Group
@@ -25,7 +23,6 @@
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/xwd/xwd.c,v 3.11 2002/09/16 18:06:21 eich Exp $ */
/*
* xwd.c MIT Project Athena, X Window system window raster image dumper.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwd-1.0.3/xwd.man new/xwd-1.0.4/xwd.man
--- old/xwd-1.0.3/xwd.man 2008-02-16 01:40:39.000000000 +0100
+++ new/xwd-1.0.4/xwd.man 2010-10-07 05:38:46.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: xwd.man,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $
.\" Copyright 1988, 1994, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,8 +22,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xwd.man,v 1.8 2001/12/14 20:02:34 dawes Exp $
-.\"
.TH XWD 1 __xorgversion__
.SH NAME
xwd - dump an image of an X window
++++++ xwud-1.0.2.tar.bz2 -> xwud-1.0.3.tar.bz2 ++++++
++++ 8622 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwud-1.0.2/ChangeLog new/xwud-1.0.3/ChangeLog
--- old/xwud-1.0.2/ChangeLog 2009-10-13 06:43:02.000000000 +0200
+++ new/xwud-1.0.3/ChangeLog 2010-11-07 19:41:20.000000000 +0100
@@ -1,3 +1,133 @@
+commit 1693c1bba2c03acd151329fb8ecc3f5c267f9576
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 10:40:46 2010 -0800
+
+ xwud 1.0.3
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit f78df83d15e7b159617de3850b313d3f9850f643
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 10:39:49 2010 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM sttaements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 60c96d9b2add63684c8e28a3221fee3d807f3926
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 10:38:07 2010 -0800
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 81777e705aab605d1f92edd01c3712033f7ee1cc
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 7 10:37:23 2010 -0800
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 0258e0ff9d6d56d2edc1c3287533771a0c3f08c3
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Sun Nov 7 10:36:55 2010 -0800
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 7bc31bddc140fdccefa6de2e8ae27ce6b28871ff
+Author: Jesse Adkins <jesserayadkins(a)gmail.com>
+Date: Tue Sep 28 13:29:50 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 1a06eb65df2f13497ac2327cd847a393d3f3d0fc
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Nov 26 09:19:55 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit e1e912bb1474aaa3268c86e414d92260f80eaafc
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Wed Oct 28 14:09:09 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit 38bc3567f7134b74160dc3096e31643c93bc3198
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Mon Oct 26 22:08:40 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit 55e770684fe1bb3de4174a33fecf8f10698d9d5d
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Oct 22 12:34:16 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit 86a450a54c878e8b3e235d17557d6d8e81a31caa
+Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org>
+Date: Wed Oct 21 12:47:22 2009 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+ > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+ > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+ > > was quite annoying to work around since 'autoreconf -fvi' replaces
+ > > it and git wants to commit it. Should these files even be in git?
+ > > Can I nuke them for the betterment of humanity and since they get
+ > > created by autoreconf anyways?
+ >
+ > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+
+ As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+ AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+ of the INSTALL file. It is also part of the 24206 solution.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu(a)freedesktop.org>
+
commit f4e1d310f6c421434c4f1101d08907de16fc855c
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
Date: Mon Oct 12 21:41:45 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwud-1.0.2/INSTALL new/xwud-1.0.3/INSTALL
--- old/xwud-1.0.2/INSTALL 2006-07-11 04:54:48.000000000 +0200
+++ new/xwud-1.0.3/INSTALL 2010-11-07 19:41:20.000000000 +0100
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwud-1.0.2/Makefile.am new/xwud-1.0.3/Makefile.am
--- old/xwud-1.0.2/Makefile.am 2009-10-13 06:36:58.000000000 +0200
+++ new/xwud-1.0.3/Makefile.am 2010-11-07 19:37:23.000000000 +0100
@@ -36,38 +36,22 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwud-1.0.2/config.h.in new/xwud-1.0.3/config.h.in
--- old/xwud-1.0.2/config.h.in 2009-10-13 06:42:01.000000000 +0200
+++ new/xwud-1.0.3/config.h.in 2010-11-07 19:41:11.000000000 +0100
@@ -42,6 +42,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwud-1.0.2/configure.ac new/xwud-1.0.3/configure.ac
--- old/xwud-1.0.2/configure.ac 2009-10-13 06:41:29.000000000 +0200
+++ new/xwud-1.0.3/configure.ac 2010-11-07 19:40:19.000000000 +0100
@@ -21,26 +21,24 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xwud,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xwud)
-AM_INIT_AUTOMAKE([dist-bzip2])
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([xwud], [1.0.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xwud])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XWUD, x11)
-AC_SUBST(XWUD_CFLAGS)
-AC_SUBST(XWUD_LIBS)
AC_OUTPUT([Makefile])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwud-1.0.2/xwud.c new/xwud-1.0.3/xwud.c
--- old/xwud-1.0.2/xwud.c 2009-05-04 01:31:00.000000000 +0200
+++ new/xwud-1.0.3/xwud.c 2010-10-07 05:38:58.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: xwud.c,v 1.5 2001/02/09 02:06:04 xorgcvs Exp $ */
/*
Copyright 1985, 1986, 1988, 1998 The Open Group
@@ -26,7 +25,6 @@
from The Open Group.
*/
-/* $XFree86: xc/programs/xwud/xwud.c,v 3.10tsi Exp $ */
/* xwud - marginally useful raster image undumper */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xwud-1.0.2/xwud.man new/xwud-1.0.3/xwud.man
--- old/xwud-1.0.2/xwud.man 2006-07-11 04:54:48.000000000 +0200
+++ new/xwud-1.0.3/xwud.man 2010-10-07 05:38:58.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: xwud.man,v 1.4 2001/02/09 02:06:04 xorgcvs Exp $
.\" Copyright 1988, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,8 +22,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/xwud/xwud.man,v 1.9 2002/04/22 20:53:11 herrb Exp $
-.\"
.TH XWUD 1 __xorgversion__
.SH NAME
xwud - image displayer for X
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package cpio for openSUSE:Factory
checked in at Wed Nov 10 18:13:10 CET 2010.
--------
--- cpio/cpio.changes 2010-08-31 11:37:09.000000000 +0200
+++ cpio/cpio.changes 2010-11-09 12:22:13.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 9 11:07:45 UTC 2010 - puzel(a)novell.com
+
+- disable-silent-rules
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cpio.spec ++++++
--- /var/tmp/diff_new_pack.366bmE/_old 2010-11-10 18:12:56.000000000 +0100
+++ /var/tmp/diff_new_pack.366bmE/_new 2010-11-10 18:12:56.000000000 +0100
@@ -24,7 +24,7 @@
Group: Productivity/Archiving/Compression
AutoReqProv: on
Version: 2.11
-Release: 7
+Release: 8
Summary: A Backup and Archiving Utility
Source: cpio-%{version}.tar.bz2
Patch2: cpio-use_new_ascii_format.patch
@@ -92,7 +92,8 @@
--prefix=/usr \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
- --libdir=%{_libdir}
+ --libdir=%{_libdir} \
+ --disable-silent-rules
make %{?_smp_mflags}
%install
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package dos2unix for openSUSE:Factory
checked in at Wed Nov 10 18:12:42 CET 2010.
--------
--- dos2unix/dos2unix.changes 2010-10-31 19:03:14.000000000 +0100
+++ dos2unix/dos2unix.changes 2010-11-10 14:07:22.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 10 13:07:17 UTC 2010 - coolo(a)novell.com
+
+- fix file list
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dos2unix.spec ++++++
--- /var/tmp/diff_new_pack.SS7Ral/_old 2010-11-10 18:12:21.000000000 +0100
+++ /var/tmp/diff_new_pack.SS7Ral/_new 2010-11-10 18:12:21.000000000 +0100
@@ -21,7 +21,7 @@
BuildRequires: xz
Summary: Text converters to and from DOS/MAC to UNIX
Version: 5.1.1
-Release: 2
+Release: 3
Group: Productivity/Text/Convertors
License: BSD3c
Url: http://www.xs4all.nl/~waterlan/#DOS2UNIX
@@ -57,6 +57,7 @@
%{_bindir}/unix2mac
%{_bindir}/unix2dos
%{_mandir}/*/*
+%dir %_mandir/nl
%lang(eo-x) %dir /usr/share/locale/eo-x
%lang(eo-x) %dir /usr/share/locale/eo-x/LC_MESSAGES
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0