[SCM] libpjl-comp-filter-java packaging branch, upstream, created. e4f37cca1240f0431f47166a9242d25cb7580885

2012-01-21 Thread Andrew Harvey
The branch, upstream has been created
at  e4f37cca1240f0431f47166a9242d25cb7580885 (commit)

- Shortlog 
---

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging branch, master, created. 41f3f96a281c3cd29472d149689cafcdc3513039

2012-01-21 Thread Andrew Harvey
The branch, master has been created
at  41f3f96a281c3cd29472d149689cafcdc3513039 (commit)

- Shortlog 
commit 41f3f96a281c3cd29472d149689cafcdc3513039
Author: Andrew Harvey andrew.harv...@gmail.com
Date:   Tue Feb 21 15:00:00 2012 +1100

Imported Debian patch 1.7+dfsg-1

---

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging branch, pristine-tar, created. 3e4d73a49bc76ad9a11518aae66e1d1ebcabd714

2012-01-21 Thread Andrew Harvey
The branch, pristine-tar has been created
at  3e4d73a49bc76ad9a11518aae66e1d1ebcabd714 (commit)

- Shortlog 
commit 3e4d73a49bc76ad9a11518aae66e1d1ebcabd714
Author: Andrew Harvey andrew.harv...@gmail.com
Date:   Sat Jan 21 22:11:29 2012 +1100

pristine-tar data for pjl-comp-filter_1.7+dfsg.orig.tar.gz

---

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging annotated tag, debian/1.7+dfsg-1, created. debian/1.7+dfsg-1

2012-01-21 Thread Andrew Harvey
The annotated tag, debian/1.7+dfsg-1 has been created
at  501cc3c9df1eff0444c69a9408046de5cfd00aff (tag)
   tagging  41f3f96a281c3cd29472d149689cafcdc3513039 (commit)
  replaces  upstream/1.7+dfsg
 tagged by  Andrew Harvey
on  Sat Jan 21 22:11:30 2012 +1100

- Shortlog 
Debian release 1.7+dfsg-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABCAAGBQJPGp1iAAoJEDiTg7zdt+By41sP/RlSqPr0rKgUdyzsHvZ4xySc
x9r/lJeUoclso0uMY8W7zacGZn3GObciaz4Qkj0bmG7/h/MshQ7cfcDyY+36/zto
ma1qQkODYrxF2p6+t41e1VVSVnQiKs9STbxFPEJTaoe/5iYmzQ5xZjKfJzzvMARq
TLzaULh9Prf/kmWoRUYl9MaSfN9CfrMDBDtqXBOi//rK8p0JS+pqwZ1+AKRaRrhL
NNp5ymcGFTHb4QXrpJ5LgniCNxQEuH7yqjytTAUu2yh7ItFnK/FWzKwwqMvPZHs2
hAlwtG9RNSIvPC+Jaw/7LCFcKIIGVoI3HD9CaLQQj3j5TnrstzY8V6P+cGECWPXS
lyrb5N5TBH2kc8iZKmtMfeABBDXQLU5ZN19lfJ2WsJsDlo38MwhOqunyHatqfAc6
jjcPAzOaj01Hseu1tJWboBiDlbrC3eNqUsYBkSJDw3obMgHrGQfW+8Eg2ngFpXwd
L5lb8KPy6/ellXjAyogG8QiVTjD/GtMmN4K8ftd3Ds26zVBuMIA8EbVssq3Hj8XK
SO/RP8fTtag+nh9AtxiX+EnD1O5EoZWmWweFBHAbNLanjum4tXFjoz6THYI+aF8J
1pYX1tNv7yY491YQzCVTXvkBNhnRPuCAqBhEcHGVdocXUqY9nwOaG3UjqvDcZmT4
tGmPuMNiwmFJ9kZFnu/W
=Eehn
-END PGP SIGNATURE-

Andrew Harvey (1):
  Imported Debian patch 1.7+dfsg-1

---

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging annotated tag, upstream/1.7+dfsg, created. upstream/1.7+dfsg

2012-01-21 Thread Andrew Harvey
The annotated tag, upstream/1.7+dfsg has been created
at  b4092b6faffadd209e140db95953af9f88296ac8 (tag)
   tagging  e4f37cca1240f0431f47166a9242d25cb7580885 (commit)
 tagged by  Andrew Harvey
