cups and others:v.bump

This commit is contained in:
2017-12-15 07:39:59 +03:00
parent 72b184604a
commit ff0944daa5
19 changed files with 222 additions and 399 deletions
@@ -0,0 +1,49 @@
diff -Nuar cups_old-2.2.6/desktop/cups.desktop.in cups-2.2.6/desktop/cups.desktop.in
--- cups_old-2.2.6/desktop/cups.desktop.in 2017-11-01 17:57:53.000000000 +0300
+++ cups-2.2.6/desktop/cups.desktop.in 2011-02-24 14:03:21.000000000 +0200
@@ -7,18 +7,6 @@
Type=Application
Name=Manage Printing
Comment=CUPS Web Interface
-Name[af]=bestuur Printing
-Comment[af]=CUPS Web Interface
-Name[ar]=إدارة الطباعة
-Comment[ar]=الكؤوس واجهة الويب
-Name[az]=Çap idarə
-Comment[az]=CUPS Web Interface
-Name[bn-IN]=মুদ্রণ পরিচালনা
-Comment[bn-IN]=CUPS ওয়েব ইন্টারফেস
-Name[ca]=Gestor d'impressió
-Comment[ca]=Interfície web de CUPS
-Name[cs]=Správa tisku CUPS
-Comment[cs]=Webové rozhraní CUPS
Name[de]=Druckerverwaltung
Comment[de]=CUPS Webinterface
Name[en_US]=Manage Printing
@@ -39,24 +27,14 @@
Comment[it]=Interfaccia web di CUPS
Name[ja]=印刷の管理
Comment[ja]=CUPS Web インタフェース
-Name[ko]=인쇄 관리
-Comment[ko]=CUPS 웹 인터페이스
Name[pl]=Zarządzanie drukowaniem
Comment[pl]=Interfejs WWW CUPS
-Name[pt_BR]=Gerenciador de impressão
-Comment[pt_BR]=Interface web do CUPS
-Name[pt-PT]=Gerenciador de impressão
-Comment[pt-PT]=Interface sítio do CUPS
Name[ru]=Настройка печати
Comment[ru]=Настройка CUPS
Name[sv]=Hantera skrivare
Comment[sv]=CUPS webb-gränssnitt
-Name[sq]=Menaxho Printime
-Comment[sq]=CUPS Web Interface
-Name[th]=จัดการการพิมพ์
-Comment[th]=CUPS เว็บอินเตอร์เฟส
-Name[uz]=chop boshqarish
-Comment[uz]=CUPS veb interfeysi
+Name[tr]=Yazıcıları Yönet
+Comment[tr]=CUPS Web Arayüzü
Name[zh]=打印机管理
Comment[zh]=CUPS网页界面
Name[zh_TW]=印表管理
@@ -1,6 +1,35 @@
--- cups-config.in~ 2014-01-18 13:56:12.423297761 +0100
+++ cups-config.in 2014-01-18 13:56:59.459964275 +0100
@@ -50,7 +50,7 @@ else
diff -Nuar cups_old-2.2.6/config-scripts/cups-directories.m4 cups-2.2.6/config-scripts/cups-directories.m4
--- cups_old-2.2.6/config-scripts/cups-directories.m4 2017-12-14 06:56:50.708946000 +0300
+++ cups-2.2.6/config-scripts/cups-directories.m4 2017-12-14 09:23:45.490213940 +0300
@@ -101,8 +101,8 @@
if test "$libdir" = "\${exec_prefix}/lib"; then
case "$host_os_name" in
linux*)
- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
- libdir="$exec_prefix/lib64"
+ if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then
+ libdir="$exec_prefix/lib"
fi
;;
esac
diff -Nuar cups_old-2.2.6/configure cups-2.2.6/configure
--- cups_old-2.2.6/configure 2017-12-14 06:56:51.766946000 +0300
+++ cups-2.2.6/configure 2017-12-14 09:26:43.667224765 +0300
@@ -6187,8 +6187,8 @@
if test "$libdir" = "\${exec_prefix}/lib"; then
case "$host_os_name" in
linux*)
- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
- libdir="$exec_prefix/lib64"
+ if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then
+ libdir="$exec_prefix/lib"
fi
;;
esac
diff -Nuar cups_old-2.2.6/cups-config.in cups-2.2.6/cups-config.in
--- cups_old-2.2.6/cups-config.in 2017-11-01 17:57:53.000000000 +0300
+++ cups-2.2.6/cups-config.in 2017-12-14 09:22:37.641209818 +0300
@@ -48,7 +48,7 @@
CFLAGS="$CFLAGS -I$includedir"
fi
@@ -9,29 +38,3 @@
LDFLAGS="$LDFLAGS -L$libdir"
fi
fi
--- config-scripts/cups-directories.m4~ 2014-01-18 13:56:23.529964393 +0100
+++ config-scripts/cups-directories.m4 2014-01-18 13:57:40.706630807 +0100
@@ -103,8 +103,8 @@ dnl Fix "libdir" variable...
if test "$libdir" = "\${exec_prefix}/lib"; then
case "$uname" in
Linux*)
- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
- libdir="$exec_prefix/lib64"
+ if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then
+ libdir="$exec_prefix/lib"
fi
;;
HP-UX*)
--- configure~ 2014-01-18 13:56:32.346631030 +0100
+++ configure 2014-01-18 13:57:12.076630898 +0100
@@ -5893,8 +5893,8 @@ fi
if test "$libdir" = "\${exec_prefix}/lib"; then
case "$uname" in
Linux*)
- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
- libdir="$exec_prefix/lib64"
+ if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then
+ libdir="$exec_prefix/lib"
fi
;;
HP-UX*)
@@ -1,22 +1,12 @@
--- config-scripts/cups-network.m4~ 2014-01-18 14:05:51.353295869 +0100
+++ config-scripts/cups-network.m4 2014-01-18 14:07:25.179962227 +0100
@@ -45,7 +45,7 @@ if test x$enable_domainsocket != xno -a
case "$uname" in
Darwin*)
# Darwin and MaxOS X do their own thing...
diff -Nuar cups_old-2.2.6/config-scripts/cups-network.m4 cups-2.2.6/config-scripts/cups-network.m4
--- cups_old-2.2.6/config-scripts/cups-network.m4 2017-11-01 17:57:53.000000000 +0300
+++ cups-2.2.6/config-scripts/cups-network.m4 2017-12-14 09:40:48.442276087 +0300
@@ -48,7 +48,7 @@
case "$host_os_name" in
darwin*)
# Darwin and macOS do their own thing...
- CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd"
+ CUPS_DEFAULT_DOMAINSOCKET="/run/cupsd"
;;
*)
# All others use FHS standard...
--- config-scripts/cups-directories.m4~ 2014-01-18 14:05:59.609962507 +0100
+++ config-scripts/cups-directories.m4 2014-01-18 14:07:13.516628933 +0100
@@ -420,7 +420,7 @@ AC_ARG_WITH(rundir, [ --with-rundir
;;
*)
# All others
- CUPS_STATEDIR="$localstatedir/run/cups"
+ CUPS_STATEDIR="/run/cups"
;;
esac])
AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")