Current state

diff --git a/GeoIP.conf b/GeoIP.conf
index 33f55265569ad4da74038d69ac50fb1f4a617e30..75775cbb05396240e7260444b47f2d88439ac0ca 100644 (file)
--- a/GeoIP.conf
+++ b/GeoIP.conf
@@ -2,15 +2,22 @@
 # then you will obtain a license key which you can
 # use to automatically obtain updates.
 # for more details, please go to
-# http://www.maxmind.com/app/products
+# http://www.maxmind.com/en/geolocation_landing
 
-# see https://www.maxmind.com/app/license_key_login to obtain License Key,
+# HowTo configure geoipupdate
+# http://www.maxmind.com/en/license_key
+
+# customer find the user_id and license key here:
+# https://www.maxmind.com/en/my_license_key
+#
 # UserId, and available ProductIds
 
 # Enter your license key here
+# customers should insert their license key and user_id
+# free GeoLite users should use 000000000000 as license key
 LicenseKey YOUR_LICENSE_KEY_HERE
 
-# Enter your User ID here
+# Enter your User ID here ( GeoLite only users should use 999999 as user_id )
 UserId YOUR_USER_ID_HERE
 
 # Enter the Product ID(s) of the database(s) you would like to update

diff --git a/config-archive/usr/share/config/kdm/kdmrc.dist.new b/config-archive/usr/share/config/kdm/kdmrc.dist.new
index d1a3973ec5a68da9c6a3931873146b729376b119..c0f8b58d1949b66603a05dc7654ec03f099052a1 100644 (file)
--- a/config-archive/usr/share/config/kdm/kdmrc.dist.new
+++ b/config-archive/usr/share/config/kdm/kdmrc.dist.new
@@ -449,7 +449,7 @@ FaceDir=/var/lib/kdm/faces
 # Random seed for forging saved session types, etc. of unknown users.
 # This value should be random but constant across the login domain.
 # Default is 0
-ForgingSeed=1368870185
+ForgingSeed=1371047480
 # Specify conversation plugins for the login dialog. Each plugin can be
 # specified as a base name (which expands to $kde_modulesdir/kgreet_$base)
 # or as a full pathname.

diff --git a/cups/printers.conf b/cups/printers.conf
index c7c0df76cbc1fce78ab97cdb1c78229c80b2c4ce..d23ebad14554e4c8b9bdfa3d5e5dc12e81c3d878 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,13 +1,15 @@
 # Printer configuration file for CUPS v1.5.2
-# Written by cupsd on 2013-06-11 07:49
+# Written by cupsd on 2013-06-28 07:17
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter Kyocera_FS-1020D>
 UUID urn:uuid:4fe502f0-362b-3fa2-519f-648848519e5e
 Info Kyocera_FS-1020D
 MakeModel Kyocera Mita FS-1020D
 DeviceURI lpd://10.12.11.32/lp
-State Idle
-StateTime 1364666766
+State Stopped
+StateMessage The printer is not responding.
+StateTime 1372396639
+Reason paused
 Type 8392788
 Accepting Yes
 Shared No

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index 3c7b5eb3990681c438dc12e615a78fef6950016b..e7cd4478649bc4de3d7d83a494988933e2bc0322 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,3 +1,3 @@
 # Subscription configuration file for CUPS v1.5.2
-# Written by cupsd on 2013-06-06 01:18
-NextSubscriptionId 164
+# Written by cupsd on 2013-06-29 07:17
+NextSubscriptionId 167

diff --git a/drirc b/drirc
index cf13cdb802096897896072a9808c1e4850013f87..a13941f681e7f7314998464e5df646d65203a937 100644 (file)
--- a/drirc
+++ b/drirc
@@ -22,5 +22,8 @@
         <application name="Unigine OilRush (64-bit)" executable="OilRush_x64">
             <option name="disable_blend_func_extended" value="true" />
        </application>