on  Sat Jan 21 22:11:29 2012 +1100

- Shortlog 
Upstream version 1.7+dfsg
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABCAAGBQJPGp1hAAoJEDiTg7zdt+ByKUgP/0dbCSPYf8jYkK7dRdBSoR6S
0rbsfKkDodQM1dS9JiOUgAQhsffX/yLCZoLmnEHO2ARAxVoGl3GhdpSdFAvxmdcy
GwF0hdWwkkIiFGF0Nv5aAZ53c9i2SSiZ03Z7t6a8gwTFVBeTCeJoaL2Zu+mTxQAl
7XhMuPv55RUy2jx7xd3r6FeSJTWFuDZPkpEn4+/8jcVfKO+e6+iQ4Ngk3VK3lq9i
SsBq4L4+Fnc7PpDu0nJwq3qwsxxMleQvRqrAF313Ki/3b6cY/tqIDVDKvPzMaXXC
UNd6WjRcYlDI1ljpZRZPpnLwQ/T7jsdpxOoETLlAJVYNl0M8JhMmwjZ8mO4KFnsx
7iNyeZsb1mu0J/s3/fUWfwBU4q+Pm3OR2WDY67znf5eUtCdG26xi1U7vCHXchjS1
1LsPbZafDxL3BJp+ndFbUKOL9rwoUKtI0thaU31aZE7k9DWSsKZa06W534ZWkgL1
fZeYMIcA/yxyAGujEIq2tQk7GZ22EdAxyou9Ir25Rwhis5Fd97/9M2Lko2nGt32K
506NuiC+z232GF7HrAfdOICvawhPI/PkJYLq1t+xn5AAi77EEowp0Tqapc6QXalQ
EQqaqAVB1wmZafC0wl5Or2RcIrT7zzILB88uH5juHP9fMtlDon9mGhkgtQISSKfQ
5lura2mK7xA7SyIOHgQt
=ff35
-END PGP SIGNATURE-

Andrew Harvey (1):
  Imported Upstream version 1.7+dfsg

---

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging branch, master, updated. debian/1.7+dfsg-1-1-g82aed81

2012-01-21 Thread Andrew Harvey
The following commit has been merged in the master branch:
commit 82aed81da47f53592f148f6fd4e911c9df9b7721
Author: Andrew Harvey andrew.harv...@gmail.com
Date:   Sun Jan 22 08:35:03 2012 +1100

add Vcs fields to debian/control

diff --git a/debian/control b/debian/control
index 16b08f5..bb8c7ea 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,8 @@ Build-Depends:
  , default-jdk
  , junit
 Standards-Version: 3.9.2
+Vcs-Git: git://git.debian.org/pkg-java/libpjl-comp-filter-java.git
+Vcs-Browser: http://git.debian.org/?p=pkg-java/libpjl-comp-filter-java.git
 
 Package: libpjl-comp-filter-java
 Architecture: all

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging branch, pristine-tar, deleted. 3e4d73a49bc76ad9a11518aae66e1d1ebcabd714

2012-01-21 Thread Andrew Harvey
The branch, pristine-tar has been deleted
   was  3e4d73a49bc76ad9a11518aae66e1d1ebcabd714

---
3e4d73a49bc76ad9a11518aae66e1d1ebcabd714 pristine-tar data for 
pjl-comp-filter_1.7+dfsg.orig.tar.gz
---

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging branch, upstream, deleted. upstream/1.7+dfsg

2012-01-21 Thread Andrew Harvey
The branch, upstream has been deleted
   was  e4f37cca1240f0431f47166a9242d25cb7580885

---
e4f37cca1240f0431f47166a9242d25cb7580885 Imported Upstream version 1.7+dfsg
---

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging annotated tag, debian/1.7+dfsg-1, deleted. upstream/1.7+dfsg-1-g41f3f96

2012-01-21 Thread Andrew Harvey
The annotated tag, debian/1.7+dfsg-1 has been deleted
   was  501cc3c9df1eff0444c69a9408046de5cfd00aff

---
tag debian/1.7+dfsg-1

