Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (a479e402f3c5ee118d49af47ad712983687c0eca)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (a479e402f3c5ee118d49af47ad712983687c0eca)
  • Date: Sun, 9 Oct 2011 12:16:02 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

printer/system-config-printer/DETAILS | 2 -
printer/system-config-printer/HISTORY | 4 ++
printer/system-config-printer/PRE_BUILD | 4 --
printer/system-config-printer/no-packagekit.patch | 36
----------------------
4 files changed, 6 insertions(+), 40 deletions(-)

New commits:
commit a479e402f3c5ee118d49af47ad712983687c0eca
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

system-config-printer 1.3.7

diff --git a/printer/system-config-printer/DETAILS
b/printer/system-config-printer/DETAILS
index 79763a6..125473a 100755
--- a/printer/system-config-printer/DETAILS
+++ b/printer/system-config-printer/DETAILS
@@ -1,5 +1,5 @@
SPELL=system-config-printer
- VERSION=1.3.5
+ VERSION=1.3.7
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/printer/system-config-printer/HISTORY
b/printer/system-config-printer/HISTORY
index 6c86ee2..48503a1 100644
--- a/printer/system-config-printer/HISTORY
+++ b/printer/system-config-printer/HISTORY
@@ -1,3 +1,7 @@
+2011-10-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.7
+ * PRE_BUILD, no-packagekit.patch: patch removed
+
2011-08-23 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: use timwaugh.gpg as keyring
* tim.gpg: removed, no longer needed
diff --git a/printer/system-config-printer/PRE_BUILD
b/printer/system-config-printer/PRE_BUILD
index 40c6dbc..6f54504 100755
--- a/printer/system-config-printer/PRE_BUILD
+++ b/printer/system-config-printer/PRE_BUILD
@@ -2,6 +2,4 @@ mk_source_dir $SOURCE_DIRECTORY &&
cd $BUILD_DIRECTORY &&
verify_file '' &&
xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
-cd $SOURCE_DIRECTORY &&
-
-patch -p1 < $SPELL_DIRECTORY/no-packagekit.patch
+cd $SOURCE_DIRECTORY
diff --git a/printer/system-config-printer/no-packagekit.patch
b/printer/system-config-printer/no-packagekit.patch
deleted file mode 100644
index 8482ad8..0000000
--- a/printer/system-config-printer/no-packagekit.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-01
10:47:11.614519332 +0100
-+++ system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-02
15:45:33.807623959 +0100
-@@ -21,7 +21,6 @@
-
- import cups, pprint, os, tempfile, re, string
- import locale
--import packagekit.client, packagekit.enums
- from . import _debugprint
-
- class Printer:
-@@ -829,24 +828,7 @@
- missing executables
- """
- executables = missingExecutables(ppd)
-- packages = []
-- if executables:
-- unresolved_executables = []
-- client = packagekit.client.PackageKitClient ()
-- for executable in executables:
-- if not executable.startswith ("/"):
-- executable = "/usr/bin/" + executable
--
-- result = client.search_file ([executable],
--
packagekit.enums.FILTER_NOT_INSTALLED)
-- if result:
-- packages.extend (set (map (lambda x: x.name, result)))
-- else:
-- unresolved_executables.append (executable)
--
-- executables = unresolved_executables
--
-- return (packages, executables)
-+ return ([], executables)
-
- def _main():
- c = cups.Connection()



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (a479e402f3c5ee118d49af47ad712983687c0eca), Ladislav Hagara, 10/09/2011

Archive powered by MHonArc 2.6.24.

Top of Page