+        <application name="Savage 2" executable="savage2.bin">
+            <option name="disable_glsl_line_continuations" value="true" />
+        </application>
     </device>
 </driconf>

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index 4d0054c775dbedfeeeb321623e0da9e153e2b521..c96c380d4614abe57b44bc671fe802933f45597d 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -2331,77 +2331,89 @@
                        </dir>
                        <dir name="thumbnailers">
                                <entry name="disable_all" mtime="1335179349" schema="/schemas/desktop/gnome/thumbnailers/disable_all"/>
+                               <dir name="image@x-samsung-srw">
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/enable"/>
+                               </dir>
+                               <dir name="image@x-panasonic-rw2">
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/enable"/>
+                               </dir>
+                               <dir name="image@x-nikon-nrw">
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/enable"/>
+                               </dir>
                                <dir name="image@x-sony-arw">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-arw/enable"/>
                                </dir>
                                <dir name="image@x-sony-sr2">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-sr2/enable"/>
                                </dir>
                                <dir name="image@x-sony-srf">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-sony-srf/enable"/>
                                </dir>
                                <dir name="image@x-sigma-x3f">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-sigma-x3f/enable"/>
                                </dir>
                                <dir name="image@x-pentax-pef">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/enable"/>
                                </dir>
                                <dir name="image@x-panasonic-raw">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-panasonic-raw/enable"/>
                                </dir>
                                <dir name="image@x-olympus-orf">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/enable"/>
                                </dir>
                                <dir name="image@x-nikon-nef">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-nikon-nef/enable"/>
                                </dir>
                                <dir name="image@x-minolta-mrw">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-minolta-mrw/enable"/>
                                </dir>
                                <dir name="image@x-kodak-kdc">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-kdc/enable"/>
                                </dir>
                                <dir name="image@x-kodak-k25">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-k25/enable"/>
                                </dir>
                                <dir name="image@x-kodak-dcr">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-kodak-dcr/enable"/>
                                </dir>
                                <dir name="image@x-fuji-raf">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-fuji-raf/enable"/>
                                </dir>
                                <dir name="image@x-canon-cr2">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-cr2/enable"/>
                                </dir>
                                <dir name="image@x-canon-crw">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-canon-crw/enable"/>
                                </dir>
                                <dir name="image@x-adobe-dng">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-adobe-dng/enable"/>
                                </dir>
                                <dir name="image@x-dcraw">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/image@x-dcraw/enable"/>
                                </dir>
                                <dir name="application@x-ufraw">
-                                       <entry name="command" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/command"/>
-                                       <entry name="enable" mtime="1361627683" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/enable"/>
+                                       <entry name="command" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/command"/>
+                                       <entry name="enable" mtime="1371047728" schema="/schemas/desktop/gnome/thumbnailers/application@x-ufraw/enable"/>
                                </dir>
                                <dir name="application@x-cbt">
                                        <entry name="command" mtime="1342526498" schema="/schemas/desktop/gnome/thumbnailers/application@x-cbt/command"/>
@@ -17815,255 +17827,339 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Set to true to disable all external thumbnailer programs, independent on whether they are independently disabled/enabled.</longdesc>
                                                </local_schema>
                                        </entry>
+                                       <dir name="image@x-samsung-srw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
+                                                       <local_schema locale="C" short_desc="">
+                                                               <default type="string">
+                                                                       <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
+                                                               </default>
+                                                               <longdesc></longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
+                                                       <local_schema locale="C" short_desc="">
+                                                               <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
+                                       <dir name="image@x-panasonic-rw2">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
+                                                       <local_schema locale="C" short_desc="">
+                                                               <default type="string">
+                                                                       <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
+                                                               </default>
+                                                               <longdesc></longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
+                                                       <local_schema locale="C" short_desc="">
+                                                               <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
+                                       <dir name="image@x-nikon-nrw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
+                                                       <local_schema locale="C" short_desc="">
+                                                               <default type="string">
+                                                                       <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
+                                                               </default>
+                                                               <longdesc></longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
+                                                       <local_schema locale="C" short_desc="">
+                                                               <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
                                        <dir name="image@x-sony-arw">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sony-sr2">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sony-srf">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-sigma-x3f">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-pentax-pef">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-panasonic-raw">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-olympus-orf">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-nikon-nef">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-minolta-mrw">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-kodak-kdc">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-kodak-k25">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-kodak-dcr">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-fuji-raf">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-canon-cr2">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-canon-crw">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-adobe-dng">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="image@x-dcraw">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="application@x-ufraw">
