From: František Dvořák Date: Wed, 25 Jan 2012 13:30:05 +0000 (+0000) Subject: Reshuffle Debian package names - prefer package names according to the library names. X-Git-Tag: glite-jobid-api-c_R_2_1_0_2~43 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=937924b799ec74a9cc00bc7195cad6198c8702d0;p=jra1mw.git Reshuffle Debian package names - prefer package names according to the library names. --- diff --git a/org.glite.jobid.api-c/project/debian.control b/org.glite.jobid.api-c/project/debian.control index 11659df..b0685f8 100644 --- a/org.glite.jobid.api-c/project/debian.control +++ b/org.glite.jobid.api-c/project/debian.control @@ -9,7 +9,7 @@ Homepage: @URL@ DM-Upload-Allowed: yes @DEBIAN_VCS@ -Package: libglite-jobid-api-c +Package: libglite-jobid2 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -20,7 +20,7 @@ Package: libglite-jobid-api-c-dev Section: libdevel Architecture: any Provides: glite-jobid-api-c -Depends: libglite-jobid-api-c (= ${binary:Version}), ${misc:Depends} +Depends: libglite-jobid2 (= ${binary:Version}), ${misc:Depends} Description: Development files for gLite jobid C library This package contains development libraries and header files for gLite jobid C library. @@ -29,6 +29,6 @@ Package: glite-jobid-api-c-dbg Section: debug Architecture: any Priority: extra -Depends: libglite-jobid-api-c (= ${binary:Version}), ${misc:Depends} +Depends: libglite-jobid2 (= ${binary:Version}), ${misc:Depends} Description: gLite jobid library debugging symbols This package contains debugging symbols for gLite jobid library. diff --git a/org.glite.jobid.api-c/project/debian.libglite-jobid-api-c.dirs b/org.glite.jobid.api-c/project/debian.libglite-jobid2.dirs similarity index 100% rename from org.glite.jobid.api-c/project/debian.libglite-jobid-api-c.dirs rename to org.glite.jobid.api-c/project/debian.libglite-jobid2.dirs diff --git a/org.glite.jobid.api-c/project/debian.libglite-jobid-api-c.install b/org.glite.jobid.api-c/project/debian.libglite-jobid2.install similarity index 100% rename from org.glite.jobid.api-c/project/debian.libglite-jobid-api-c.install rename to org.glite.jobid.api-c/project/debian.libglite-jobid2.install diff --git a/org.glite.lbjp-common.db/project/debian.control b/org.glite.lbjp-common.db/project/debian.control index 107d05d..be489f4 100644 --- a/org.glite.lbjp-common.db/project/debian.control +++ b/org.glite.lbjp-common.db/project/debian.control @@ -9,7 +9,7 @@ Homepage: @URL@ DM-Upload-Allowed: yes @DEBIAN_VCS@ -Package: libglite-lbjp-common-db +Package: libglite-lbu-db3 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -20,7 +20,7 @@ Package: libglite-lbjp-common-db-dev Section: libdevel Architecture: any Provides: glite-lbjp-common-db -Depends: libglite-lbjp-common-db (= ${binary:Version}), ${misc:Depends} +Depends: libglite-lbu-db3 (= ${binary:Version}), ${misc:Depends} Description: Development files for gLite L&B/JP common db module This package contains development libraries and header files for gLite L&B/JP common db module. @@ -29,6 +29,6 @@ Package: glite-lbjp-common-db-dbg Section: debug Architecture: any Priority: extra -Depends: libglite-lbjp-common-db (= ${binary:Version}), ${misc:Depends} +Depends: libglite-lbu-db3 (= ${binary:Version}), ${misc:Depends} Description: gLite L&B/JP common db module debugging symbols This package contains debugging symbols for gLite L&B/JP common db module. diff --git a/org.glite.lbjp-common.db/project/debian.libglite-lbjp-common-db.dirs b/org.glite.lbjp-common.db/project/debian.libglite-lbu-db3.dirs similarity index 100% rename from org.glite.lbjp-common.db/project/debian.libglite-lbjp-common-db.dirs rename to org.glite.lbjp-common.db/project/debian.libglite-lbu-db3.dirs diff --git a/org.glite.lbjp-common.db/project/debian.libglite-lbjp-common-db.install b/org.glite.lbjp-common.db/project/debian.libglite-lbu-db3.install similarity index 100% rename from org.glite.lbjp-common.db/project/debian.libglite-lbjp-common-db.install rename to org.glite.lbjp-common.db/project/debian.libglite-lbu-db3.install diff --git a/org.glite.lbjp-common.gss/project/debian.control b/org.glite.lbjp-common.gss/project/debian.control index 0eb67a6..99971f6 100644 --- a/org.glite.lbjp-common.gss/project/debian.control +++ b/org.glite.lbjp-common.gss/project/debian.control @@ -9,7 +9,7 @@ Homepage: @URL@ DM-Upload-Allowed: yes @DEBIAN_VCS@ -Package: libglite-lbjp-common-gss +Package: libglite-security-gss9 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -20,7 +20,7 @@ Package: libglite-lbjp-common-gss-dev Section: libdevel Architecture: any Provides: glite-lbjp-common-gss -Depends: libglite-lbjp-common-gss (= ${binary:Version}), ${misc:Depends}, libglobus-gssapi-gsi-dev +Depends: libglite-security-gss9 (= ${binary:Version}), ${misc:Depends}, libglobus-gssapi-gsi-dev Description: Development files for gLite L&B/JP common gss library This package contains development libraries and header files for gLite gss library. @@ -29,6 +29,6 @@ Package: glite-lbjp-common-gss-dbg Section: debug Architecture: any Priority: extra -Depends: libglite-lbjp-common-gss (= ${binary:Version}), ${misc:Depends} +Depends: libglite-security-gss9 (= ${binary:Version}), ${misc:Depends} Description: gLite gss library debugging symbols This package contains debugging symbols for gLite gss library. diff --git a/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss.dirs b/org.glite.lbjp-common.gss/project/debian.libglite-security-gss9.dirs similarity index 100% rename from org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss.dirs rename to org.glite.lbjp-common.gss/project/debian.libglite-security-gss9.dirs diff --git a/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss.install b/org.glite.lbjp-common.gss/project/debian.libglite-security-gss9.install similarity index 100% rename from org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss.install rename to org.glite.lbjp-common.gss/project/debian.libglite-security-gss9.install diff --git a/org.glite.lbjp-common.jp-interface/project/debian.control b/org.glite.lbjp-common.jp-interface/project/debian.control index f346645..66eedee 100644 --- a/org.glite.lbjp-common.jp-interface/project/debian.control +++ b/org.glite.lbjp-common.jp-interface/project/debian.control @@ -9,7 +9,7 @@ Homepage: @URL@ DM-Upload-Allowed: yes @DEBIAN_VCS@ -Package: libglite-lbjp-common-jp-interface +Package: libglite-jp-common2 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -20,7 +20,7 @@ Package: libglite-lbjp-common-jp-interface-dev Section: libdevel Architecture: any Provides: glite-lbjp-common-jp-interface -Depends: libglite-lbjp-common-jp-interface (= ${binary:Version}), ${misc:Depends} +Depends: libglite-jp-common2 (= ${binary:Version}), ${misc:Depends} Description: Development files for gLite L&B/JP interface library This package contains development libraries and header files for gLite L&B/JP interface library. @@ -29,6 +29,6 @@ Package: glite-lbjp-common-jp-interface-dbg Section: debug Architecture: any Priority: extra -Depends: libglite-lbjp-common-jp-interface (= ${binary:Version}), ${misc:Depends} +Depends: libglite-jp-common2 (= ${binary:Version}), ${misc:Depends} Description: gLite L&B/JP interface library debugging symbols This package contains debugging symbols for gLite L&B/JP interface library. diff --git a/org.glite.lbjp-common.jp-interface/project/debian.libglite-lbjp-common-jp-interface.dirs b/org.glite.lbjp-common.jp-interface/project/debian.libglite-jp-common2.dirs similarity index 100% rename from org.glite.lbjp-common.jp-interface/project/debian.libglite-lbjp-common-jp-interface.dirs rename to org.glite.lbjp-common.jp-interface/project/debian.libglite-jp-common2.dirs diff --git a/org.glite.lbjp-common.jp-interface/project/debian.libglite-lbjp-common-jp-interface.install b/org.glite.lbjp-common.jp-interface/project/debian.libglite-jp-common2.install similarity index 100% rename from org.glite.lbjp-common.jp-interface/project/debian.libglite-lbjp-common-jp-interface.install rename to org.glite.lbjp-common.jp-interface/project/debian.libglite-jp-common2.install diff --git a/org.glite.lbjp-common.log/project/debian.control b/org.glite.lbjp-common.log/project/debian.control index aad3b87..bd0c669 100644 --- a/org.glite.lbjp-common.log/project/debian.control +++ b/org.glite.lbjp-common.log/project/debian.control @@ -9,7 +9,7 @@ Homepage: @URL@ DM-Upload-Allowed: yes @DEBIAN_VCS@ -Package: libglite-lbjp-common-log +Package: libglite-lbu-log1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -20,7 +20,7 @@ Package: libglite-lbjp-common-log-dev Section: libdevel Architecture: any Provides: glite-lbjp-common-log -Depends: libglite-lbjp-common-log (= ${binary:Version}), ${misc:Depends} +Depends: libglite-lbu-log1 (= ${binary:Version}), ${misc:Depends} Description: Development files for gLite L&B/JP common log module This package contains development libraries and header files for gLite L&B/JP common log module. @@ -29,6 +29,6 @@ Package: glite-lbjp-common-log-dbg Section: debug Architecture: any Priority: extra -Depends: libglite-lbjp-common-log (= ${binary:Version}), ${misc:Depends} +Depends: libglite-lbu-log1 (= ${binary:Version}), ${misc:Depends} Description: gLite L&B/JP common log module debugging symbols This package contains debugging symbols for gLite L&B/JP common log module. diff --git a/org.glite.lbjp-common.log/project/debian.libglite-lbjp-common-log.dirs b/org.glite.lbjp-common.log/project/debian.libglite-lbu-log1.dirs similarity index 100% rename from org.glite.lbjp-common.log/project/debian.libglite-lbjp-common-log.dirs rename to org.glite.lbjp-common.log/project/debian.libglite-lbu-log1.dirs diff --git a/org.glite.lbjp-common.log/project/debian.libglite-lbjp-common-log.install b/org.glite.lbjp-common.log/project/debian.libglite-lbu-log1.install similarity index 100% rename from org.glite.lbjp-common.log/project/debian.libglite-lbjp-common-log.install rename to org.glite.lbjp-common.log/project/debian.libglite-lbu-log1.install diff --git a/org.glite.lbjp-common.maildir/project/debian.control b/org.glite.lbjp-common.maildir/project/debian.control index 433c8fc..36da425 100644 --- a/org.glite.lbjp-common.maildir/project/debian.control +++ b/org.glite.lbjp-common.maildir/project/debian.control @@ -9,7 +9,7 @@ Homepage: @URL@ DM-Upload-Allowed: yes @DEBIAN_VCS@ -Package: libglite-lbjp-common-maildir +Package: libglite-lbu-maildir2 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -20,7 +20,7 @@ Package: libglite-lbjp-common-maildir-dev Section: libdevel Architecture: any Provides: glite-lbjp-common-maildir -Depends: libglite-lbjp-common-maildir (= ${binary:Version}), ${misc:Depends} +Depends: libglite-lbu-maildir2 (= ${binary:Version}), ${misc:Depends} Description: Development files for gLite L&B/JP common maildir library This package contains development libraries and header files for gLite L&B/JP common maildir library. @@ -29,7 +29,7 @@ Package: glite-lbjp-common-maildir-dbg Section: debug Architecture: any Priority: extra -Depends: libglite-lbjp-common-maildir (= ${binary:Version}), ${misc:Depends} +Depends: libglite-lb2-maildir2 (= ${binary:Version}), ${misc:Depends} Description: gLite L&B/JP common maildir library debugging symbols This package contains debugging symbols for gLite L&B/JP common maildir library. diff --git a/org.glite.lbjp-common.maildir/project/debian.libglite-lbjp-common-maildir.dirs b/org.glite.lbjp-common.maildir/project/debian.libglite-lbu-maildir2.dirs similarity index 100% rename from org.glite.lbjp-common.maildir/project/debian.libglite-lbjp-common-maildir.dirs rename to org.glite.lbjp-common.maildir/project/debian.libglite-lbu-maildir2.dirs diff --git a/org.glite.lbjp-common.maildir/project/debian.libglite-lbjp-common-maildir.install b/org.glite.lbjp-common.maildir/project/debian.libglite-lbu-maildir2.install similarity index 100% rename from org.glite.lbjp-common.maildir/project/debian.libglite-lbjp-common-maildir.install rename to org.glite.lbjp-common.maildir/project/debian.libglite-lbu-maildir2.install diff --git a/org.glite.lbjp-common.server-bones/project/debian.control b/org.glite.lbjp-common.server-bones/project/debian.control index 398b6d3..2537f5e 100644 --- a/org.glite.lbjp-common.server-bones/project/debian.control +++ b/org.glite.lbjp-common.server-bones/project/debian.control @@ -9,7 +9,7 @@ Homepage: @URL@ DM-Upload-Allowed: yes @DEBIAN_VCS@ -Package: libglite-lbjp-common-server-bones +Package: libglite-lbu-server-bones2 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -20,7 +20,7 @@ Package: libglite-lbjp-common-server-bones-dev Section: libdevel Architecture: any Provides: glite-lbjp-common-server-bones -Depends: libglite-lbjp-common-server-bones (= ${binary:Version}), ${misc:Depends} +Depends: libglite-lbu-server-bones2 (= ${binary:Version}), ${misc:Depends} Description: Development files for gLite L&B/JP common server bones This package contains development libraries and header files for gLite L&B/JP common server-bones. @@ -29,6 +29,6 @@ Package: glite-lbjp-common-server-bones-dbg Section: debug Architecture: any Priority: extra -Depends: libglite-lbjp-common-server-bones (= ${binary:Version}), ${misc:Depends} +Depends: libglite-lbu-server-bones2 (= ${binary:Version}), ${misc:Depends} Description: gLite L&B/JP common server bones debugging symbols This package contains debugging symbols for gLite L&B/JP common server-bones. diff --git a/org.glite.lbjp-common.server-bones/project/debian.libglite-lbjp-common-server-bones.dirs b/org.glite.lbjp-common.server-bones/project/debian.libglite-lbu-server-bones2.dirs similarity index 100% rename from org.glite.lbjp-common.server-bones/project/debian.libglite-lbjp-common-server-bones.dirs rename to org.glite.lbjp-common.server-bones/project/debian.libglite-lbu-server-bones2.dirs diff --git a/org.glite.lbjp-common.server-bones/project/debian.libglite-lbjp-common-server-bones.install b/org.glite.lbjp-common.server-bones/project/debian.libglite-lbu-server-bones2.install similarity index 100% rename from org.glite.lbjp-common.server-bones/project/debian.libglite-lbjp-common-server-bones.install rename to org.glite.lbjp-common.server-bones/project/debian.libglite-lbu-server-bones2.install diff --git a/org.glite.lbjp-common.trio/project/debian.control b/org.glite.lbjp-common.trio/project/debian.control index be11dbb..80af7ce 100644 --- a/org.glite.lbjp-common.trio/project/debian.control +++ b/org.glite.lbjp-common.trio/project/debian.control @@ -9,7 +9,7 @@ Homepage: @URL@ DM-Upload-Allowed: yes @DEBIAN_VCS@ -Package: libglite-lbjp-common-trio +Package: libglite-lbu-trio2 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -20,7 +20,7 @@ Package: libglite-lbjp-common-trio-dev Section: libdevel Architecture: any Provides: glite-lbjp-common-trio -Depends: libglite-lbjp-common-trio (= ${binary:Version}), ${misc:Depends} +Depends: libglite-lbu-trio2 (= ${binary:Version}), ${misc:Depends} Description: Development files for gLite L&B/JP common trio library This package contains development libraries and header files for gLite L&B/JP common trio library. @@ -29,6 +29,6 @@ Package: glite-lbjp-common-trio-dbg Section: debug Architecture: any Priority: extra -Depends: libglite-lbjp-common-trio (= ${binary:Version}), ${misc:Depends} +Depends: libglite-lbu-trio2 (= ${binary:Version}), ${misc:Depends} Description: gLite L&B/JP common trio library debugging symbols This package contains debugging symbols for gLite L&B/JP common trio library. diff --git a/org.glite.lbjp-common.trio/project/debian.libglite-lbjp-common-trio.dirs b/org.glite.lbjp-common.trio/project/debian.libglite-lbu-trio2.dirs similarity index 100% rename from org.glite.lbjp-common.trio/project/debian.libglite-lbjp-common-trio.dirs rename to org.glite.lbjp-common.trio/project/debian.libglite-lbu-trio2.dirs diff --git a/org.glite.lbjp-common.trio/project/debian.libglite-lbjp-common-trio.install b/org.glite.lbjp-common.trio/project/debian.libglite-lbu-trio2.install similarity index 100% rename from org.glite.lbjp-common.trio/project/debian.libglite-lbjp-common-trio.install rename to org.glite.lbjp-common.trio/project/debian.libglite-lbu-trio2.install diff --git a/org.glite.px.proxyrenewal/project/.post b/org.glite.px.proxyrenewal/project/.post deleted file mode 100644 index e69de29..0000000 diff --git a/org.glite.px.proxyrenewal/project/.postun b/org.glite.px.proxyrenewal/project/.postun deleted file mode 100644 index e69de29..0000000 diff --git a/org.glite.px.proxyrenewal/project/debian.control b/org.glite.px.proxyrenewal/project/debian.control index 22ff916..be26262 100644 --- a/org.glite.px.proxyrenewal/project/debian.control +++ b/org.glite.px.proxyrenewal/project/debian.control @@ -12,7 +12,7 @@ DM-Upload-Allowed: yes Package: glite-px-proxyrenewal Section: misc Architecture: any -Depends: ${misc:Depends}, libglite-security-proxyrenewal2 (= ${binary:Version}), libglite-security-proxyrenewal-dev (= ${binary:Version}), glite-px-proxyrenewal-clients (= ${binary:Version}) +Depends: ${misc:Depends}, libglite-security-proxyrenewal2 (= ${binary:Version}), libglite-security-proxyrenewal-dev (= ${binary:Version}), glite-px-proxyrenewal-progs (= ${binary:Version}) Description: Virtual package with runtime and development files of gLite proxyrenewal This is a virtual package providing runtime and development files for gLite proxyrenewal. @@ -33,7 +33,7 @@ Description: Development files for gLite proxyrenewal library This package contains development libraries and header files for gLite proxyrenewal library. -Package: glite-px-proxyrenewal-clients +Package: glite-px-proxyrenewal-progs Section: misc Architecture: any Priority: extra diff --git a/org.glite.px.proxyrenewal/project/debian.glite-px-proxyrenewal-clients.dirs b/org.glite.px.proxyrenewal/project/debian.glite-px-proxyrenewal-progs.dirs similarity index 100% rename from org.glite.px.proxyrenewal/project/debian.glite-px-proxyrenewal-clients.dirs rename to org.glite.px.proxyrenewal/project/debian.glite-px-proxyrenewal-progs.dirs diff --git a/org.glite.px.proxyrenewal/project/debian.glite-px-proxyrenewal-clients.install b/org.glite.px.proxyrenewal/project/debian.glite-px-proxyrenewal-progs.install similarity index 100% rename from org.glite.px.proxyrenewal/project/debian.glite-px-proxyrenewal-clients.install rename to org.glite.px.proxyrenewal/project/debian.glite-px-proxyrenewal-progs.install diff --git a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec index e598993..642c64d 100644 --- a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec +++ b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec @@ -12,7 +12,7 @@ BuildRequires: libtool BuildRequires: myproxy-devel%{?_isa} BuildRequires: voms-devel%{?_isa} Requires: %{name}-devel%{?_isa} -Requires: %{name}-clients +Requires: %{name}-progs Obsoletes: glite-security-proxyrenewal%{?_isa} <= 1.3.11-4 Provides: %{name}%{?_isa} = %{version}-%{release} BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -47,12 +47,12 @@ This package contains development libraries and header files for gLite proxyrenewal library. -%package clients +%package progs Summary: gLite proxyrenewal daemon and client Group: System Environment/Base -%description clients +%description progs This package contains daemon and client program of gLite proxyrenewal. @@ -88,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT %postun libs -p /sbin/ldconfig -%pre clients +%pre progs getent group glite >/dev/null || groupadd -r glite getent passwd glite >/dev/null || useradd -r -g glite -d /var/glite -c "gLite user" glite mkdir -p /var/glite /var/log/glite 2>/dev/null || : @@ -96,18 +96,18 @@ chown glite:glite /var/glite /var/log/glite exit 0 -%post clients +%post progs /sbin/chkconfig --add glite-proxy-renewald -%preun clients +%preun progs if [ $1 -eq 0 ] ; then /sbin/service glite-proxy-renewald stop >/dev/null 2>&1 /sbin/chkconfig --del glite-proxy-renewald fi -%postun clients +%postun progs if [ "$1" -ge "1" ] ; then /sbin/service glite-proxy-renewald condrestart >/dev/null 2>&1 || : fi @@ -137,7 +137,7 @@ fi /usr/%{_lib}/libglite_security_proxyrenewal_core.so -%files clients +%files progs %defattr(-,root,root) /etc/init.d/glite-proxy-renewald /usr/bin/glite-proxy-renew