[squirrel-sql] branch master updated (67f90f3 -> 63703a8)
This is an automated email from the git hooks/post-receive script. tg pushed a change to branch master in repository squirrel-sql. from 67f90f3 Add missing libpostgresql-jdbc-java Depends to squirrel-sql-plugin-postgres new 63703a8 conflict with jgoodies in sid as of two days or so ago, for now; this needs (AGAIN!) porting to the newer version (so much for their “we have had a stable API since 1.0” claim…) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/control | 2 ++ 1 file changed, 2 insertions(+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/squirrel-sql.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[libjsr305-java] 01/03: Install a 'debian' maven version as well (Closes: #690695)
This is an automated email from the git hooks/post-receive script. tg pushed a commit to branch master in repository libjsr305-java. commit c1486399453d44c5f2055925377b114cd357bb10 Author: mirabilos Date: Sat Oct 15 00:18:55 2016 +0200 Install a 'debian' maven version as well (Closes: #690695) --- debian/changelog | 7 +++ debian/maven-debian.rules | 2 ++ debian/rules | 9 ++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9dc35f8..3b3fa37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libjsr305-java (0.1~+svn49-9.1) unstable; urgency=medium + + * Non-maintainer upload. + * Install a 'debian' maven version as well (Closes: #690695) + + -- Thorsten Glaser Sat, 15 Oct 2016 00:18:50 +0200 + libjsr305-java (0.1~+svn49-9) unstable; urgency=medium * Team upload. diff --git a/debian/maven-debian.rules b/debian/maven-debian.rules new file mode 100644 index 000..77cdaee --- /dev/null +++ b/debian/maven-debian.rules @@ -0,0 +1,2 @@ +# Remap this version to debian in deb maven repo +s/org.jsr-305/com.google.code.findbugs/ s/ri/jsr305/ * s/0\..*/debian/ * * diff --git a/debian/rules b/debian/rules index 6b4b698..351740c 100755 --- a/debian/rules +++ b/debian/rules @@ -23,9 +23,12 @@ get-orig-source: override_jh_installlibs: cp ri/pom.xml debian/pom.xml mh_installpom -plib$(PACKAGE)-java --no-parent --rules=debian/maven-compat.rules debian/pom.xml - mh_installjar -plib$(PACKAGE)-java --rules=debian/maven-compat.rules debian/pom.xml $(PACKAGE).jar + mh_installjar -plib$(PACKAGE)-java --rules=debian/maven-compat.rules debian/pom.xml $(PACKAGE).jar dh_link -plib$(PACKAGE)-java /usr/share/java/jsr305.jar usr/share/maven-repo/org/jsr-305/jsr305/0.1-SNAPSHOT/jsr305-0.1-SNAPSHOT.jar + cp ri/pom.xml debian/pom.xml + mh_installpom -plib$(PACKAGE)-java --no-parent --rules=debian/maven-debian.rules debian/pom.xml + mh_installjar -plib$(PACKAGE)-java --rules=debian/maven-debian.rules debian/pom.xml $(PACKAGE).jar + dh_link -plib$(PACKAGE)-java /usr/share/java/jsr305.jar usr/share/maven-repo/com/google/code/findbugs/jsr305/debian/jsr305-debian.jar mh_installpoms -plib$(PACKAGE)-java mh_installjar -plib$(PACKAGE)-java --usj-version=$(DEB_UPSTREAM_VERSION) \ - -l ri/pom.xml $(PACKAGE).jar - + -l ri/pom.xml $(PACKAGE).jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjsr305-java.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[libjsr305-java] branch master updated (159c0b1 -> 7dafd1f)
This is an automated email from the git hooks/post-receive script. tg pushed a change to branch master in repository libjsr305-java. from 159c0b1 Replaced the duplicate jar jsr305-0.1-SNAPSHOT.jar with a link to /usr/share/java/jsr305.jar new c148639 Install a 'debian' maven version as well (Closes: #690695) new a501f04 mark this as team upload (pending current discussion) new 7dafd1f while here, address (most) Lintian warnings The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog| 8 debian/control | 2 +- debian/libjsr305-java-doc.lintian-overrides | 2 +- debian/libjsr305-java.lintian-overrides | 2 +- debian/maven-debian.rules | 2 ++ debian/rules| 9 ++--- 6 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 debian/maven-debian.rules -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjsr305-java.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[libjsr305-java] 03/03: while here, address (most) Lintian warnings
This is an automated email from the git hooks/post-receive script. tg pushed a commit to branch master in repository libjsr305-java. commit 7dafd1f18f814a4c903151a11f5e018126ce1d50 Author: mirabilos Date: Mon Oct 17 19:52:11 2016 +0200 while here, address (most) Lintian warnings --- debian/changelog| 3 ++- debian/control | 2 +- debian/libjsr305-java-doc.lintian-overrides | 2 +- debian/libjsr305-java.lintian-overrides | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 017272a..d24ded8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ libjsr305-java (0.1~+svn49-10) unstable; urgency=medium * Team upload. * Install a 'debian' maven version as well (Closes: #690695) + * While here, address (most) Lintian warnings - -- Thorsten Glaser Sat, 15 Oct 2016 00:18:50 +0200 + -- Thorsten Glaser Mon, 17 Oct 2016 19:51:54 +0200 libjsr305-java (0.1~+svn49-9) unstable; urgency=medium diff --git a/debian/control b/debian/control index ac2f24e..8d1dd84 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9~), default-jdk, javahelper (>= 0.32~), default-jdk-doc, maven-repo-helper Standards-Version: 3.9.6 Homepage: http://code.google.com/p/jsr-305/ -Vcs-Git: git://anonscm.debian.org/pkg-java/libjsr305-java.git +Vcs-Git: https://anonscm.debian.org/git/pkg-java/libjsr305-java.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjsr305-java.git Package: libjsr305-java diff --git a/debian/libjsr305-java-doc.lintian-overrides b/debian/libjsr305-java-doc.lintian-overrides index 58461ae..5da6a63 100644 --- a/debian/libjsr305-java-doc.lintian-overrides +++ b/debian/libjsr305-java-doc.lintian-overrides @@ -1 +1 @@ -libjsr305-java-doc: copyright-should-refer-to-common-license-file-for-lgpl +libjsr305-java-doc: no-upstream-changelog diff --git a/debian/libjsr305-java.lintian-overrides b/debian/libjsr305-java.lintian-overrides index 317ce8e..8e2bf29 100644 --- a/debian/libjsr305-java.lintian-overrides +++ b/debian/libjsr305-java.lintian-overrides @@ -1 +1 @@ -libjsr305-java: copyright-should-refer-to-common-license-file-for-lgpl +libjsr305-java: no-upstream-changelog -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjsr305-java.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[libjsr305-java] 02/03: mark this as team upload (pending current discussion)
This is an automated email from the git hooks/post-receive script. tg pushed a commit to branch master in repository libjsr305-java. commit a501f04c99b0695e5db86e3c926da4dffda2175e Author: mirabilos Date: Mon Oct 17 19:49:29 2016 +0200 mark this as team upload (pending current discussion) --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3b3fa37..017272a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -libjsr305-java (0.1~+svn49-9.1) unstable; urgency=medium +libjsr305-java (0.1~+svn49-10) unstable; urgency=medium - * Non-maintainer upload. + * Team upload. * Install a 'debian' maven version as well (Closes: #690695) -- Thorsten Glaser Sat, 15 Oct 2016 00:18:50 +0200 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjsr305-java.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r19163 - trunk/yui-compressor/debian
Author: tg Date: 2016-10-18 10:37:45 + (Tue, 18 Oct 2016) New Revision: 19163 Added: trunk/yui-compressor/debian/yui-compressor.links trunk/yui-compressor/debian/yuicompressor-debian.pom Modified: trunk/yui-compressor/debian/changelog trunk/yui-compressor/debian/yui-compressor.install Log: prepare a team upload to fix #840792 Modified: trunk/yui-compressor/debian/changelog === --- trunk/yui-compressor/debian/changelog 2016-10-10 23:13:20 UTC (rev 19162) +++ trunk/yui-compressor/debian/changelog 2016-10-18 10:37:45 UTC (rev 19163) @@ -1,3 +1,10 @@ +yui-compressor (2.4.7-3) unstable; urgency=medium + + * Team upload. + * Add maven repositoy metadata. (Closes: #840792) + + -- Thorsten Glaser Tue, 18 Oct 2016 12:13:00 +0200 + yui-compressor (2.4.7-2) unstable; urgency=medium * Team upload. Modified: trunk/yui-compressor/debian/yui-compressor.install === --- trunk/yui-compressor/debian/yui-compressor.install 2016-10-10 23:13:20 UTC (rev 19162) +++ trunk/yui-compressor/debian/yui-compressor.install 2016-10-18 10:37:45 UTC (rev 19163) @@ -1,2 +1,3 @@ build/yui-compressor.jar /usr/share/yui-compressor debian/bin/yui-compressor /usr/bin +debian/yuicompressor-debian.pom /usr/share/maven-repo/com/yahoo/platform/yui/yuicompressor/debian/ Added: trunk/yui-compressor/debian/yui-compressor.links === --- trunk/yui-compressor/debian/yui-compressor.links (rev 0) +++ trunk/yui-compressor/debian/yui-compressor.links2016-10-18 10:37:45 UTC (rev 19163) @@ -0,0 +1,2 @@ +/usr/share/yui-compressor/yui-compressor.jar /usr/share/maven-repo/com/yahoo/platform/yui/yuicompressor/debian/yuicompressor-debian.jar +/usr/share/yui-compressor/yui-compressor.jar /usr/share/java/yuicompressor.jar Added: trunk/yui-compressor/debian/yuicompressor-debian.pom === --- trunk/yui-compressor/debian/yuicompressor-debian.pom (rev 0) +++ trunk/yui-compressor/debian/yuicompressor-debian.pom2016-10-18 10:37:45 UTC (rev 19163) @@ -0,0 +1,13 @@ + + 4.0.0 + com.yahoo.platform.yui + yuicompressor + debian + jar + + 2.4.7 + + yui-compressor + com.yahoo.platform.yui yuicompressor jar s/.*/debian/ * * + + ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r19164 - trunk/yui-compressor/debian
Author: tg Date: 2016-10-18 10:54:38 + (Tue, 18 Oct 2016) New Revision: 19164 Modified: trunk/yui-compressor/debian/changelog trunk/yui-compressor/debian/yuicompressor-debian.pom Log: a versioned dependency is preferable Modified: trunk/yui-compressor/debian/changelog === --- trunk/yui-compressor/debian/changelog 2016-10-18 10:37:45 UTC (rev 19163) +++ trunk/yui-compressor/debian/changelog 2016-10-18 10:54:38 UTC (rev 19164) @@ -1,9 +1,9 @@ yui-compressor (2.4.7-3) unstable; urgency=medium * Team upload. - * Add maven repositoy metadata. (Closes: #840792) + * Add maven repository metadata. (Closes: #840792) - -- Thorsten Glaser Tue, 18 Oct 2016 12:13:00 +0200 + -- Thorsten Glaser Tue, 18 Oct 2016 12:54:25 +0200 yui-compressor (2.4.7-2) unstable; urgency=medium Modified: trunk/yui-compressor/debian/yuicompressor-debian.pom === --- trunk/yui-compressor/debian/yuicompressor-debian.pom2016-10-18 10:37:45 UTC (rev 19163) +++ trunk/yui-compressor/debian/yuicompressor-debian.pom2016-10-18 10:54:38 UTC (rev 19164) @@ -5,8 +5,8 @@ debian jar - 2.4.7 - + 2.4.7-3~ + yui-compressor com.yahoo.platform.yui yuicompressor jar s/.*/debian/ * * ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[closure-compiler] 01/01: no, this does n̲o̲t̲ --has-package-version
This is an automated email from the git hooks/post-receive script. tg pushed a commit to branch master in repository closure-compiler. commit 4d919f9c33fdbdcc394f84c2f3a804947dab5dfe Author: mirabilos Date: Tue Oct 18 12:56:59 2016 +0200 no, this does n̲o̲t̲ --has-package-version --- debian/changelog | 8 debian/libclosure-compiler-java.poms | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 12b66bb..7d5c09a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +closure-compiler (20130227+dfsg1-9) unstable; urgency=medium + + * Team upload. + * Fix generated POM so that packages depending on this package +don’t get broken package relationships generated + + -- Thorsten Glaser Tue, 18 Oct 2016 12:56:09 +0200 + closure-compiler (20130227+dfsg1-8) unstable; urgency=medium [ Emmanuel Bourg ] diff --git a/debian/libclosure-compiler-java.poms b/debian/libclosure-compiler-java.poms index 24c5321..eb6e8bf 100644 --- a/debian/libclosure-compiler-java.poms +++ b/debian/libclosure-compiler-java.poms @@ -25,4 +25,4 @@ # --site-xml=: Optional, the location for site.xml if it needs to be installed. # Empty by default. [mh_install] # -build/pom.xml --has-package-version --java-lib --usj-name=closure-compiler --artifact=build/closure-compiler-*.jar +build/pom.xml --java-lib --usj-name=closure-compiler --artifact=build/closure-compiler-*.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/closure-compiler.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[closure-compiler] branch master updated (bbbada7 -> 4d919f9)
This is an automated email from the git hooks/post-receive script. tg pushed a change to branch master in repository closure-compiler. from bbbada7 prepare for upload new 4d919f9 no, this does n̲o̲t̲ --has-package-version The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 8 debian/libclosure-compiler-java.poms | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/closure-compiler.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[closure-compiler] annotated tag debian/20130227+dfsg1-9 created (now 3d23b11)
This is an automated email from the git hooks/post-receive script. tg pushed a change to annotated tag debian/20130227+dfsg1-9 in repository closure-compiler. at 3d23b11 (tag) tagging 4d919f9c33fdbdcc394f84c2f3a804947dab5dfe (commit) replaces debian/20130227+dfsg1-8 tagged by mirabilos on Tue Oct 18 13:35:57 2016 +0200 - Log - closure-compiler (20130227+dfsg1-9) unstable; urgency=medium -BEGIN PGP SIGNATURE- Comment: ☃ ЦΤℱ—８ ☕☂☄ iQIcBAABCQAGBQJYBgkfAAoJEIlQwYleuNOzIGYP/3MHb+TEe9TNFEczF/Nzns7V 1Yzbe+1dMa2HyQ9PeiHe76TE32V4Z44VBHHNCTJaVQ7JhhP0dqxrx+KP7rQqwbAG 9CjAGmgGRvYrFEGLEYWFEikUVrlL6r8MsS7tKrw3B58K3JDvR1CMHBycSsrLpoDJ qZpR2tNJcfpcWEmUicbwsD4L9Cb8xVZwq9SBKVeOI/kKiRayar+JpQT6Um58w4nd pDk9EnJ+JVZqyZMF4yGSGsDVTln8OAlsOK1oSjHj2OsmYHcHurO0RO3Klb0noudK 7UX64ZsISbeFIRCU2DSElgwCG0sInQHpiz4hGZnh6GypKt6RWKA2oc1ksA/BVX+4 nQFvXXilncJiXIeHlhwnnJrCuNe5rxRm6VU0ZBKS8CzoY1kYJB+No31ZxoeT4bKr 02V/A5bdtz2qbb9APSmgno6nalxIwuS28lqfaW4Yt8yk3+oyqI66cKFcrr9mGYdJ vi+GTBdv8lDKAVbxuTFxImg1AhqXKXr5HkdSljs10Q/PS2EY32Sw5L3nqnqW82Sa E0DMSM1mK4S7Q5Y4GZibwFm5CVX6SOdUb65kl7OE3vU+51cERnZUNOGPjyrwhDmw Gp7q7fP4lwLOd2N7jXljVqedeZO8VJw3CAsQ93SMXI22JB6K4hEAtErzN0bEQmAW JmkAnQm/4FdRueAhIKO9 =x7Yz -END PGP SIGNATURE- mirabilos (1): no, this does n̲o̲t̲ --has-package-version --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/closure-compiler.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[libjsr305-java] annotated tag debian/0.1_+svn49-10 created (now b46f09f)
This is an automated email from the git hooks/post-receive script. tg pushed a change to annotated tag debian/0.1_+svn49-10 in repository libjsr305-java. at b46f09f (tag) tagging 7dafd1f18f814a4c903151a11f5e018126ce1d50 (commit) replaces debian/0.1_+svn49-9 tagged by mirabilos on Wed Oct 19 13:02:08 2016 +0200 - Log - libjsr305-java (0.1~+svn49-10) unstable; urgency=medium -BEGIN PGP SIGNATURE- Comment: ☃ ЦΤℱ—８ ☕☂☄ iQIcBAABCQAGBQJYB1KxAAoJEIlQwYleuNOz1x0P/3K/QNmvGFPd7f5r29QGwvvS CPoLf4azo+dQ6urI6jeeQg0Hl6CdX/yRrLx1kburEqjT9IXsFobqyy74Tn3f0XU4 RiUbZWJ7YwoRgXo0fDzQh4u/PhUHfsxUHJjRr4O2Yhn/of0N5wZpE6MxNaj832aL iSlvWcrnSpR/oFejJl/nQyU2Yf6mdUY+GvRbmCRqbsslYbyPvpkhKgoyeVtCXFPa TrBouJtl1Bf4HWchZADKGX38zdDRwJKwCfi2o4roFkLGyDygneSYsvWyMtmxvEWm d9YbJIVuUvgJi3RjjS30ZfJTJASLazhe2ltHjcxd2d40KUnFBCCfV/IXiZalSSYa EeIea79Xh1jBdFLwsH9zlYsy7MNWZjA5zT5I/UB9ceTsDZBzXc3A5olwgEO+7o0V Jp54eo0OeOzghgwexHSeWjsWg7ugzME0OIYQQdvlbkSho8EsK/aPhuOyBmhmuKM1 jfSAnZL0kkh2g/Vxv9mxOKSwlxV2RMvIx6lJjp/niTl/FfSyGHbwbbdcksThjrw1 XbSnUCfK8h8RYj6VaangI/MTvVDlpvuWsuUdnaxryCUyCzepcvoH+wZLwsBF5peZ N/FRm9NhfH9BGFiQZtkdRi+GCBaMy4TTlSweXNhLFXySbAxBh+yDpWec0CJuigJQ HPwbzdyLHy54MFn8OfPs =Rxsh -END PGP SIGNATURE- mirabilos (3): Install a 'debian' maven version as well (Closes: #690695) mark this as team upload (pending current discussion) while here, address (most) Lintian warnings --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjsr305-java.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r19166 - tags/yui-compressor
Author: tg Date: 2016-10-19 11:28:31 + (Wed, 19 Oct 2016) New Revision: 19166 Added: tags/yui-compressor/2.4.7-3/ Log: tag the upload ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[maven-war-plugin] branch master updated (bf268fc -> 57c5368)
This is an automated email from the git hooks/post-receive script. tg pushed a change to branch master in repository maven-war-plugin. from bf268fc Upload to unstable new 9360c30 Apply upstream fix for MWAR-269, needed to package Guacamole new 57c5368 Fix VCS-* in debian/control while here The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 8 +++ debian/control | 4 ++-- debian/patches/MWAR-269.diff | 55 debian/patches/series| 1 + 4 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 debian/patches/MWAR-269.diff create mode 100644 debian/patches/series -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-war-plugin.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[maven-war-plugin] 02/02: Fix VCS-* in debian/control while here
This is an automated email from the git hooks/post-receive script. tg pushed a commit to branch master in repository maven-war-plugin. commit 57c53686032f648b6d99d3f1eaf05a85055e01ca Author: mirabilos Date: Sat Oct 29 01:21:08 2016 +0200 Fix VCS-* in debian/control while here --- debian/changelog | 3 ++- debian/control | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a57b361..eee9fd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ maven-war-plugin (2.2-2) unstable; urgency=medium * Team upload. * Apply upstream fix for MWAR-269 + * Fix VCS-* in debian/control while here - -- Thorsten Glaser Sat, 29 Oct 2016 01:19:15 +0200 + -- Thorsten Glaser Sat, 29 Oct 2016 01:20:44 +0200 maven-war-plugin (2.2-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 7bd6f46..a242377 100644 --- a/debian/control +++ b/debian/control @@ -18,8 +18,8 @@ Build-Depends-Indep: junit, libplexus-utils-java, libxstream-java Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-java/maven-war-plugin.git -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/maven-war-plugin.git +Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-war-plugin.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-war-plugin.git Homepage: http://maven.apache.org/plugins/maven-war-plugin/ Package: libmaven-war-plugin-java -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-war-plugin.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[maven-war-plugin] 01/02: Apply upstream fix for MWAR-269, needed to package Guacamole
This is an automated email from the git hooks/post-receive script.
tg pushed a commit to branch master
in repository maven-war-plugin.
commit 9360c3074116dd070fa3025a687c918a3bd0358f
Author: mirabilos
Date: Sat Oct 29 01:19:48 2016 +0200
Apply upstream fix for MWAR-269, needed to package Guacamole
(as announced in IRC)
---
debian/changelog | 7 ++
debian/patches/MWAR-269.diff | 55
debian/patches/series| 1 +
3 files changed, 63 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 8d0621b..a57b361 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven-war-plugin (2.2-2) unstable; urgency=medium
+
+ * Team upload.
+ * Apply upstream fix for MWAR-269
+
+ -- Thorsten Glaser Sat, 29 Oct 2016 01:19:15 +0200
+
maven-war-plugin (2.2-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/MWAR-269.diff b/debian/patches/MWAR-269.diff
new file mode 100644
index 000..a9f3caf
--- /dev/null
+++ b/debian/patches/MWAR-269.diff
@@ -0,0 +1,55 @@
+# DP: from https://issues.apache.org/jira/browse/MWAR-269
+# DP: fix already contained in later upstream versions
+
+---
a/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
b/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
+@@ -32,6 +32,7 @@ import org.apache.maven.plugin.war.util.
+ import org.apache.maven.shared.filtering.MavenFilteringException;
+ import org.codehaus.plexus.archiver.ArchiverException;
+ import org.codehaus.plexus.archiver.UnArchiver;
++import org.codehaus.plexus.archiver.jar.JarArchiver;
+ import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
+ import org.codehaus.plexus.interpolation.InterpolationException;
+ import org.codehaus.plexus.util.DirectoryScanner;
+@@ -264,14 +265,14 @@ public abstract class AbstractWarPackagi
+ }
+
+ /**
+- * Copy file from source to destination. The directories up to
destination
++ * Copy file or folder from source to destination. The directories up to
destination
+ * will be created if they don't already exist. if the
onlyIfModified flag
+ * is false, destination will be overwritten if it
already exists. If the
+ * flag is true destination will be overwritten if it's not up
to date.
+ *
+ *
+ * @param contextthe packaging context
+- * @param source an existing non-directory File to
copy bytes from
++ * @param source an existing file or directory File
to copy bytes from or assemble jar from
+ * @param destinationa non-directory File to write bytes
to (possibly overwriting).
+ * @param targetFilename the relative path of the file from the webapp
root directory
+ * @param onlyIfModified if true, copy the file only if the source has
changed, always copy otherwise
+@@ -290,9 +291,21 @@ public abstract class AbstractWarPackagi
+ }
+ else
+ {
+-FileUtils.copyFile( source.getCanonicalFile(), destination );
+-// preserve timestamp
+-destination.setLastModified( source.lastModified() );
++ if (source.isDirectory()) {
++ JarArchiver jarArchiver = new JarArchiver();
++ try {
++ jarArchiver.setDestFile( destination );
++ jarArchiver.addDirectory(
source.getCanonicalFile() );
++ jarArchiver.createArchive();
++ } catch (ArchiverException e) {
++ // wrap ArchiverException in IOException
++ throw new IOException(e);
++ }
++ } else {
++ FileUtils.copyFile( source.getCanonicalFile(), destination
);
++ // preserve timestamp
++ destination.setLastModified( source.lastModified() );
++ }
+ context.getLog().debug( " + " + targetFilename + " has been
copied." );
+ return true;
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..2927438
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+MWAR-269.diff
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/maven-war-plugin.git
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[maven-war-plugin] annotated tag debian/2.2-2 created (now d755e5c)
This is an automated email from the git hooks/post-receive script. tg pushed a change to annotated tag debian/2.2-2 in repository maven-war-plugin. at d755e5c (tag) tagging 57c53686032f648b6d99d3f1eaf05a85055e01ca (commit) replaces debian/2.2-1 tagged by mirabilos on Sat Oct 29 01:34:08 2016 +0200 - Log - maven-war-plugin (2.2-2) unstable; urgency=medium -BEGIN PGP SIGNATURE- Comment: ☃ ЦΤℱ—８ ☕☂☄ iQIcBAABCQAGBQJYE+BxAAoJEIlQwYleuNOzQrsP/1GAkakPno4nMMDTK07cfuFe 4GbZIla544Fxos2VrsKNEuOQ7s1ntn+INIqUHh3lQ3A71Q7P+19/HHxFCSAhcl64 7NpYg0SctiQiHN4n0UFGIxn6NhVWOKzUFyzhNj/gCl/3+DJSWiCYfYHwwxpN+s5F 2MXsxiB3DicyZKBXqtram3Doghb4/S3QqfZ5yQ5CmKh/0WC6rPhA3qJ5cpc7lr9E ZM6E5a19JhDzMsW/gPbh8kqYW6vGaiAV313c7uDSg/sc1rqCE88kjMmBot+gyYHG gONUGCgt5/PRAEyf59Bys97H7cYomQkiYwAEwawhOCr8pWd5R910jajSu5dXg0ex L9mX5WNByekad7FWuCeKRz75XXvfpEt6mDBSDKogUFD9E9pJqMeQ7eGadQvL6HZA sBfWL7j4mvdclWglzFdYkXELzsGuFdtSIo8gWVbRzi4uYSWnHdFC25bwGjKzWQmE GWROKkUTK/vaPizyUrn6IvNGLis4xZcLkjk1I59yLHOhovwMwwx/DGGpQlJwZbsy NoAqINhv1kyPVySv6vYvcWLDrtsFgHwYqonzUiIcQS2a1d4gRy1wtaVVLnmutAqQ GG464h4H/qN1O1TGupN8oWHd+hUthAZ7d6J4mHAgG4bJySvbFWuhhV8CaikfZUHv x+wWLCtEm45WrGd1SwYd =LOI0 -END PGP SIGNATURE- mirabilos (2): Apply upstream fix for MWAR-269, needed to package Guacamole Fix VCS-* in debian/control while here --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-war-plugin.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r19177 - trunk/squirrel-sql/debian
Author: tg Date: 2016-11-17 12:53:49 + (Thu, 17 Nov 2016) New Revision: 19177 Modified: trunk/squirrel-sql/debian/orig-tar.sh Log: update for upstream?\226?\128?\153s move to git XXX also update debian/watch but I couldn?\226?\128?\153t get it right XXX for now $ bash -ex debian/orig-tar.sh x 3.2.0 xx Modified: trunk/squirrel-sql/debian/orig-tar.sh === --- trunk/squirrel-sql/debian/orig-tar.sh 2016-11-07 12:51:57 UTC (rev 19176) +++ trunk/squirrel-sql/debian/orig-tar.sh 2016-11-17 12:53:49 UTC (rev 19177) @@ -4,10 +4,14 @@ TAR=../squirrel-sql_$VERSION+dfsg.orig.tar.gz DIR=squirrel-sql-$VERSION+dfsg SVN=https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags +GIT=git://git.code.sf.net/p/squirrel-sql/git TAG=$(echo "squirrelsql-$VERSION" | sed -re's/~(alpha|beta)/-\1-/') # clean up the upstream tarball -svn export $SVN/$TAG $DIR +git clone --bare "$GIT" git-tmp-dir +(cd git-tmp-dir && git archive --format=tar --prefix="$DIR/" "$TAG") | tar -xf - +rm -rf git-tmp-dir +#svn export $SVN/$TAG $DIR tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR rm -rf $DIR $3 ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r19179 - trunk/squirrel-sql/debian/patches
Author: tg
Date: 2016-11-22 13:07:23 + (Tue, 22 Nov 2016)
New Revision: 19179
Modified:
trunk/squirrel-sql/debian/patches/001-squirrelsql-jgoodies.patch
trunk/squirrel-sql/debian/patches/006-launch-script-debian.patch
trunk/squirrel-sql/debian/patches/008-native2ascii.patch
trunk/squirrel-sql/debian/patches/009-plugin-liclink.patch
trunk/squirrel-sql/debian/patches/disable_autoupdate.dpatch
Log:
quilt refresh all patches
Modified: trunk/squirrel-sql/debian/patches/001-squirrelsql-jgoodies.patch
===
--- trunk/squirrel-sql/debian/patches/001-squirrelsql-jgoodies.patch
2016-11-18 09:28:32 UTC (rev 19178)
+++ trunk/squirrel-sql/debian/patches/001-squirrelsql-jgoodies.patch
2016-11-22 13:07:23 UTC (rev 19179)
@@ -145,7 +145,7 @@
*
* public void build() {
* FormLayout layout = new FormLayout(
-@@ -68,7 +109,7 @@
+@@ -68,7 +109,7 @@ import com.jgoodies.forms.layout.RowSpec
* builder.append("Identifier", identifierField);
* builder.nextLine();
*
@@ -154,7 +154,7 @@
* builder.append("Power [kW]", new JTextField());
*
* builder.append("s [mm]", new JTextField());
-@@ -76,18 +117,18 @@
+@@ -76,18 +117,18 @@ import com.jgoodies.forms.layout.RowSpec
*
* builder.appendSeparator("Diameters");
*
@@ -177,7 +177,7 @@
* builder.append("k-factor", new JTextField());
*
* builder.appendSeparator("Bolts");
-@@ -100,199 +141,354 @@
+@@ -100,199 +141,354 @@ import com.jgoodies.forms.layout.RowSpec
*
* builder.append("ds [mm]",new JTextField());
* }
@@ -603,7 +603,7 @@
* @param textWithMnemonic the label's text - may mark a mnemonic
* @return the added label
*/
-@@ -301,212 +497,296 @@
+@@ -301,212 +497,296 @@ public final class DefaultFormBuilder ex
append(label);
return label;
}
@@ -985,7 +985,7 @@
* @param textWithMnemonic the label's text - may mark a mnemonic
* @return the added title label
*/
-@@ -515,35 +795,43 @@
+@@ -515,35 +795,43 @@ public final class DefaultFormBuilder ex
append(titleLabel);
return titleLabel;
}
@@ -1035,7 +1035,7 @@
setColumn(super.getLeadingColumn());
int columnSpan = getColumnCount();
setColumnSpan(getColumnCount());
-@@ -552,47 +840,60 @@
+@@ -552,47 +840,60 @@ public final class DefaultFormBuilder ex
nextColumn(columnSpan);
return titledSeparator;
}
@@ -1106,7 +1106,7 @@
if (getRow() <= getRowCount()) {
RowSpec rowSpec = getCursorRowSpec();
if ((rowSpec == gapRowSpec))
-@@ -601,25 +902,29 @@
+@@ -601,25 +902,29 @@ public final class DefaultFormBuilder ex
appendRow(gapRowSpec);
nextLine();
}
Modified: trunk/squirrel-sql/debian/patches/006-launch-script-debian.patch
===
--- trunk/squirrel-sql/debian/patches/006-launch-script-debian.patch
2016-11-18 09:28:32 UTC (rev 19178)
+++ trunk/squirrel-sql/debian/patches/006-launch-script-debian.patch
2016-11-22 13:07:23 UTC (rev 19179)
@@ -6,7 +6,7 @@
Last-Update: 2011-03-01
--- a/installer/squirrelsql-launcher/src/main/resources/squirrel-sql.sh
+++ b/installer/squirrelsql-launcher/src/main/resources/squirrel-sql.sh
-@@ -23,7 +23,7 @@
+@@ -23,7 +23,7 @@ buildCPFromDir()
}
# IZPACK_JAVA_HOME is filtered in by the IzPack installer when this script is
installed
@@ -15,7 +15,7 @@
# We detect the java executable to use according to the following algorithm:
#
-@@ -53,9 +53,9 @@
+@@ -53,9 +53,9 @@ esac
# SQuirreL home.
if $macosx ; then
Modified: trunk/squirrel-sql/debian/patches/008-native2ascii.patch
===
--- trunk/squirrel-sql/debian/patches/008-native2ascii.patch2016-11-18
09:28:32 UTC (rev 19178)
+++ trunk/squirrel-sql/debian/patches/008-native2ascii.patch2016-11-22
13:07:23 UTC (rev 19179)
@@ -2,9 +2,28 @@
Forwarded: not-needed
From: Vladimir Kotov
Last-Update: 2011-03-01
+---
a/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/PleaseWaitDialog.java
b/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/PleaseWaitDialog.java
+@@ -1,6 +1,6 @@
+ package net.sourceforge.squirrel_sql.client.session.mainpanel;
+ /*
+- * Copyright (C) 2007 Thorsten Mürell
++ * Copyright (C) 2007 Thorsten M\u00fcrell
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+@@ -37,7 +37,7 @@ import java.sql.Statement;
+ /**
+ * The dialog to ask the user to wait.
+ *
+- * @author Thorsten Mürell
++ * @author Thorsten M\u00fcrell
+ */
+ public class PleaseWaitDialog extends DialogWidget implements ActionListener {
+ private static final long serialVersionUID = 88702776954909
[pkg-java] r19180 - trunk/squirrel-sql/debian
Author: tg
Date: 2016-11-22 13:09:23 + (Tue, 22 Nov 2016)
New Revision: 19180
Modified:
trunk/squirrel-sql/debian/control
Log:
make B-D at least installable
Modified: trunk/squirrel-sql/debian/control
===
--- trunk/squirrel-sql/debian/control 2016-11-22 13:07:23 UTC (rev 19179)
+++ trunk/squirrel-sql/debian/control 2016-11-22 13:09:23 UTC (rev 19180)
@@ -28,10 +28,10 @@
liblog4j1.2-java,
libnanoxml2-java,
libslf4j-java,
- libspring-beans-2.5-java,
- libspring-context-2.5-java,
- libspring-context-support-2.5-java,
- libspring-core-2.5-java,
+ libspring-beans-java,
+ libspring-context-java,
+ libspring-context-support-java,
+ libspring-core-java,
libstringtemplate-java
Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/squirrel-sql
@@ -55,10 +55,10 @@
liblog4j1.2-java,
libnanoxml2-java,
libslf4j-java,
- libspring-beans-2.5-java,
- libspring-context-2.5-java,
- libspring-context-support-2.5-java,
- libspring-core-2.5-java,
+ libspring-beans-java,
+ libspring-context-java,
+ libspring-context-support-java,
+ libspring-core-java,
libsquirrel-sql-fw-java,
libstringtemplate-java,
${misc:Depends}
@@ -87,10 +87,10 @@
liblog4j1.2-java,
libnanoxml2-java,
libslf4j-java,
- libspring-beans-2.5-java,
- libspring-context-2.5-java,
- libspring-context-support-2.5-java,
- libspring-core-2.5-java,
+ libspring-beans-java,
+ libspring-context-java,
+ libspring-context-support-java,
+ libspring-core-java,
libstringtemplate-java,
${misc:Depends}
Suggests: libsquirrel-sql-fw-java-doc
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r19181 - in trunk/squirrel-sql/debian: . patches
Author: tg Date: 2016-11-22 13:26:04 + (Tue, 22 Nov 2016) New Revision: 19181 Added: trunk/squirrel-sql/debian/patches/drop_parent_pom.patch Modified: trunk/squirrel-sql/debian/changelog trunk/squirrel-sql/debian/patches/series Log: drop the parent POM reference, it gives build errors Modified: trunk/squirrel-sql/debian/changelog === --- trunk/squirrel-sql/debian/changelog 2016-11-22 13:09:23 UTC (rev 19180) +++ trunk/squirrel-sql/debian/changelog 2016-11-22 13:26:04 UTC (rev 19181) @@ -1,5 +1,6 @@ squirrel-sql (3.2.0+dfsg-1) UNRELEASED; urgency=low + [ Vladimir Kotov ] * Initial release (Closes: #559867) * New upstream release * debian/control: @@ -16,6 +17,9 @@ * Add watch files * Add maven files + [ Thorsten Glaser ] + * Fixup for post-squeeze changes, git upstream, etc. + -- Vladimir Kotov Wed, 09 Jan 2011 23:35:28 +0200 squirrel-sql (3.0~ppa8) jaunty; urgency=low Added: trunk/squirrel-sql/debian/patches/drop_parent_pom.patch === --- trunk/squirrel-sql/debian/patches/drop_parent_pom.patch (rev 0) +++ trunk/squirrel-sql/debian/patches/drop_parent_pom.patch 2016-11-22 13:26:04 UTC (rev 19181) @@ -0,0 +1,16 @@ +# DP: remove the sonatype oss-parent which we don't use in Debian + +--- a/pom.xml b/pom.xml +@@ -5,11 +5,6 @@ + 3.2.0 + pom + +- +- org.sonatype.oss +- oss-parent +- 3 +- + + SQuirreL Root POM + Modified: trunk/squirrel-sql/debian/patches/series === --- trunk/squirrel-sql/debian/patches/series2016-11-22 13:09:23 UTC (rev 19180) +++ trunk/squirrel-sql/debian/patches/series2016-11-22 13:26:04 UTC (rev 19181) @@ -8,3 +8,4 @@ 008-native2ascii.patch 009-plugin-liclink.patch disable_autoupdate.dpatch +drop_parent_pom.patch ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r19182 - in trunk/squirrel-sql/debian: . patches
Author: tg
Date: 2016-11-22 14:26:07 + (Tue, 22 Nov 2016)
New Revision: 19182
Added:
trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
Modified:
trunk/squirrel-sql/debian/changelog
trunk/squirrel-sql/debian/patches/series
Log:
Adapt to jgoodies 1.6.0
Modified: trunk/squirrel-sql/debian/changelog
===
--- trunk/squirrel-sql/debian/changelog 2016-11-22 13:26:04 UTC (rev 19181)
+++ trunk/squirrel-sql/debian/changelog 2016-11-22 14:26:07 UTC (rev 19182)
@@ -19,6 +19,7 @@
[ Thorsten Glaser ]
* Fixup for post-squeeze changes, git upstream, etc.
+ * Adapt to jgoodies 1.6.0
-- Vladimir Kotov Wed, 09 Jan 2011 23:35:28 +0200
Added: trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
===
--- trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
(rev 0)
+++ trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
2016-11-22 14:26:07 UTC (rev 19182)
@@ -0,0 +1,61 @@
+# DP: jgoodies 1.6 removed the "deprecated" ButtonBarFactory
+
+---
a/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/OkClosePanel.java
b/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/OkClosePanel.java
+@@ -25,7 +25,7 @@ import javax.swing.JPanel;
+ import javax.swing.JRootPane;
+ import javax.swing.event.EventListenerList;
+
+-import com.jgoodies.forms.factories.ButtonBarFactory;
++import com.jgoodies.forms.builder.ButtonBarBuilder;
+
+ import net.sourceforge.squirrel_sql.fw.util.StringManager;
+ import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+@@ -101,7 +101,7 @@ public class OkClosePanel extends JPanel
+* before otherwise you will get an IllegalStateException
+* exception.
+*
+- * @param IllegalStateException
++ * @throws IllegalStateException
+* Thrown if null JRootPane.
I.E. component
+* hasn't been added to a frame, dialog etc.
+*/
+@@ -163,7 +163,7 @@ public class OkClosePanel extends JPanel
+ {
+ _okBtn = new JButton(okButtonText);
+
+- JPanel pnl = ButtonBarFactory.buildOKCancelBar(_okBtn,
_closeBtn);
++ JPanel pnl = buildOKCancelBar(_okBtn, _closeBtn);
+ add(pnl);
+ //add(_okBtn);
+ //add(_closeBtn);
+@@ -184,4 +184,29 @@ public class OkClosePanel extends JPanel
+ //
+ //GUIUtils.setJButtonSizesTheSame(new JButton[] {_okBtn,
_closeBtn, new JButton(i18n.CANCEL)});
+ }
++
++ /**
++ * Builds and returns a right aligned button bar with the given buttons.
++ *
++ * @param buttons an array of buttons to add
++ * @return a right aligned button bar with the given buttons
++ */
++ public static JPanel buildRightAlignedBar(JButton[] buttons) {
++ ButtonBarBuilder builder = new ButtonBarBuilder();
++ builder.addGlue();
++ builder.addButton(buttons);
++ return builder.getPanel();
++ }
++
++ /**
++ * Builds and returns a button bar with OK and Cancel.
++ *
++ * @param ok the OK button
++ * @param cancel the Cancel button
++ * @return a panel that contains the button(s)
++ */
++ public static JPanel buildOKCancelBar(
++ JButton ok, JButton cancel) {
++ return buildRightAlignedBar(new JButton[] { ok, cancel });
++ }
+ }
Modified: trunk/squirrel-sql/debian/patches/series
===
--- trunk/squirrel-sql/debian/patches/series2016-11-22 13:26:04 UTC (rev
19181)
+++ trunk/squirrel-sql/debian/patches/series2016-11-22 14:26:07 UTC (rev
19182)
@@ -9,3 +9,4 @@
009-plugin-liclink.patch
disable_autoupdate.dpatch
drop_parent_pom.patch
+adapt_to_newer_jgoodies.patch
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r19183 - trunk/squirrel-sql/debian/patches
Author: tg
Date: 2016-11-22 15:14:51 + (Tue, 22 Nov 2016)
New Revision: 19183
Modified:
trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
Log:
next round
Modified: trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
===
--- trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
2016-11-22 14:26:07 UTC (rev 19182)
+++ trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
2016-11-22 15:14:51 UTC (rev 19183)
@@ -1,5 +1,18 @@
-# DP: jgoodies 1.6 removed the "deprecated" ButtonBarFactory
+# DP: jgoodies 1.6 removed the "deprecated" ButtonBarFactory, and other stuff
+---
a/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/AboutBoxDialog.java
b/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/AboutBoxDialog.java
+@@ -241,9 +241,7 @@ public class AboutBoxDialog extends JDia
+
+ final ButtonBarBuilder builder = new ButtonBarBuilder();
+ builder.addGlue();
+-//builder.addGridded(new JButton("Alter"));
+-//builder.addRelatedGap();
+- builder.addGridded(_closeBtn);
++ builder.addButton(_closeBtn);
+
+ return builder.getPanel();
+ }
---
a/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/OkClosePanel.java
+++
b/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/OkClosePanel.java
@@ -25,7 +25,7 @@ import javax.swing.JPanel;
@@ -59,3 +72,61 @@
+ return buildRightAlignedBar(new JButton[] { ok, cancel });
+ }
}
+---
a/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DefaultFormBuilder.java
b/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DefaultFormBuilder.java
+@@ -37,9 +37,9 @@ import javax.swing.JComponent;
+ import javax.swing.JLabel;
+ import javax.swing.JPanel;
+
+-import com.jgoodies.forms.factories.FormFactory;
+ import com.jgoodies.forms.layout.ConstantSize;
+ import com.jgoodies.forms.layout.FormLayout;
++import com.jgoodies.forms.layout.FormSpecs;
+ import com.jgoodies.forms.layout.RowSpec;
+
+ /**
+@@ -212,7 +212,7 @@ import com.jgoodies.forms.layout.RowSpec
+ * @since 1.0.3
+ *
+ * @see com.jgoodies.forms.builder.AbstractFormBuilder
+- * @see com.jgoodies.forms.factories.FormFactory
++ * @see com.jgoodies.forms.layout.FormSpecs
+ * @see com.jgoodies.forms.layout.FormLayout
+ */
+ public final class DefaultFormBuilder extends I15dPanelBuilder {
+@@ -223,7 +223,7 @@ public final class DefaultFormBuilder ex
+ *
+ * @see #setDefaultRowSpec(RowSpec)
+ */
+-private RowSpec defaultRowSpec = FormFactory.PREF_ROWSPEC;
++private RowSpec defaultRowSpec = FormSpecs.PREF_ROWSPEC;
+
+ /**
+ * Holds the row specification that is reused to describe
+@@ -231,7 +231,7 @@ public final class DefaultFormBuilder ex
+ *
+ * @see #setLineGapSize(ConstantSize)
+ */
+-private RowSpec lineGapSpec = FormFactory.LINE_GAP_ROWSPEC;
++private RowSpec lineGapSpec = FormSpecs.LINE_GAP_ROWSPEC;
+
+ /**
+ * Holds the row specification that describes the constant gaps
+@@ -239,7 +239,7 @@ public final class DefaultFormBuilder ex
+ *
+ * @see #setParagraphGapSize(ConstantSize)
+ */
+-private RowSpec paragraphGapSpec = FormFactory.PARAGRAPH_GAP_ROWSPEC;
++private RowSpec paragraphGapSpec = FormSpecs.PARAGRAPH_GAP_ROWSPEC;
+
+ /**
+ * Holds the offset of the leading column - often 0 or 1.
+@@ -327,7 +327,7 @@ public final class DefaultFormBuilder ex
+
+ /**
+ * Sets the row specification that shall be used for component rows.
+- * It is {@link FormFactory#PREF_ROWSPEC} by default.
++ * It is {@link FormSpecs#PREF_ROWSPEC} by default.
+ *
+ * @param defaultRowSpec the RowSpec to be used for component rows
+ *
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r19184 - trunk/squirrel-sql/debian
Author: tg
Date: 2016-11-23 11:21:38 + (Wed, 23 Nov 2016)
New Revision: 19184
Modified:
trunk/squirrel-sql/debian/build.properties
Log:
add jgoodies-common to classpath (hopefully), thanks ebourg
can?\226?\128?\153t easily use maven-debian-helper, upstream?\226?\128?\153s
latest version uses only Ant again
Modified: trunk/squirrel-sql/debian/build.properties
===
--- trunk/squirrel-sql/debian/build.properties 2016-11-22 15:14:51 UTC (rev
19183)
+++ trunk/squirrel-sql/debian/build.properties 2016-11-23 11:21:38 UTC (rev
19184)
@@ -1,6 +1,7 @@
classpath.compile=\
${basedir}/fw/target/fw-${version}.jar:\
${basedir}/app/target/squirrel-sql-${version}.jar:\
+ /usr/share/java/jgoodies-common.jar:\
/usr/share/java/spring-beans.jar
build.directory=target
javadoc.dir=target/apidocs
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r19185 - trunk/squirrel-sql/debian/patches
Author: tg
Date: 2016-11-23 11:51:50 + (Wed, 23 Nov 2016)
New Revision: 19185
Modified:
trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
Log:
next round of fixes
.addGridded() is still referenced in the documentation for the
jgoodies version that is actually used (provided by Debian) but
does not exist there; jgoodies?\226?\128?\153 homepage?\226?\128?\153s
statement?\226?\128?\166
?\226?\128?\156Stable API, Rock-Solid Code
?\226?\128?\156 Since version 1.0 ?\226?\128?\147 back in 2001 ?\226?\128?\147
the FormLayout uses the same
API and there were no bugs in the layout implementation. This has
been achieved by factoring out all non-layout features to separate
classes that have been carefully changed from time to time.?\226?\128?\157
?\226?\128?\166 is simply a huge fat outright lie. ?\226?\152?\185
Modified: trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
===
--- trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
2016-11-23 11:21:38 UTC (rev 19184)
+++ trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
2016-11-23 11:51:50 UTC (rev 19185)
@@ -130,3 +130,17 @@
*
* @param defaultRowSpec the RowSpec to be used for component rows
*
+---
a/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/gui/ExportPanelBuilder.java
b/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/gui/ExportPanelBuilder.java
+@@ -261,9 +261,9 @@ public class ExportPanelBuilder
+ {
+ ButtonBarBuilder builder = new ButtonBarBuilder();
+ builder.addGlue();
+- builder.addGridded(_exportBtn);
++ builder.addButton(_exportBtn);
+ builder.addRelatedGap();
+- builder.addGridded(_cancelBtn);
++ builder.addButton(_cancelBtn);
+
+ return builder.getPanel();
+ }
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r19186 - trunk/squirrel-sql/debian/patches
Author: tg
Date: 2016-11-23 11:59:10 + (Wed, 23 Nov 2016)
New Revision: 19186
Modified:
trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
Log:
more .addGridded()
Modified: trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
===
--- trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
2016-11-23 11:51:50 UTC (rev 19185)
+++ trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
2016-11-23 11:59:10 UTC (rev 19186)
@@ -144,3 +144,38 @@
return builder.getPanel();
}
+---
a/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/gui/GenerateSqlDialog.java
b/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/gui/GenerateSqlDialog.java
+@@ -717,7 +717,7 @@ public class GenerateSqlDialog extends J
+dlg.setVisible(false);
+ }
+ });
+- builder.addGridded(okButton);
++ builder.addButton(okButton);
+
+ builder.addRelatedGap();
+
+@@ -729,7 +729,7 @@ public class GenerateSqlDialog extends J
+ dlg.setVisible(false);
+ }
+ });
+-builder.addGridded(cancelButton);
++builder.addButton(cancelButton);
+
+ return builder.getPanel();
+ }
+---
a/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/gui/AlterTableDialog.java
b/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/gui/AlterTableDialog.java
+@@ -129,10 +129,10 @@ public class AlterTableDialog extends JD
+ final ButtonBarBuilder builder = new ButtonBarBuilder();
+ builder.addGlue();
+ // i18n[mysql.alterDlgAlter=Alter]
+- builder.addGridded(new
JButton(s_stringMgr.getString("mysql.alterDlgAlter")));
++ builder.addButton(new
JButton(s_stringMgr.getString("mysql.alterDlgAlter")));
+ builder.addRelatedGap();
+ // i18n[mysql.alterDlgClose=Close]
+- builder.addGridded(new
JButton(s_stringMgr.getString("mysql.alterDlgClose")));
++ builder.addButton(new
JButton(s_stringMgr.getString("mysql.alterDlgClose")));
+
+ return builder.getPanel();
+ }
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java-svn2git] 01/01: add myself
This is an automated email from the git hooks/post-receive script. tg pushed a commit to branch master in repository pkg-java-svn2git. commit 5bcc07e5ebf92a3e7a65f3ec7d8cd235dde37d3e Author: mirabilos Date: Wed Nov 23 13:06:53 2016 +0100 add myself --- pkg-java-authors.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg-java-authors.txt b/pkg-java-authors.txt index 64baccc..2929f2c 100644 --- a/pkg-java-authors.txt +++ b/pkg-java-authors.txt @@ -99,6 +99,7 @@ sylvestre-guest = Sylvestre Ledru tashiro-guest = Stephan Michels tbooth-guest = Tim Booth tedp-guest = Ted Percival +tg = Thorsten Glaser tgg = Thomas Girard thkoch-guest = Thomas Koch tiagosab-guest = Tiago Saboga -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/pkg-java-svn2git.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java-svn2git] branch master updated (daa880d -> 5bcc07e)
This is an automated email from the git hooks/post-receive script. tg pushed a change to branch master in repository pkg-java-svn2git. from daa880d Added an entry for root in the authors file new 5bcc07e add myself The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: pkg-java-authors.txt | 1 + 1 file changed, 1 insertion(+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/pkg-java-svn2git.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r19187 - trunk/squirrel-sql
Author: tg Date: 2016-11-23 12:34:33 + (Wed, 23 Nov 2016) New Revision: 19187 Added: trunk/squirrel-sql/MOVED_TO_GIT.txt Log: Moved squirrel-sql to Git Added: trunk/squirrel-sql/MOVED_TO_GIT.txt === --- trunk/squirrel-sql/MOVED_TO_GIT.txt (rev 0) +++ trunk/squirrel-sql/MOVED_TO_GIT.txt 2016-11-23 12:34:33 UTC (rev 19187) @@ -0,0 +1,3 @@ +The squirrel-sql package is now maintained in a Git repository. +Please clone git+ssh://anonscm.debian.org/git/pkg-java/squirrel-sql to work on this package. + ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r19188 - trunk/squirrel-sql
Author: tg Date: 2016-11-23 12:51:03 + (Wed, 23 Nov 2016) New Revision: 19188 Removed: trunk/squirrel-sql/debian/ Modified: trunk/squirrel-sql/MOVED_TO_GIT.txt Log: finish move to git Modified: trunk/squirrel-sql/MOVED_TO_GIT.txt === --- trunk/squirrel-sql/MOVED_TO_GIT.txt 2016-11-23 12:34:33 UTC (rev 19187) +++ trunk/squirrel-sql/MOVED_TO_GIT.txt 2016-11-23 12:51:03 UTC (rev 19188) @@ -1,3 +1,10 @@ -The squirrel-sql package is now maintained in a Git repository. -Please clone git+ssh://anonscm.debian.org/git/pkg-java/squirrel-sql to work on this package. +The squirrel-sql package is now maintained in a git repository. +- To work on this package: + git clone git+ssh://git.debian.org/git/pkg-java/squirrel-sql + +- Read-only access: + git clone https://anonscm.debian.org/git/pkg-java/squirrel-sql.git + +- Browser access: + https://anonscm.debian.org/cgit/pkg-java/squirrel-sql.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[squirrel-sql] annotated tag squirrel-sql-3.2.0_dfsg created (now e260377)
This is an automated email from the git hooks/post-receive script. tg pushed a change to annotated tag squirrel-sql-3.2.0_dfsg in repository squirrel-sql. at e260377 (tag) tagging 7773b8c459d9752e8a5f81ee15c622b176a33759 (commit) tagged by mirabilos on Wed Nov 23 13:52:48 2016 +0100 - Log - squirrel-sql_3.2.0+dfsg.orig.tar.gz -BEGIN PGP SIGNATURE- Comment: ☃ ЦΤℱ—８ ☕☂☄ iQIzBAABCQAdFiEEvLGdqzUDNkCuNHpxiVDBiV6407MFAlg1kSEACgkQiVDBiV64 07O1oRAAn+uwfOAckTWdx28uNLCKl2tedSWihs6XmNa0uMmiuo8jmBK9J6jxIHLP IiYxUx2mMQUl9VuS1CMVh4B43otaWzqekvLCsHSc3E4XaUf/98gGJ7V3byE/SzZU Km/hcyDLlTQ3hVAvBYV7jV3+P7Pdeoe80NSKTk63YKVrvmf87XMUt2aS5/DM6Syb Ak9OKI1eBteyLXv7Bf41BJJBnmOG41Mg4E2ml+xwGKouSuXWV3hZgIs0x1sO8pZS PC0ATJyxdj4mfsI2TtKmYGSAUvd7ULOgK9H0f3fEg3mUirI23S34drZY6yvuI5lj rX1waB/VTfcasXk+kzDKPKq2wiMcifPhhkj7OmHuYmf901aNMEYTQR28jn+KXP29 0ZHwdVZentpwW72RfmCQ5/s56BUvnb+FWA+BRU3SxSmlIMUt9+8ftXZTQX5AydcV zzulZ0u+U2x26toJ5R1ci8HycAhw+zTg1sPFekApPaJ1RM4UzIdZWfVO08KBrGn5 imKQ8V3EBBFLzNlil/rVBsYi3qX1Ic5TDGrsHCigVne2OW/v3TMRKUDSoslFxycV uaUTEIEqMHjafDW9+rvLht4ZJmjvl7pUnyVmx1r2Afn2/8fmBeudGfwyFx3zPyCN 0jZW5CJitOggaFYcKNcLB5CrDTGi6jV5lJaiau3Pw9Uf0/SbYPI= =r45M -END PGP SIGNATURE- mirabilos (2): Initial upstream branch. -rw-r--r-- 1 tglase tglase 10222833 Nov 17 13:52 squirrel-sql_3.2.0+dfsg.orig.tar.gz --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/squirrel-sql.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[squirrel-sql] 04/04: fix watch file; record that the package at least builds, now
This is an automated email from the git hooks/post-receive script. tg pushed a commit to branch master in repository squirrel-sql. commit cec86ead93cedd1ba715a0d758b709d9cbaa071f Author: mirabilos Date: Wed Nov 23 14:03:51 2016 +0100 fix watch file; record that the package at least builds, now --- debian/changelog | 7 --- debian/watch | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f5df2e..4a757c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,11 +16,12 @@ squirrel-sql (3.2.0+dfsg-1) UNRELEASED; urgency=low * Add manpages * Add watch files * Add maven files - + [ Thorsten Glaser ] * Fixup for post-squeeze changes, git upstream, etc. * Adapt to jgoodies 1.6.0 * Moved the package to Git + * Make the package at least build with sid as of November 2016 -- Vladimir Kotov Wed, 09 Jan 2011 23:35:28 +0200 @@ -30,13 +31,13 @@ squirrel-sql (3.0~ppa8) jaunty; urgency=low * Set javac encoding to UTF-8 * Added missing libcommons-httpclient-java dependency * Added missing dpatch build dependency - + -- Markus Heberling Tue, 24 Feb 2009 12:22:40 +0100 squirrel-sql (2.6.8-1~ppa8) jaunty; urgency=low * Added java dependency - + -- Markus Heberling Tue, 03 Feb 2009 16:17:20 +0100 squirrel-sql (2.6.8-1~ppa7) jaunty; urgency=low diff --git a/debian/watch b/debian/watch index 7077629..c546a9a 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,5 @@ version=3 opts=dversionmangle=s/\+dfsg// \ - http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/ squirrelsql-([\d\.]+)/ \ + https://sourceforge.net/p/squirrel-sql/git/ref/master/tags/ \ + /p/squirrel-sql/git/ci/squirrelsql-([\d\.]+)/tree/ \ debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/squirrel-sql.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[squirrel-sql] 01/04: git move
This is an automated email from the git hooks/post-receive script. tg pushed a commit to branch master in repository squirrel-sql. commit b998a103bf3b262293e6f0ee42c4e06b84c166c9 Author: mirabilos Date: Wed Nov 23 13:49:02 2016 +0100 git move --- debian/changelog | 2 +- debian/control | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 375f583..7f5df2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,7 +22,7 @@ squirrel-sql (3.2.0+dfsg-1) UNRELEASED; urgency=low * Adapt to jgoodies 1.6.0 * Moved the package to Git - -- Thorsten Glaser Wed, 23 Nov 2016 13:30:37 +0100 + -- Vladimir Kotov Wed, 09 Jan 2011 23:35:28 +0200 squirrel-sql (3.0~ppa8) jaunty; urgency=low diff --git a/debian/control b/debian/control index c2fcd18..64b4b5d 100644 --- a/debian/control +++ b/debian/control @@ -34,8 +34,8 @@ Build-Depends-Indep: default-jdk-doc, libspring-core-java, libstringtemplate-java Standards-Version: 3.9.1 -Vcs-Git: https://anonscm.debian.org/git/pkg-java/squirrel-sql.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/squirrel-sql.git +VCS-git: https://anonscm.debian.org/git/pkg-java/squirrel-sql.git +VCS-Browser: https://anonscm.debian.org/cgit/pkg-java/squirrel-sql.git Homepage: http://www.squirrelsql.org/ Package: squirrel-sql -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/squirrel-sql.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[squirrel-sql] 03/04: force unapply-patches to keep debian/patches/* in sync
This is an automated email from the git hooks/post-receive script. tg pushed a commit to branch master in repository squirrel-sql. commit 30e7d16a36ff880187ef258c08e5f61b01e1bd44 Author: mirabilos Date: Wed Nov 23 13:55:46 2016 +0100 force unapply-patches to keep debian/patches/* in sync --- debian/source/local-options | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 000..9cdfca9 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,2 @@ +unapply-patches +abort-on-upstream-changes -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/squirrel-sql.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[squirrel-sql] 01/01: drop squirrel-sql-plugin-laf from squirrel-sql-plugins-standard for now
This is an automated email from the git hooks/post-receive script.
tg pushed a commit to branch master
in repository squirrel-sql.
commit 5d91e4dd5838895c404d727ca26d34f03d200011
Author: mirabilos
Date: Wed Nov 23 14:18:11 2016 +0100
drop squirrel-sql-plugin-laf from squirrel-sql-plugins-standard for now
it’s not installable
---
debian/changelog | 1 +
debian/control | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 4a757c9..e5e83bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ squirrel-sql (3.2.0+dfsg-1) UNRELEASED; urgency=low
* Adapt to jgoodies 1.6.0
* Moved the package to Git
* Make the package at least build with sid as of November 2016
+ * Remove squirrel-sql-plugin-laf from standard plugins, not installable
-- Vladimir Kotov Wed, 09 Jan 2011 23:35:28 +0200
diff --git a/debian/control b/debian/control
index 64b4b5d..533a697 100644
--- a/debian/control
+++ b/debian/control
@@ -460,7 +460,6 @@ Architecture: all
Depends: squirrel-sql-plugin-codecompletion,
squirrel-sql-plugin-editextras,
squirrel-sql-plugin-graph,
- squirrel-sql-plugin-laf,
squirrel-sql-plugin-sqlbookmark,
squirrel-sql-plugin-sqlscript,
${misc:Depends}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/squirrel-sql.git
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[squirrel-sql] branch master updated (cec86ea -> 5d91e4d)
This is an automated email from the git hooks/post-receive script. tg pushed a change to branch master in repository squirrel-sql. from cec86ea fix watch file; record that the package at least builds, now new 5d91e4d drop squirrel-sql-plugin-laf from squirrel-sql-plugins-standard for now The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + debian/control | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/squirrel-sql.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[squirrel-sql] 03/03: java 8…
This is an automated email from the git hooks/post-receive script. tg pushed a commit to branch master in repository squirrel-sql. commit 776c5655de97c02ec97650bca7a0b28b54ec0eec Author: mirabilos Date: Wed Nov 23 14:53:13 2016 +0100 java 8… --- debian/changelog | 1 + debian/patches/series| 1 + debian/patches/version-madness.patch | 13 + 3 files changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index e5e83bb..c105526 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ squirrel-sql (3.2.0+dfsg-1) UNRELEASED; urgency=low * Moved the package to Git * Make the package at least build with sid as of November 2016 * Remove squirrel-sql-plugin-laf from standard plugins, not installable + * Start with Java™ 8 -- Vladimir Kotov Wed, 09 Jan 2011 23:35:28 +0200 diff --git a/debian/patches/series b/debian/patches/series index 68e7b79..4fd82d6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ disable_autoupdate.dpatch drop_parent_pom.patch adapt_to_newer_jgoodies.patch +version-madness.patch diff --git a/debian/patches/version-madness.patch b/debian/patches/version-madness.patch new file mode 100644 index 000..6563907 --- /dev/null +++ b/debian/patches/version-madness.patch @@ -0,0 +1,13 @@ +# DP: There is such thing as Java™ 8, you know… + +--- a/installer/squirrelsql-launcher/src/main/resources/squirrel-sql.sh b/installer/squirrelsql-launcher/src/main/resources/squirrel-sql.sh +@@ -72,7 +72,7 @@ cd "$UNIX_STYLE_HOME" + # should be able to be run by that version or higher. The arguments to JavaVersionChecker below specify the + # minimum acceptable version (first arg) and any other acceptable subsequent versions. . should + # be all that is necessary for the version form. +-$JAVACMD -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 1.6 1.7 ++$JAVACMD -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 1.6 1.7 1.8 + if [ "$?" = "1" ]; then + exit + fi -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/squirrel-sql.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[squirrel-sql] branch master updated (5d91e4d -> 776c565)
This is an automated email from the git hooks/post-receive script. tg pushed a change to branch master in repository squirrel-sql. from 5d91e4d drop squirrel-sql-plugin-laf from squirrel-sql-plugins-standard for now new 3306a6b fix four broken symlinks out of five new 136e741 comment this out, for now new 776c565 java 8… The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + debian/patches/series| 1 + debian/patches/version-madness.patch | 13 + debian/squirrel-sql.links| 10 +- 4 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 debian/patches/version-madness.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/squirrel-sql.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[squirrel-sql] 02/03: comment this out, for now
This is an automated email from the git hooks/post-receive script. tg pushed a commit to branch master in repository squirrel-sql. commit 136e7412a367dac9b28d6c8f24105d3ad0fa7fae Author: mirabilos Date: Wed Nov 23 14:49:30 2016 +0100 comment this out, for now --- debian/squirrel-sql.links | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/squirrel-sql.links b/debian/squirrel-sql.links index c40a873..3c5c4e1 100644 --- a/debian/squirrel-sql.links +++ b/debian/squirrel-sql.links @@ -3,7 +3,7 @@ /usr/share/java/antlr.jar /usr/share/squirrel-sql/lib/antlr.jar /usr/share/java/asm3.jar/usr/share/squirrel-sql/lib/asm.jar /usr/share/java/asm3.jar /usr/share/squirrel-sql/lib/asm-attrs.jar -/usr/share/java/hibernate-annotations.jar /usr/share/squirrel-sql/lib/hibernate-annotations.jar +#/usr/share/java/hibernate-annotations.jar /usr/share/squirrel-sql/lib/hibernate-annotations.jar /usr/share/java/hibernate-commons-annotations.jar /usr/share/squirrel-sql/lib/hibernate-commons-annotations.jar /usr/share/java/hibernate-entitymanager.jar /usr/share/squirrel-sql/lib/hibernate-entitymanager.jar /usr/share/java/spring3-beans.jar /usr/share/squirrel-sql/lib/spring3-beans.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/squirrel-sql.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[squirrel-sql] 01/03: fix four broken symlinks out of five
This is an automated email from the git hooks/post-receive script. tg pushed a commit to branch master in repository squirrel-sql. commit 3306a6bfc41534b273b49264358a527db349f89a Author: mirabilos Date: Wed Nov 23 14:46:16 2016 +0100 fix four broken symlinks out of five --- debian/squirrel-sql.links | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/squirrel-sql.links b/debian/squirrel-sql.links index 1158a86..c40a873 100644 --- a/debian/squirrel-sql.links +++ b/debian/squirrel-sql.links @@ -6,14 +6,14 @@ /usr/share/java/hibernate-annotations.jar /usr/share/squirrel-sql/lib/hibernate-annotations.jar /usr/share/java/hibernate-commons-annotations.jar /usr/share/squirrel-sql/lib/hibernate-commons-annotations.jar /usr/share/java/hibernate-entitymanager.jar /usr/share/squirrel-sql/lib/hibernate-entitymanager.jar -/usr/share/java/spring-beans.jar /usr/share/squirrel-sql/lib/spring-beans.jar +/usr/share/java/spring3-beans.jar /usr/share/squirrel-sql/lib/spring3-beans.jar /usr/share/java/hibernate3.jar /usr/share/squirrel-sql/lib/hibernate.jar -/usr/share/java/spring-context.jar /usr/share/squirrel-sql/lib/spring-context.jar +/usr/share/java/spring3-context.jar /usr/share/squirrel-sql/lib/spring3-context.jar /usr/share/java/cglib.jar /usr/share/squirrel-sql/lib/cglib.jar /usr/share/java/jxl.jar /usr/share/squirrel-sql/lib/jxl.jar -/usr/share/java/spring-context-support.jar /usr/share/squirrel-sql/lib/spring-context-support.jar +/usr/share/java/spring3-context.support.jar /usr/share/squirrel-sql/lib/spring3-context.support.jar /usr/share/java/log4j-1.2.jar /usr/share/squirrel-sql/lib/log4j.jar -/usr/share/java/spring-core.jar /usr/share/squirrel-sql/lib/spring-core.jar +/usr/share/java/spring3-core.jar /usr/share/squirrel-sql/lib/spring3-core.jar /usr/share/java/commons-cli.jar /usr/share/squirrel-sql/lib/commons-cli.jar /usr/share/java/nanoxml2.jar/usr/share/squirrel-sql/lib/nanoxml.jar /usr/share/java/commons-codec.jar /usr/share/squirrel-sql/lib/commons-codec.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/squirrel-sql.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[squirrel-sql] branch master updated (776c565 -> 67f90f3)
This is an automated email from the git hooks/post-receive script. tg pushed a change to branch master in repository squirrel-sql. from 776c565 java 8… new 67f90f3 Add missing libpostgresql-jdbc-java Depends to squirrel-sql-plugin-postgres The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + debian/control| 2 +- debian/squirrel-sql-plugin-postgres.links | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 debian/squirrel-sql-plugin-postgres.links -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/squirrel-sql.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[squirrel-sql] 01/01: Add missing libpostgresql-jdbc-java Depends to squirrel-sql-plugin-postgres
This is an automated email from the git hooks/post-receive script.
tg pushed a commit to branch master
in repository squirrel-sql.
commit 67f90f3cd2bd1835f2cd5f75c576ff8073193314
Author: mirabilos
Date: Wed Nov 23 15:04:08 2016 +0100
Add missing libpostgresql-jdbc-java Depends to squirrel-sql-plugin-postgres
---
debian/changelog | 1 +
debian/control| 2 +-
debian/squirrel-sql-plugin-postgres.links | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index c105526..e34f159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ squirrel-sql (3.2.0+dfsg-1) UNRELEASED; urgency=low
* Make the package at least build with sid as of November 2016
* Remove squirrel-sql-plugin-laf from standard plugins, not installable
* Start with Java™ 8
+ * Add missing libpostgresql-jdbc-java dep to squirrel-sql-plugin-postgres
-- Vladimir Kotov Wed, 09 Jan 2011 23:35:28 +0200
diff --git a/debian/control b/debian/control
index 533a697..25faeff 100644
--- a/debian/control
+++ b/debian/control
@@ -319,7 +319,7 @@ Description: Netezza Plugin for SQuirreL SQL Client
Package: squirrel-sql-plugin-postgres
Architecture: all
-Depends: squirrel-sql, ${misc:Depends}
+Depends: squirrel-sql, ${misc:Depends}, libpostgresql-jdbc-java
Description: Postgres Plugin for SQuirreL SQL Client
The Postgres plugin adds Postgres-specific functionality to the SQuirreL SQL
Client. The plugin adds the following features:
diff --git a/debian/squirrel-sql-plugin-postgres.links
b/debian/squirrel-sql-plugin-postgres.links
new file mode 100644
index 000..5e6c702
--- /dev/null
+++ b/debian/squirrel-sql-plugin-postgres.links
@@ -0,0 +1 @@
+/usr/share/java/postgresql.jar /usr/share/squirrel-sql/lib/postgresql.jar
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/squirrel-sql.git
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[freeplane] annotated tag debian/1.6.6-2 created (now e1d592e)
This is an automated email from the git hooks/post-receive script. tg pushed a change to annotated tag debian/1.6.6-2 in repository freeplane. at e1d592e (tag) tagging bdd77b06ef9e0250f3b9429a8a07bb7d84764c1b (commit) replaces debian/1.6.6-1 tagged by mirabilos on Tue Oct 3 15:15:11 2017 +0200 - Log - Debian release 1.6.6-2 -BEGIN PGP SIGNATURE- Comment: ☃ ЦΤℱ—８ ☕☂☄ iQIcBAABCQAGBQJZ041gAAoJEIlQwYleuNOz4pgP/je01VR/TXFFLB8TNObAOJTo uQsD4MTzb69k0wR8IW7OYB52MX/u87wfaOZFR6+zmvl8P1Cp+XYp9Ikgo6w9AR6N eTrU5voF8m31CaSs+uHOjGCNcDXw0BlSxRlSMa+Q8JiEi/nml9Kn9w8kopqvYtTt WQL79KPay0Wia8zY5/gv7/b2ae01r/Rp2TU76nX99jK89WP9us51h38NGonFlJTD kZfGymuSbTsKDWT+Ua127m1rTMwJXZGQfSPl9icgsNB6x578jJdzrruihzZr/JH0 yTZhqI+rH9yOSioHwsARN9mBQOxM0KNKR56NevV8KHMvZYImRYo7dMsOoHBlkrCH HjVBNHZ7N5w6Q0xPbaHmwv/LPlTezdJA8FBR8x8CCyZa5QZ8iDIDlLI0EOHkjp6V u/c/rbyZnTsL1eeFy/Sh4Y2l4z0tJZKo88prl4+1HHkBBw8Ya+yWTn7wLyJShMsB w+9fSk4PXkQNDTqNJPBzbVhu9CEsfQP9NixHbMP2gcxmsPwxuIkQWkk6QUEfWsnl dzZmE3QFYbnokfWuB0UPVTgKPIEgfRX77vk9kPv+ITtTtJL/PKXGYND7KORkdbBO aYJXu111sTDqNaI0jPC3L47r2Tgr3ut5C7ehgcKbUZ8iOhOiCjjIBQ8C+tmlqOS4 iL0pw2KGQZlxqCszQR2F =4E7e -END PGP SIGNATURE- Felix Natter (2): drop jython build dep which requires batik 1.9-3, update standards-version changelog for 1.6.6-2 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/freeplane.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