-                                               <entry name="command" mtime="1361627683" type="schema" stype="string" owner="ufraw">
+                                               <entry name="command" mtime="1371047728" type="schema" stype="string" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1361627683" type="schema" stype="bool" owner="ufraw">
+                                               <entry name="enable" mtime="1371047728" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
+                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>

diff --git a/gconf/schemas/ufraw.schemas b/gconf/schemas/ufraw.schemas
index b3fa4807e413d9f7dfc6ed1e7ee987e713c814ac..40cf1a6395111361cf1994aab109fa0db1a98793 100644 (file)
--- a/gconf/schemas/ufraw.schemas
+++ b/gconf/schemas/ufraw.schemas
@@ -264,6 +264,30 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/enable</key>
+      <applyto>/desktop/gnome/thumbnailers/image@x-nikon-nrw/enable</applyto>
+      <owner>ufraw</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short></short>
+        <long></long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/desktop/gnome/thumbnailers/image@x-nikon-nrw/command</key>
+      <applyto>/desktop/gnome/thumbnailers/image@x-nikon-nrw/command</applyto>
+      <owner>ufraw</owner>
+      <type>string</type>
+      <default>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</default>
+      <locale name="C">
+        <short></short>
+        <long></long>
+      </locale>
+    </schema>
+
     <schema>
       <key>/schemas/desktop/gnome/thumbnailers/image@x-olympus-orf/enable</key>
       <applyto>/desktop/gnome/thumbnailers/image@x-olympus-orf/enable</applyto>
@@ -312,6 +336,30 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/enable</key>
+      <applyto>/desktop/gnome/thumbnailers/image@x-panasonic-rw2/enable</applyto>
+      <owner>ufraw</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short></short>
+        <long></long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/desktop/gnome/thumbnailers/image@x-panasonic-rw2/command</key>
+      <applyto>/desktop/gnome/thumbnailers/image@x-panasonic-rw2/command</applyto>
+      <owner>ufraw</owner>
+      <type>string</type>
+      <default>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</default>
+      <locale name="C">
+        <short></short>
+        <long></long>
+      </locale>
+    </schema>
+
     <schema>
       <key>/schemas/desktop/gnome/thumbnailers/image@x-pentax-pef/enable</key>
       <applyto>/desktop/gnome/thumbnailers/image@x-pentax-pef/enable</applyto>
@@ -432,5 +480,29 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/enable</key>
+      <applyto>/desktop/gnome/thumbnailers/image@x-samsung-srw/enable</applyto>
+      <owner>ufraw</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short></short>
+        <long></long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/command</key>
+      <applyto>/desktop/gnome/thumbnailers/image@x-samsung-srw/command</applyto>
+      <owner>ufraw</owner>
+      <type>string</type>
+      <default>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</default>
+      <locale name="C">
+        <short></short>
+        <long></long>
+      </locale>
+    </schema>
+
    </schemalist>
 </gconfschemafile>

diff --git a/local.d/baselayout1.start b/local.d/baselayout1.start
new file mode 100755 (executable)
index 0000000..29927c0
--- /dev/null
+++ b/local.d/baselayout1.start
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# /etc/conf.d/local.start
+
+# This is a good place to load any misc programs
+# on startup (use &>/dev/null to hide output)
+
+#echo "Setze Standard-Route IPv6 via fe80::1 dev eth0"
+#/sbin/ip -6 route add default via fe80::1 dev eth0
+
+#/sbin/ip -6 route add "2a01:238:4225:6e00::/56" dev lo
+
+echo "Sende Mail wegen Boot ..."
+echo "Kiste $(hostname) wird '$(date)' gebootet" |  /usr/bin/mailx -s "Boot von $(hostname)" root@localhost
+
+# vim: ts=4 expandtab