Debian release 1.7+dfsg-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABCAAGBQJPGp1iAAoJEDiTg7zdt+By41sP/RlSqPr0rKgUdyzsHvZ4xySc
x9r/lJeUoclso0uMY8W7zacGZn3GObciaz4Qkj0bmG7/h/MshQ7cfcDyY+36/zto
ma1qQkODYrxF2p6+t41e1VVSVnQiKs9STbxFPEJTaoe/5iYmzQ5xZjKfJzzvMARq
TLzaULh9Prf/kmWoRUYl9MaSfN9CfrMDBDtqXBOi//rK8p0JS+pqwZ1+AKRaRrhL
NNp5ymcGFTHb4QXrpJ5LgniCNxQEuH7yqjytTAUu2yh7ItFnK/FWzKwwqMvPZHs2
hAlwtG9RNSIvPC+Jaw/7LCFcKIIGVoI3HD9CaLQQj3j5TnrstzY8V6P+cGECWPXS
lyrb5N5TBH2kc8iZKmtMfeABBDXQLU5ZN19lfJ2WsJsDlo38MwhOqunyHatqfAc6
jjcPAzOaj01Hseu1tJWboBiDlbrC3eNqUsYBkSJDw3obMgHrGQfW+8Eg2ngFpXwd
L5lb8KPy6/ellXjAyogG8QiVTjD/GtMmN4K8ftd3Ds26zVBuMIA8EbVssq3Hj8XK
SO/RP8fTtag+nh9AtxiX+EnD1O5EoZWmWweFBHAbNLanjum4tXFjoz6THYI+aF8J
1pYX1tNv7yY491YQzCVTXvkBNhnRPuCAqBhEcHGVdocXUqY9nwOaG3UjqvDcZmT4
tGmPuMNiwmFJ9kZFnu/W
=Eehn
-END PGP SIGNATURE-
41f3f96a281c3cd29472d149689cafcdc3513039 Imported Debian patch 1.7+dfsg-1
---

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging branch, master, created. 487ef1185333b5808bd723921e3c383e98c1d53f

2012-01-21 Thread Andrew Harvey
The branch, master has been created
at  487ef1185333b5808bd723921e3c383e98c1d53f (commit)

- Shortlog 
commit 487ef1185333b5808bd723921e3c383e98c1d53f
Author: Andrew Harvey andrew.harv...@gmail.com
Date:   Tue Feb 21 15:00:00 2012 +1100

Imported Debian patch 1.7+dfsg-1

---

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging branch, upstream, created. d99e3586fca44f4cdbc574b5051a9191b0cdd3d7

2012-01-21 Thread Andrew Harvey
The branch, upstream has been created
at  d99e3586fca44f4cdbc574b5051a9191b0cdd3d7 (commit)

- Shortlog 
---

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging branch, pristine-tar, created. 94e01b835a6ad990e6ddf0b75da5736c8683b818

2012-01-21 Thread Andrew Harvey
The branch, pristine-tar has been created
at  94e01b835a6ad990e6ddf0b75da5736c8683b818 (commit)

- Shortlog 
commit 94e01b835a6ad990e6ddf0b75da5736c8683b818
Author: Andrew Harvey andrew.harv...@gmail.com
Date:   Sun Jan 22 08:44:51 2012 +1100

pristine-tar data for pjl-comp-filter_1.7+dfsg.orig.tar.gz

---

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging annotated tag, upstream/1.7+dfsg, created. upstream/1.7+dfsg

2012-01-21 Thread Andrew Harvey
The annotated tag, upstream/1.7+dfsg has been created
at  263a190ab7e5a86ea74eb5ee23b3db9bee040961 (tag)
   tagging  d99e3586fca44f4cdbc574b5051a9191b0cdd3d7 (commit)
 tagged by  Andrew Harvey
on  Sun Jan 22 08:44:35 2012 +1100

