Version bump, remove old (no need for 1.1.16 it won't be stabilized anytime soon due to polkit-1)

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 21 insertions, 11 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index 76317fa4e2a2..a26c75af58fa 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/system-config-printer-common
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.11 2010/03/11 01:07:57 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.12 2010/03/11 01:44:07 reavertm Exp $
+
+*system-config-printer-common-1.1.18 (11 Mar 2010)
+
+  11 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -system-config-printer-common-1.1.16.ebuild,
+  -files/system-config-printer-common-1.1.16-split.patch,
+  +system-config-printer-common-1.1.18.ebuild,
+  +files/system-config-printer-common-1.1.18-split.patch:
+  Version bump, remove old
 
   11 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org>
   -system-config-printer-common-1.1.8.ebuild,
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.1.16-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.1.18-split.patch
index c03463c6db54..6d8f85682258 100644
--- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.1.16-split.patch
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.1.18-split.patch
@@ -1,22 +1,23 @@
-diff -ru ../system-config-printer-1.1.16/configure.in ./configure.in
---- ../system-config-printer-1.1.16/configure.in	2009-12-22 15:44:19.000000000 +0100
-+++ ./configure.in	2010-01-16 05:48:52.458480903 +0100
+diff -ru ../system-config-printer-1.1.18/configure.in ./configure.in
+--- ../system-config-printer-1.1.18/configure.in	2010-03-10 10:33:54.000000000 +0100
++++ ./configure.in	2010-03-11 02:24:38.787452516 +0100
 @@ -1,6 +1,6 @@
- AC_INIT(system-config-printer, 1.1.16)
+ AC_INIT(system-config-printer, 1.1.18)
  AC_CONFIG_SRCDIR(system-config-printer.py)
 -AM_INIT_AUTOMAKE([dist-xz dist-bzip2 subdir-objects 1.6])
 +AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
  IT_PROG_INTLTOOL
  AM_GNU_GETTEXT([external])
  AM_PATH_PYTHON
-diff -ru ../system-config-printer-1.1.16/Makefile.am ./Makefile.am
---- ../system-config-printer-1.1.16/Makefile.am	2009-12-22 15:44:19.000000000 +0100
-+++ ./Makefile.am	2010-01-16 05:59:13.766945612 +0100
-@@ -71,89 +71,20 @@
+diff -ru ../system-config-printer-1.1.18/Makefile.am ./Makefile.am
+--- ../system-config-printer-1.1.18/Makefile.am	2010-03-10 10:33:45.000000000 +0100
++++ ./Makefile.am	2010-03-11 02:31:02.771055111 +0100
+@@ -71,90 +71,20 @@
  	rm -f .stamp-distutils-in-builddir
  
  nobase_pkgdata_SCRIPTS=				\
 -	my-default-printer.py			\
+-	check-device-ids.py			\
 -	pysmb.py				\
 -	system-config-printer.py		\
 -	troubleshoot/__init__.py		\
@@ -104,7 +105,7 @@ diff -ru ../system-config-printer-1.1.16/Makefile.am ./Makefile.am
  
  if UDEV_RULES
  udevrulesdir=/lib/udev/rules.d
-@@ -168,61 +99,16 @@
+@@ -169,61 +99,16 @@
  	udev/udev-add-printer
  endif
  
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.1.16.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.1.18.ebuild
index b4d9b4fb5fdc..e09f533e0d1c 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.1.16.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.1.16.ebuild,v 1.1 2010/02/08 22:02:42 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.1.18.ebuild,v 1.1 2010/03/11 01:44:07 reavertm Exp $
 
 EAPI="2"
 inherit python autotools