On Thu, Mar 16, 2017 at 9:05 PM, Jose Gutierrez de la Concha <j...@zeroc.com
> wrote:
> Hi Emilio,
>
> That is expected, we decide to change -debian suffix to -3.6 to be able to
> co install several version in the future -3.7 -4.0,
> as that is something our users my wish. I asked in Java dev list what was
> the proper way to deal with multiple java verions
> of a package and that is the recommended approach.
>
Forget to remove the control tag
>
>
> On Thu, Mar 16, 2017 at 7:01 PM, Emilio Pozuelo Monfort <po...@debian.org>
> wrote:
>
>>
>> Hi José,
>>
>> On 16/03/17 17:57, José Gutiérrez de la Concha wrote:
>> > Package: release.debian.org
>> > Severity: normal
>> > User: release.debian....@packages.debian.org
>> > Usertags: unblock
>> >
>> >
>> > Hi,
>> >
>> > I want to request unblock of zeroc-ice/3.6.3-5, it include a fix
>> > for RC bug 857219
>> >
>> > There was a broken symlink in the previous version that should have
>> > not been included in the package.
>> >
>> > The new package also include a minor fix to not install unversioned
>> > jar files.
>> >
>> > debdiff included bellow
>> >
>> > debdiff zeroc-ice_3.6.3-4.dsc zeroc-ice_3.6.3-5.dsc
>> > diff -Nru zeroc-ice-3.6.3/debian/changelog
>> zeroc-ice-3.6.3/debian/changelog
>> > --- zeroc-ice-3.6.3/debian/changelog 2016-12-05 08:37:57.000000000
>> +0000
>> > +++ zeroc-ice-3.6.3/debian/changelog 2017-03-09 15:22:39.000000000
>> +0000
>> > @@ -1,3 +1,10 @@
>> > +zeroc-ice (3.6.3-5) unstable; urgency=medium
>> > +
>> > + * Do not install libIceStormService.so (Closes: #857219)
>> > + * Fix libzeroc-ice3.6-java install to use 3.6 name
>> > +
>> > + -- Jose <j...@zeroc.com> Thu, 09 Mar 2017 16:22:39 +0100
>> > +
>> > zeroc-ice (3.6.3-4) unstable; urgency=medium
>> >
>> > * Move javahelper to Build-Depends to fix Bug#847010
>> > diff -Nru zeroc-ice-3.6.3/debian/libzeroc-ice3.6-java.poms
>> zeroc-ice-3.6.3/debian/libzeroc-ice3.6-java.poms
>> > --- zeroc-ice-3.6.3/debian/libzeroc-ice3.6-java.poms 2016-12-05
>> 08:37:57.000000000 +0000
>> > +++ zeroc-ice-3.6.3/debian/libzeroc-ice3.6-java.poms 2017-03-09
>> 15:22:39.000000000 +0000
>> > @@ -1,9 +1,9 @@
>> > -java/lib/ice-3.6.3.pom --artifact=java/lib/ice-3.6.3.jar
>> > -java/lib/icebox-3.6.3.pom --artifact=java/lib/icebox-3.6.3.jar
>> > -java/lib/icediscovery-3.6.3.pom --artifact=java/lib/icediscove
>> ry-3.6.3.jar
>> > -java/lib/icelocatordiscovery-3.6.3.pom --artifact=java/lib/icelocator
>> discovery-3.6.3.jar
>> > -java/lib/icegrid-3.6.3.pom --artifact=java/lib/icegrid-3.6.3.jar
>> > -java/lib/icestorm-3.6.3.pom --artifact=java/lib/icestorm-3.6.3.jar
>> > -java/lib/icepatch2-3.6.3.pom --artifact=java/lib/icepatch2-3.6.3.jar
>> > -java/lib/glacier2-3.6.3.pom --artifact=java/lib/glacier2-3.6.3.jar
>> > -java/lib/freeze-3.6.3.pom --artifact=java/lib/freeze-3.6.3.jar
>> > +java/lib/ice-3.6.3.pom --artifact=java/lib/ice-3.6.3.jar --java-lib
>> --no-usj-versionless
>> > +java/lib/icebox-3.6.3.pom --artifact=java/lib/icebox-3.6.3.jar
>> --java-lib --no-usj-versionless
>> > +java/lib/icediscovery-3.6.3.pom --artifact=java/lib/icediscovery-3.6.3.jar
>> --java-lib --no-usj-versionless
>> > +java/lib/icelocatordiscovery-3.6.3.pom
>> > --artifact=java/lib/icelocatordiscovery-3.6.3.jar
>> --java-lib --no-usj-versionless
>> > +java/lib/icegrid-3.6.3.pom --artifact=java/lib/icegrid-3.6.3.jar
>> --java-lib --no-usj-versionless
>> > +java/lib/icestorm-3.6.3.pom --artifact=java/lib/icestorm-3.6.3.jar
>> --java-lib --no-usj-versionless
>> > +java/lib/icepatch2-3.6.3.pom --artifact=java/lib/icepatch2-3.6.3.jar
>> --java-lib --no-usj-versionless
>> > +java/lib/glacier2-3.6.3.pom --artifact=java/lib/glacier2-3.6.3.jar
>> --java-lib --no-usj-versionless
>> > +java/lib/freeze-3.6.3.pom --artifact=java/lib/freeze-3.6.3.jar
>> --java-lib --no-usj-versionless
>> > diff -Nru zeroc-ice-3.6.3/debian/maven.rules
>> zeroc-ice-3.6.3/debian/maven.rules
>> > --- zeroc-ice-3.6.3/debian/maven.rules 1970-01-01 00:00:00.000000000
>> +0000
>> > +++ zeroc-ice-3.6.3/debian/maven.rules 2017-03-09 15:22:39.000000000
>> +0000
>> > @@ -0,0 +1,9 @@
>> > +com.zeroc freeze jar s/3\.6\..*/3.6/
>> > +com.zeroc glacier2 jar s/3\.6\..*/3.6/
>> > +com.zeroc icebox jar s/3\.6\..*/3.6/
>> > +com.zeroc ice jar s/3\.6\..*/3.6/
>> > +com.zeroc icediscovery jar s/3\.6\..*/3.6/
>> > +com.zeroc icelocatordiscovery jar s/3\.6\..*/3.6/
>> > +com.zeroc icegrid jar s/3\.6\..*/3.6/
>> > +com.zeroc icepatch2 jar s/3\.6\..*/3.6/
>> > +com.zeroc icestorm jar s/3\.6\..*/3.6/
>> > diff -Nru zeroc-ice-3.6.3/debian/rules zeroc-ice-3.6.3/debian/rules
>> > --- zeroc-ice-3.6.3/debian/rules 2016-12-05 08:37:57.000000000
>> +0000
>> > +++ zeroc-ice-3.6.3/debian/rules 2017-03-09 15:22:39.000000000
>> +0000
>> > @@ -30,6 +30,10 @@
>> > -PjgoodiesFormsVersion=debian \
>> > -PiceBuilderVersion=debian
>> >
>> > +#
>> > +# These files are not installed with any debian package.
>> > +#
>> > +INSTALL_EXCLUDE = usr/lib/$(DEB_HOST_MULTIARCH)/
>> libIceStormService.so
>> >
>> > export PYTHONDIR := $(shell python3 -c "import
>> sys;print('python{0}.{1}'.format(sys.version_info.major,
>> sys.version_info.minor))")
>> >
>> > @@ -90,11 +94,13 @@
>> > PHP_CONFIG=php-config$${v} $(MAKE) $(MAKEOPTS) -C php-$${v}
>> install; \
>> > done
>> > PYTHON=python3 $(MAKE) $(MAKEOPTS) -C python install
>> > + rm -rf $(addprefix $(DESTDIR)/,$(INSTALL_EXCLUDE))
>> >
>> > override_dh_auto_install-indep:
>> > $(MAKE) $(MAKEOPTS) -C cpp install
>> > $(MAKE) $(MAKEOPTS) -C java install
>> > rm -rf $(DESTDIR)/usr/share/java/*-sources.jar
>> > + rm -rf $(addprefix $(DESTDIR)/,$(INSTALL_EXCLUDE))
>> >
>> > override_dh_auto_clean-arch:
>> > $(MAKE) $(MAKEOPTS) -C cpp clean
>> >
>>
>> This results in:
>>
>> pochu@respighi:~$ debdiff /srv/mirrors/debian/pool/main/
>> z/zeroc-ice/libzeroc-ice3.6-java_3.6.3-*_all.deb
>> [The following lists of changes regard files as different if they have
>> different names, permissions or owners.]
>>
>> Files in second .deb but not in first
>> -------------------------------------
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/freeze/3.6/freeze-3.6.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/glacier2/3.6/glacier2-3.6.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/ice/3.6/ice-3.6.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icebox/3.6/icebox-3.6.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icediscovery/3.6/icediscovery-3.6.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icegrid/3.6/icegrid-3.6.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icelocatordiscovery/3.6/icelocatordiscovery-3.6.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icepatch2/3.6/icepatch2-3.6.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icestorm/3.6/icestorm-3.6.pom
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/freeze/3.6.3/freeze-3.6.3.jar -> ../../../../../java/freeze-3.6.3.jar
>> lrwxrwxrwx root/root
>> /usr/share/maven-repo/com/zeroc/freeze/3.6/freeze-3.6.jar
>> -> ../../../../../java/freeze-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/glacier2/3.6.3/glacier2-3.6.3.jar -> ../../../../../java/glacier2-3
>> .6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/glacier2/3.6/glacier2-3.6.jar -> ../../../../../java/glacier2-3
>> .6.3.jar
>> lrwxrwxrwx root/root
>> /usr/share/maven-repo/com/zeroc/ice/3.6.3/ice-3.6.3.jar
>> -> ../../../../../java/ice-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zeroc/ice/3.6/ice-3.6.jar
>> -> ../../../../../java/ice-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icebox/3.6.3/icebox-3.6.3.jar -> ../../../../../java/icebox-3.6.3.jar
>> lrwxrwxrwx root/root
>> /usr/share/maven-repo/com/zeroc/icebox/3.6/icebox-3.6.jar
>> -> ../../../../../java/icebox-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icediscovery/3.6.3/icediscovery-3.6.3.jar ->
>> ../../../../../java/icediscovery-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icediscovery/3.6/icediscovery-3.6.jar ->
>> ../../../../../java/icediscovery-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icegrid/3.6.3/icegrid-3.6.3.jar -> ../../../../../java/icegrid-3.
>> 6.3.jar
>> lrwxrwxrwx root/root
>> /usr/share/maven-repo/com/zeroc/icegrid/3.6/icegrid-3.6.jar
>> -> ../../../../../java/icegrid-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icelocatordiscovery/3.6.3/icelocatordiscovery-3.6.3.jar ->
>> ../../../../../java/icelocatordiscovery-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icelocatordiscovery/3.6/icelocatordiscovery-3.6.jar ->
>> ../../../../../java/icelocatordiscovery-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icepatch2/3.6.3/icepatch2-3.6.3.jar -> ../../../../../java/icepatch2-
>> 3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icepatch2/3.6/icepatch2-3.6.jar -> ../../../../../java/icepatch2-
>> 3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icestorm/3.6.3/icestorm-3.6.3.jar -> ../../../../../java/icestorm-3
>> .6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icestorm/3.6/icestorm-3.6.jar -> ../../../../../java/icestorm-3
>> .6.3.jar
>>
>> Files in first .deb but not in second
>> -------------------------------------
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/freeze/3.6.3/freeze-3.6.3.jar
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/freeze/debian/freeze-debian.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/glacier2/3.6.3/glacier2-3.6.3.jar
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/glacier2/debian/glacier2-debian.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/ice/3.6.3/ice-3.6.3.jar
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/ice/debian/ice-debian.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icebox/3.6.3/icebox-3.6.3.jar
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icebox/debian/icebox-debian.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icediscovery/3.6.3/icediscovery-3.6.3.jar
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icediscovery/debian/icediscovery-debian.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icegrid/3.6.3/icegrid-3.6.3.jar
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icegrid/debian/icegrid-debian.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icelocatordiscovery/3.6.3/icelocatordiscovery-3.6.3.jar
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icelocatordiscovery/debian/icelocatordiscovery-debian.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icepatch2/3.6.3/icepatch2-3.6.3.jar
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icepatch2/debian/icepatch2-debian.pom
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icestorm/3.6.3/icestorm-3.6.3.jar
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/icestorm/debian/icestorm-debian.pom
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/freeze/debian/freeze-debian.jar -> ../3.6.3/freeze-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/glacier2/debian/glacier2-debian.jar -> ../3.6.3/glacier2-3.6.3.jar
>> lrwxrwxrwx root/root
>> /usr/share/maven-repo/com/zeroc/ice/debian/ice-debian.jar
>> -> ../3.6.3/ice-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icebox/debian/icebox-debian.jar -> ../3.6.3/icebox-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icediscovery/debian/icediscovery-debian.jar ->
>> ../3.6.3/icediscovery-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icegrid/debian/icegrid-debian.jar -> ../3.6.3/icegrid-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icelocatordiscovery/debian/icelocatordiscovery-debian.jar ->
>> ../3.6.3/icelocatordiscovery-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icepatch2/debian/icepatch2-debian.jar -> ../3.6.3/icepatch2-3.6.3.jar
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/icestorm/debian/icestorm-debian.jar -> ../3.6.3/icestorm-3.6.3.jar
>>
>> Control files: lines which differ (wdiff format)
>> ------------------------------------------------
>> Installed-Size: [-4543-] {+2339+}
>> Version: [-3.6.3-4-] {+3.6.3-5+}
>> pochu@respighi:~$
>>
>> What's with those -debian.jar files? e.g.
>>
>> -rw-r--r-- root/root /usr/share/maven-repo/com/zer
>> oc/freeze/debian/freeze-debian.pom
>> lrwxrwxrwx root/root /usr/share/maven-repo/com/zer
>> oc/freeze/debian/freeze-debian.jar -> ../3.6.3/freeze-3.6.3.jar
>>
>> present in -4 but not in -5. Is that OK?
>>
>> Cheers,
>> Emilio
>>
>
>
>
> --
> José Gutiérrez de la Concha
> ZeroC, Inc.
>
--
José Gutiérrez de la Concha
ZeroC, Inc.