diff --git a/local.d/baselayout1.stop b/local.d/baselayout1.stop
new file mode 100755 (executable)
index 0000000..ab762bc
--- /dev/null
+++ b/local.d/baselayout1.stop
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# /etc/conf.d/local.stop
+
+# This is a good place to unload any misc.
+# programs you started above.
+# For example, if you are using OSS and have
+# "/usr/local/bin/soundon" above, put
+# "/usr/local/bin/soundoff" here.
+
+echo "Sende Mail wegen Shutdown ..."
+echo "Kiste $(hostname) wird '$(date)' ordentlich heruntergefahren" | /usr/bin/mailx -s "Shutdown von $(hostname)" root@localhost
+
+echo
+echo "Warte 5 Sekunden ..."
+echo
+sleep 5
+
+# vim: ts=4 expandtab

diff --git a/portage/package.keywords b/portage/package.keywords
index 93be4a3b17dd0e3da5da09d4f7aaf9fad6f889b4..ab07ac499937891da556a02481c4f295ac72c3d4 100644 (file)
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -39,6 +39,7 @@ app-emulation/virtualbox-modules
 # ~dev-libs/gjs-1.34.0
 # ~dev-libs/libzeitgeist-0.3.18
 ~dev-libs/nspr-4.9.1
+~dev-libs/nspr-4.9.6
 ~dev-libs/nss-3.13.5
 
 ~dev-perl/Email-Sender-0.110.5

diff --git a/revdep-rebuild/61-sun-jdk-1.6 b/revdep-rebuild/61-sun-jdk-1.6
deleted file mode 100644 (file)
index c0f7265..0000000
--- a/revdep-rebuild/61-sun-jdk-1.6
+++ /dev/null
@@ -1 +0,0 @@
-SEARCH_DIRS_MASK="/opt/sun-jdk-1.6.0.45"

diff --git a/revdep-rebuild/61-sun-jre-bin-1.6 b/revdep-rebuild/61-sun-jre-bin-1.6
deleted file mode 100644 (file)
index 2f674fe..0000000
--- a/revdep-rebuild/61-sun-jre-bin-1.6
+++ /dev/null
@@ -1 +0,0 @@
-SEARCH_DIRS_MASK="/opt/sun-jre-bin-1.6.0.45"

diff --git a/sandbox.d/20sun-jdk-1.6 b/sandbox.d/20sun-jdk-1.6
deleted file mode 100644 (file)
index f1782ed..0000000
--- a/sandbox.d/20sun-jdk-1.6
+++ /dev/null
@@ -1 +0,0 @@
-SANDBOX_PREDICT="/dev/random"

diff --git a/ulogd.conf b/ulogd.conf
index e9bed91e288db8b8b7d967f9b6db340a69d1ae0d..b58522d717e007ad5f84b765ba86e45bae378910 100644 (file)
--- a/ulogd.conf
+++ b/ulogd.conf
@@ -51,13 +51,13 @@ plugin="/usr/lib64/ulogd/ulogd_inpflow_NFACCT.so"
 plugin="/usr/lib64/ulogd/ulogd_output_GRAPHITE.so"
 
 # this is a stack for logging packet send by system via LOGEMU
-#stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 
 # this is a stack for packet-based logging via LOGEMU
-#stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 
 # this is a stack for ULOG packet-based logging via LOGEMU
-#stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 
 # this is a stack for packet-based logging via LOGEMU with filtering on MARK
 #stack=log2:NFLOG,mark1:MARK,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
@@ -179,15 +179,15 @@ nlgroup=1
 socket_path="/run/nuauth_ulogd2.sock"
 
 [emu1]
-file="/var/log/ulogd/ulogd_syslogemu.log"
+file="/var/log/ulogd/syslogemu.log"
 sync=1
 
 [op1]
-file="/var/log/ulogd/ulogd_oprint.log"
+file="/var/log/ulogd/oprint.log"
 sync=1
 
 [gp1]
-file="/var/log/ulogd/ulogd_gprint.log"
+file="/var/log/ulogd/gprint.log"
 sync=1
 timestamp=1