- Shortlog 
Upstream version 1.7+dfsg
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABCAAGBQJPGzHDAAoJEDiTg7zdt+ByH8QP/AwFtOXBYo2th2E3F7aHw2c8
Xbe/Zd9qdkwiDgaQ2YMUrWsjy/5MZUmS1A2zKKLlxybHBikAvFhDE/CcAVKyaIOZ
+7w7xdgDcIyhO0AIXTixi9S0ptgWAy9n7bO+fJDcD3Fm6razyUcpP2tkGqJAwF6W
e3kz/GE0ZgODlLXkup2JUUlhD8jy0Odjltb4AThK5tnXhEjZbT97peIWYPx7cbtV
5eE3AxHazOv6/R4LNJK2+U63puGBJE2qBtmXf6xCOdidL+e0DEphfjncokr8S1s6
WvlkZIvGUiaKFJTfXKRQ8rOMLNEzViDlOsRsp6NXnvxjT7EipC/+fsSdujB+krHY
boYIPkVHU7v9Pz1avm3Q6kfBxyAETifaV9Xkb7NKgZKp5x82W0pkb25e6Yv0tQvf
g7h9pc7GJVZotdH5Q2PIyT40/71jzvOGYLOThjuXDyLnjBmT9HURm8dgz7HwhRyT
4zzX7Eek04mzXk8v6CZShNmtn62A/imcEkKMxJGTRhdnbWvoACjNecWr1iC0LU7i
tX/FedluYLp9tiZOH7joeHVlzLyClGAwZNPgs2mCpiHFyGCgxhC3aN7puHTeha3U
4vS+oiS1gIRfJwUPuNzLlKczuVyxLFI69aD8GkPCQgB/ImNsMm6X08csM6xB6s8b
tAIZj2HUwG5Gkd9ssjXM
=vhD4
-END PGP SIGNATURE-

Andrew Harvey (1):
  Imported Upstream version 1.7+dfsg

---

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging branch, master, updated. upstream/1.7+dfsg-2-g0e68156

2012-01-21 Thread Andrew Harvey
The following commit has been merged in the master branch:
commit 0e681560e47589bca8ae7058c0207e3c5a066c75
Author: Andrew Harvey andrew.harv...@gmail.com
Date:   Sun Jan 22 08:48:12 2012 +1100

add Vcs fields to debian/control

diff --git a/debian/control b/debian/control
index 16b08f5..bb8c7ea 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,8 @@ Build-Depends:
  , default-jdk
  , junit
 Standards-Version: 3.9.2
+Vcs-Git: git://git.debian.org/pkg-java/libpjl-comp-filter-java.git
+Vcs-Browser: http://git.debian.org/?p=pkg-java/libpjl-comp-filter-java.git
 
 Package: libpjl-comp-filter-java
 Architecture: all

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging branch, master, updated. upstream/1.7+dfsg-5-g48fb2bd

2012-01-21 Thread Andrew Harvey
The following commit has been merged in the master branch:
commit af2e802a6d933a86451bfffb212ac9e3e0edce8b
Author: Andrew Harvey andrew.harv...@gmail.com
Date:   Sun Jan 22 09:35:25 2012 +1100

fix depends as per lintian warnings

diff --git a/debian/control b/debian/control
index 865a0fb..1167858 100644
--- a/debian/control
+++ b/debian/control
@@ -17,11 +17,10 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-java/libpjl-comp-filter-java.git
 Package: libpjl-comp-filter-java
 Architecture: all
 Depends:
- default-jre
+ ${misc:Depends}
  , libservlet2.5-java
  , libcommons-logging-java
  , libservlet2.5-java
- , ${misc:depends}
 Description: PJL Compression Filter
  A J2EE servlet filter which compresses response data.
  .
@@ -31,7 +30,7 @@ Description: PJL Compression Filter
 Package: libpjl-comp-filter-java-doc
 Architecture: all
 Depends:
- ${misc:depends}
+ ${misc:Depends}
 Section: doc
 Recommends:
  libpjl-comp-filter-java

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging branch, master, updated. upstream/1.7+dfsg-5-g48fb2bd

2012-01-21 Thread Andrew Harvey
The following commit has been merged in the master branch:
commit 48fb2bd302fc1c27821980c176a148f7b8a8db36
Author: Andrew Harvey andrew.harv...@gmail.com
Date:   Sun Jan 22 13:16:40 2012 +1100

change to cdbs

diff --git a/debian/control b/debian/control
index 1167858..43eb5e4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,15 @@ Priority: extra
 Maintainer: Andrew Harvey andrew.harv...@gmail.com
 DM-Upload-Allowed: yes
 Build-Depends:
- ant
- , debhelper (= 8~)
+ debhelper (= 7),
+ , cdbs (= 0.4.5.3),
  , default-jdk
- , junit
- , maven-repo-helper
- , maven-ant-helper
+Build-Depends-Indep:
+ maven-repo-helper ( 0.5)
+ , maven-ant-helper ( 4)
+ , ant
+ , libservlet2.5-java
+ , libcommons-logging-java
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-java/libpjl-comp-filter-java.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/libpjl-comp-filter-java.git
@@ -20,7 +23,6 @@ Depends:
  ${misc:Depends}
  , libservlet2.5-java
  , libcommons-logging-java
- , libservlet2.5-java
 Description: PJL Compression Filter
  A J2EE servlet filter which compresses response data.
  .
diff --git a/debian/rules b/debian/rules
index 10f4717..f721a9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,20 @@
 #!/usr/bin/make -f
 
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: 
([^+]+).*,\1,p')
-
-%:
-   dh $@
-
-override_dh_auto_build:
-   dh_auto_build -- jar javadoc
-
-override_dh_auto_install:
-   dh_auto_install
-   install -m 644 $(CURDIR)/pjl-comp-filter-${DEB_UPSTREAM_VERSION}.jar 
$(CURDIR)/debian/libpjl-comp-filter-java/usr/share/java/pjl-comp-filter-${DEB_UPSTREAM_VERSION}.jar
-   dh_link usr/share/java/pjl-comp-filter-${DEB_UPSTREAM_VERSION}.jar 
usr/share/java/pjl-comp-filter.jar
-   
-   install -d 
$(CURDIR)/debian/libpjl-comp-filter-java-doc/usr/share/doc/libpjl-comp-filter-java-doc
-   cp -r docs/ 
$(CURDIR)/debian/libpjl-comp-filter-java-doc/usr/share/doc/libpjl-comp-filter-java-doc/api
-
-binary-post-install/libpjl-comp-filter-java::
-   mh_installpoms -plibpjl-comp-filter-java
-   mh_installjar -plibpjl-comp-filter-java -l 
debian/libpjl-comp-filter-java.pom pjl-comp-filter-${DEB_UPSTREAM_VERSION}.jar
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+PACKAGE  := $(DEB_SOURCE_PACKAGE)
+VERSION  := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 
s/\+dfsg.*//)
+JAVA_HOME:= /usr/lib/jvm/default-java
+DEB_JARS := pjl-comp-filter-$(DEB_UPSTREAM_VERSION).jar
+DEB_ANT_BUILD_TARGET := jar javadoc
+DEB_ANT_BUILDFILE:= build.xml
+DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE)
+API_DOCS := docs
+
+binary-post-install/lib$(PACKAGE)-java::
+   mh_installpoms -plib$(PACKAGE)-java
+   mh_installjar -plib$(PACKAGE)-java -l debian/lib$(PACKAGE)-java.pom 
$(PACKAGE)-$(VERSION).jar
 
 clean::
mh_clean

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging branch, master, updated. upstream/1.7+dfsg-5-g48fb2bd

2012-01-21 Thread Andrew Harvey
The following commit has been merged in the master branch:
commit 74f59f99e013631d680a0aa0642a8df2dc108e4f
Author: Andrew Harvey andrew.harv...@gmail.com
Date:   Sun Jan 22 09:29:37 2012 +1100

install to maven-repo

diff --git a/debian/control b/debian/control
index bb8c7ea..865a0fb 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,8 @@ Build-Depends:
  , debhelper (= 8~)
  , default-jdk
  , junit
+ , maven-repo-helper
+ , maven-ant-helper
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-java/libpjl-comp-filter-java.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/libpjl-comp-filter-java.git
diff --git a/debian/libpjl-comp-filter-java.pom 
b/debian/libpjl-comp-filter-java.pom
new file mode 100644
index 000..2fa7295
--- /dev/null
+++ b/debian/libpjl-comp-filter-java.pom
@@ -0,0 +1,48 @@
+!--
+   This file is in the public domain, furnished “as is”, without technical
+   support, and with no warranty, express or implied, as to its usefulness 
for
+   any purpose.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+   modelVersion4.0.0/modelVersion
+   groupIdnet.sourceforge/groupId
+   artifactIdpjl-comp-filter/artifactId
+   version1.7/version
+   packagingjar/packaging
+
+   namePJL Compressing Filter/name
+   descriptionPJL Compressing Filter/description
+   urlhttp://sourceforge.net/projects/pjl-comp-filter//url
+
+   licenses
+   license
+   nameApache 2/name
+   
urlhttp://www.apache.org/licenses/LICENSE-2.0.txt/url
+   distributionrepo/distribution
+   /license
+   /licenses
+
+   dependencies
+   dependency
+   groupIdjunit/groupId
+   artifactIdjunit/artifactId
+   version3.8.2/version
+   scopetest/scope
+   /dependency
+   dependency
+   groupIdcommons-logging/groupId
+   artifactIdcommons-logging-api/artifactId
+   version1.1.1/version
+   /dependency
+   dependency
+   groupIdjavax.servlet.jsp/groupId
+   artifactIdjsp-api/artifactId
+   version2.1/version
+   /dependency
+   dependency
+   groupIdjavax.servlet/groupId
+   artifactIdservlet-api/artifactId
+   version2.5/version
+   /dependency
+   /dependencies
+/project
diff --git a/debian/libpjl-comp-filter-java.poms 
b/debian/libpjl-comp-filter-java.poms
new file mode 100644
index 000..9ed0402
--- /dev/null
+++ b/debian/libpjl-comp-filter-java.poms
@@ -0,0 +1 @@
+debian/libpjl-comp-filter-java.pom
diff --git a/debian/patches/02-addpom.patch b/debian/patches/02-addpom.patch
deleted file mode 100644
index 576041b..000
--- a/debian/patches/02-addpom.patch
+++ /dev/null
@@ -1,51 +0,0 @@
 /dev/null
-+++ b/pom.xml
-@@ -0,0 +1,48 @@
-+!--
-+  This file is in the public domain, furnished “as is”, without technical
-+  support, and with no warranty, express or implied, as to its usefulness 
for
-+  any purpose.
-+--
-+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
-+  modelVersion4.0.0/modelVersion
-+  groupIdnet.sourceforge/groupId
-+  artifactIdpjl-comp-filter/artifactId
-+  version1.7/version
-+  packagingjar/packaging
-+
-+  namePJL Compressing Filter/name
-+  descriptionPJL Compressing Filter/description
-+  urlhttp://sourceforge.net/projects/pjl-comp-filter//url
-+
-+  licenses
-+  license
-+  nameApache 2/name
-+  
urlhttp://www.apache.org/licenses/LICENSE-2.0.txt/url
-+  distributionrepo/distribution
-+  /license
-+  /licenses
-+
-+  dependencies
-+  dependency
-+  groupIdjunit/groupId
-+  artifactIdjunit/artifactId
-+  version3.8.2/version
-+  scopetest/scope
-+  /dependency
-+  dependency
-+  groupIdcommons-logging/groupId
-+  artifactIdcommons-logging-api/artifactId
-+  version1.1.1/version
-+  /dependency
-+  dependency
-+  groupIdjavax.servlet.jsp/groupId
-+  artifactIdjsp-api/artifactId
-+  version2.1/version
-+  /dependency
-+  dependency
-+  groupIdjavax.servlet

[SCM] libpjl-comp-filter-java packaging branch, master, updated. upstream/1.7+dfsg-7-g62e9114

2012-01-21 Thread Andrew Harvey
The following commit has been merged in the master branch:
commit 62e91148b96563938dbde4c264457d78d5b81b24
Author: Andrew Harvey andrew.harv...@gmail.com
Date:   Sun Jan 22 14:04:02 2012 +1100

make debian/compat consistant with debhelper dependency

diff --git a/debian/compat b/debian/compat
index 45a4fb7..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+7

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits


[SCM] libpjl-comp-filter-java packaging branch, master, updated. upstream/1.7+dfsg-7-g62e9114

2012-01-21 Thread Andrew Harvey
The following commit has been merged in the master branch:
commit c9656601a96cae2812ae875d35d3d69c69ebbf0b
Author: Andrew Harvey andrew.harv...@gmail.com
Date:   Sun Jan 22 14:01:04 2012 +1100

update deb_jars

diff --git a/debian/rules b/debian/rules
index f721a9c..978b7bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/class/ant.mk
 PACKAGE  := $(DEB_SOURCE_PACKAGE)
 VERSION  := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 
s/\+dfsg.*//)
 JAVA_HOME:= /usr/lib/jvm/default-java
-DEB_JARS := pjl-comp-filter-$(DEB_UPSTREAM_VERSION).jar
+DEB_JARS := servlet-api-2.5 commons-logging
 DEB_ANT_BUILD_TARGET := jar javadoc
 DEB_ANT_BUILDFILE:= build.xml
 DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE)

-- 
libpjl-comp-filter-java packaging

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits