[pkg-java] r12375 - in trunk/libgnu-regexp-java/debian: . source
Torsten Werner
twerner at alioth.debian.org
Sun May 9 10:17:34 UTC 2010
Author: twerner
Date: 2010-05-09 10:17:30 +0000 (Sun, 09 May 2010)
New Revision: 12375
Added:
trunk/libgnu-regexp-java/debian/compat
trunk/libgnu-regexp-java/debian/doc-base
trunk/libgnu-regexp-java/debian/docs
trunk/libgnu-regexp-java/debian/examples
trunk/libgnu-regexp-java/debian/source/
trunk/libgnu-regexp-java/debian/source/format
Removed:
trunk/libgnu-regexp-java/debian/libgnu-regexp-java
trunk/libgnu-regexp-java/debian/librules-manual.txt
trunk/libgnu-regexp-java/debian/librules.mk
trunk/libgnu-regexp-java/debian/postinst.libgnu-regexp-java
trunk/libgnu-regexp-java/debian/prerm.libgnu-regexp-java
Modified:
trunk/libgnu-regexp-java/debian/
trunk/libgnu-regexp-java/debian/changelog
trunk/libgnu-regexp-java/debian/control
trunk/libgnu-regexp-java/debian/rules
Log:
* Change Maintainer to Debian Java Maintainers.
* Add myself to Uploaders.
* Add Homepage and Vcs headers.
* Switch to source format 3.0.
* Do no longer ignore errors from $(MAKE) clean.
* Update Standards-Version: 3.8.4.
* Change Section: java.
* Clean up dependencies.
* Use debhelper and remove unneeded scripts (prerm, postinst).
* Add Build-Depends: debhelper.
Property changes on: trunk/libgnu-regexp-java/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: trunk/libgnu-regexp-java/debian/changelog
===================================================================
--- trunk/libgnu-regexp-java/debian/changelog 2010-05-09 08:47:58 UTC (rev 12374)
+++ trunk/libgnu-regexp-java/debian/changelog 2010-05-09 10:17:30 UTC (rev 12375)
@@ -1,3 +1,18 @@
+libgnu-regexp-java (1.1.4-4) unstable; urgency=low
+
+ * Change Maintainer to Debian Java Maintainers.
+ * Add myself to Uploaders.
+ * Add Homepage and Vcs headers.
+ * Switch to source format 3.0.
+ * Do no longer ignore errors from $(MAKE) clean.
+ * Update Standards-Version: 3.8.4.
+ * Change Section: java.
+ * Clean up dependencies.
+ * Use debhelper and remove unneeded scripts (prerm, postinst).
+ * Add Build-Depends: debhelper.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 09 May 2010 11:17:07 +0200
+
libgnu-regexp-java (1.1.4-3.2) unstable; urgency=medium
* Non-maintainer upload.
Added: trunk/libgnu-regexp-java/debian/compat
===================================================================
--- trunk/libgnu-regexp-java/debian/compat (rev 0)
+++ trunk/libgnu-regexp-java/debian/compat 2010-05-09 10:17:30 UTC (rev 12375)
@@ -0,0 +1 @@
+7
Modified: trunk/libgnu-regexp-java/debian/control
===================================================================
--- trunk/libgnu-regexp-java/debian/control 2010-05-09 08:47:58 UTC (rev 12374)
+++ trunk/libgnu-regexp-java/debian/control 2010-05-09 10:17:30 UTC (rev 12375)
@@ -1,16 +1,18 @@
Source: libgnu-regexp-java
-Section: devel
+Section: java
Priority: optional
-Maintainer: Kalle Kivimaa <killer at debian.org>
-Standards-Version: 3.6.1.0
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Kalle Kivimaa <killer at debian.org>, Torsten Werner <twerner at debian.org>
+Standards-Version: 3.8.4
Build-Depends-Indep: default-jdk, lynx (>= 2.8.4), libgetopt-java (>= 1.0.9-8)
+Build-Depends: debhelper (>= 7.0.50~)
+Homepage: http://savannah.gnu.org/projects/gnu-regexp
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgnu-regexp-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgnu-regexp-java/
Package: libgnu-regexp-java
Architecture: all
-Depends: java1-runtime | java2-runtime, libgetopt-java
-Suggests: java-virtual-machine
-Replaces: lib-gnu.regexp-java
-Conflicts: lib-gnu.regexp-java
+Depends: libgetopt-java
Description: Regular Expressions for Java
The gnu-regexp package is a pure-Java implementation of a traditional
(non-POSIX) NFA regular expression engine. Its syntax can emulate many
Copied: trunk/libgnu-regexp-java/debian/doc-base (from rev 12374, trunk/libgnu-regexp-java/debian/libgnu-regexp-java)
===================================================================
--- trunk/libgnu-regexp-java/debian/doc-base (rev 0)
+++ trunk/libgnu-regexp-java/debian/doc-base 2010-05-09 10:17:30 UTC (rev 12375)
@@ -0,0 +1,9 @@
+Document: libgnu-regexp-java
+Title: API documentation for gnu.regexp
+Author: Wes Biggs
+Abstract: API documentation for gnu.regexp Java package
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libgnu-regexp-java/api/index.html
+Files: /usr/share/doc/libgnu-regexp-java/api/*
Added: trunk/libgnu-regexp-java/debian/docs
===================================================================
--- trunk/libgnu-regexp-java/debian/docs (rev 0)
+++ trunk/libgnu-regexp-java/debian/docs 2010-05-09 10:17:30 UTC (rev 12375)
@@ -0,0 +1,3 @@
+docs/*
+README TODO
+
Added: trunk/libgnu-regexp-java/debian/examples
===================================================================
--- trunk/libgnu-regexp-java/debian/examples (rev 0)
+++ trunk/libgnu-regexp-java/debian/examples 2010-05-09 10:17:30 UTC (rev 12375)
@@ -0,0 +1 @@
+src/gnu/regexp/util/*.java
Deleted: trunk/libgnu-regexp-java/debian/libgnu-regexp-java
===================================================================
--- trunk/libgnu-regexp-java/debian/libgnu-regexp-java 2010-05-09 08:47:58 UTC (rev 12374)
+++ trunk/libgnu-regexp-java/debian/libgnu-regexp-java 2010-05-09 10:17:30 UTC (rev 12375)
@@ -1,9 +0,0 @@
-Document: libgnu-regexp-java
-Title: API documentation for gnu.regexp
-Author: Wes Biggs
-Abstract: API documentation for gnu.regexp Java package
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libgnu-regexp-java/api/index.html
-Files: /usr/share/doc/libgnu-regexp-java/api/*
Deleted: trunk/libgnu-regexp-java/debian/librules-manual.txt
===================================================================
--- trunk/libgnu-regexp-java/debian/librules-manual.txt 2010-05-09 08:47:58 UTC (rev 12374)
+++ trunk/libgnu-regexp-java/debian/librules-manual.txt 2010-05-09 10:17:30 UTC (rev 12375)
@@ -1,116 +0,0 @@
-Manual for the librules helper -*- Text -*-
-------------------------------
-$Id: Manual.txt,v 1.4 1999/12/03 02:20:07 ajk Exp $
-
-This file documents an experimental new debian/rules helper, a
-makefile called "librules.mk", which does all the boring work of
-building a package.
-
-Usage:
-
-The very first non-comment thing in your debian/rules should be the
-following line:
-librules_interface = 1
-This helps to spot incompatibilities with debian/rules and the
-librules.mk file currently in use.
-
-Include "debian/librules.mk" just after that line. Precede it with a
-variable definition "librules_native_pkg=yes" if the package you are building
-is a Debian native package.
-
-Define a target debian/stamp/build that builds the package (like the
-build target does in conventional debian/rules files). Put "touch $@"
-as the last action in that rule.
-
-For every binary package <package> you want to build:
-
- - If the package is "arch: all", make debian/stamp/binary/indep depend
- on debian/stamp/binary/<package>; otherwise make debian/stamp/binary/arch
- depend on that target
-
- - Write a target debian/stamp/binary/<package> using the following template:
-
-debian/stamp/binary/<package>: package=<package>
-debian/stamp/binary/<package>: debian/stamp/build
- $(prebinary)
- # Add here your own commands
- $(postbinary)
- touch $@
-
- The $(prebinary) macro will create a skeletal build tree for the
- package. It also installs debian/prerm.<package> and
- debian/postinst.<package> as the prerm and postinst scripts;
- it will also install the copyright file (debian/copyright)
- and the Debian changelog file (debian/changelog).
-
- See below for instructions about how to write your own install commands.
-
- The $(postbinary) macro fixes directory permissions, generates the binary
- control file and builds the package.
-
- - You may want to define targets "clean", "clean-binary" and "clean-build"
- to reverse the effects of your own commands in the build and binary targets.
- The librules.mk file cleans up for itself, you don't need to worry about that.
-
-
-How to write your own commands for binary targets:
-
-Use the following macros to install files:
-
- $(install_exec) SOURCE TARGET
- $(install_exec) SOURCE SOURCE ... DIRECTORY
- installs one or more binary executables
- (TARGET need not be a directory name)
-
- $(install_nonex) SOURCE TARGET
- $(install_nonex) SOURCE SOURCE ... DIRECTORY
- install one or more non-executable files
- (TARGET need not be a directory name)
-
- $(install_dir) DIRECTORY
- create the directory
-
- $(install_script) SOURCE TARGET
- $(install_script) SOURCE SOURCE ... DIRECTORY
- install one or more executable scripts
- (TARGET need not be a directory name)
-
-The macros above are wrappers around the "install" utility.
-
- $(install_symlink) SOURCE [TARGET]
- Install a symlink from SOURCE to TARGET
- (This macro is a wrapper around ln -s)
-
- $(gzip) FILE ...
- Compress the given files
- (This is a wrapper around gzip)
-
- $(strip_lib) FILE ...
- Strip the given files the way shared libraries are stripped
- (This is a wrapper around strip)
-
-
-*Never* refer to a file in the install target tree by their real name.
-Use the following macros instead:
-
- $(rootdir) - the directory that masquerades as / in the target tree
- (usually a subdirectory under debian/tmp)
- $(ctldir) - the directory where control files are installed
- (usually $(rootdir)/DEBIAN)
- $(bindir) - the main binary directory
- (usually $(rootdir)/usr/bin)
- $(docdir) - the main doc directory
- (usually $(rootdir)/usr/share/doc/<package>)
- ...
-(see librules.mk for what's available)
-
-
-If your debian/rules needs the dpkg-architecture variables, add the
-definition "librules_need_archvars=yes" before the include at the top
-of the file. If you use this feature, you need to Build-Depend on
-"dpkg-dev (>= 1.4.1.5)".
-
-If you want to patch/unpatch the package, add the definitions
-"librules_patch_support=yes" and "librules_patches=file1.diff
-file2.diff ... filen.diff" before the include at the top of the file.
-If you use this, you need to Build-Depend on "patch".
Deleted: trunk/libgnu-regexp-java/debian/librules.mk
===================================================================
--- trunk/libgnu-regexp-java/debian/librules.mk 2010-05-09 08:47:58 UTC (rev 12374)
+++ trunk/libgnu-regexp-java/debian/librules.mk 2010-05-09 10:17:30 UTC (rev 12375)
@@ -1,172 +0,0 @@
-# librules.mk - a library of convenient rules and macros for debian/rules files
-#
-# Copyright © 1999, 2000 Antti-Juhani Kaijanaho.
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this file, to deal in this file without
-# restriction, including without limitation the rights to use, copy,
-# modify, merge, publish, distribute, sublicense, and/or sell copies
-# of this file, and to permit persons to whom this file is furnished
-# to do so, subject to the following condition: The above copyright
-# notice and this permission notice shall be included in all copies or
-# substantial portions of this file.
-#
-# THIS FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL SOFTWARE IN THE PUBLIC INTEREST,
-# INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-# IN CONNECTION WITH THIS FILE OR THE USE OR OTHER DEALINGS IN THIS
-# FILE.
-#
-# Except as contained in this notice, the name of the author(s) of
-# this file shall not be used in advertising or otherwise to promote
-# the sale, use or other dealings in this file without prior written
-# authorization from the author(s).
-
-# This file is set up to be compliant with Debian Standards Version
-# 3.2.1.
-
-# $Id: librules.mk,v 1.12 2001/03/11 16:27:50 ajk Exp $
-
-default:
- @echo You need to specify a target.
- @exit 1
-
-librules_a_variable_just_to_run_the_commands1 := $(shell mkdir debian/stamp)
-librules_a_variable_just_to_run_the_commands2 := $(shell mkdir debian/stamp/binary)
-
-# Make sure we don't get used by an incompatible debian/rules
-# WHEN YOU MAKE INCOMPATIBLE CHANGES, EDIT THIS!
-ifneq ($(librules_interface),1)
-$(error incompatible debian/rules)
-endif
-
-# Standard interface targets
-build: debian/stamp/build
-binary: binary-indep binary-arch
-binary-arch: debian/stamp/binary/arch
-binary-indep: debian/stamp/binary/indep
-clean: clean-build clean-binary clean-std
-
-
-# Nonstandard interface targets
-clean-build: clean-build-std
-clean-binary: clean-binary-std
-
-# Stamp targets for the standard binary targets
-debian/stamp/binary/arch: debian/stamp/build
- touch $@
-
-debian/stamp/binary/indep: debian/stamp/build
- touch $@
-
-.PHONY: default build binary binary-arch binary-indep \
- clean clean-build clean-binary
-
-ifeq ($(librules_need_archvars),yes)
-DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_CPU = $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_GNU_SYSTEM = $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
-DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_GNU_CPU = $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_GNU_SYSTEM = $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-endif
-
-CFLAGS = -O2 -Wall
-STRIP =
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-STRIP = -s
-endif
-
-export CFLAGS
-
-install := install -o root -g root
-install_exec := $(install) -m 0755 $(STRIP)
-install_nonex := $(install) -m 0644
-install_dir := $(install) -m 0755 -d
-install_script := $(install) -m 0755
-install_symlink := ln -s
-gzip := gzip -9
-strip_lib := strip --strip-unneeded
-
-tmpdir := $(shell pwd)/debian/tmp
-
-# These must not be :='s!
-rootdir = $(tmpdir)/$(package)
-ctldir = $(rootdir)/DEBIAN
-bindir = $(rootdir)/usr/bin
-sbindir = $(rootdir)/usr/sbin
-docdir = $(rootdir)/usr/share/doc/$(package)
-exampledir = $(docdir)/examples
-mandir = $(rootdir)/usr/share/man
-elispdir = $(rootdir)/usr/share/emacs/site-lisp
-emacs_d_dir = $(rootdir)/etc/emacs/site-start.d
-man1dir = $(mandir)/man1
-man2dir = $(mandir)/man2
-man3dir = $(mandir)/man3
-man4dir = $(mandir)/man4
-man5dir = $(mandir)/man5
-man6dir = $(mandir)/man6
-man7dir = $(mandir)/man7
-man8dir = $(mandir)/man8
-sharedir = $(rootdir)/usr/share/$(package_base)
-libdir = $(rootdir)/usr/lib/$(package_base)
-docbasedir = $(rootdir)/usr/share/doc-base
-usrlib = $(rootdir)/usr/lib
-includedir = $(rootdir)/usr/include
-
-ifeq ($(librules_native_pkg),yes)
-librules_changelog=changelog
-else
-librules_changelog=changelog.Debian
-endif
-
-define prebinary
- $(RM) -r $(rootdir)
- $(install_dir) $(ctldir)
- $(install_script) debian/prerm.$(package) $(ctldir)/prerm
- $(install_script) debian/postinst.$(package) $(ctldir)/postinst
- $(install_dir) $(docdir)
- $(install_nonex) debian/copyright $(docdir)
- $(install_nonex) debian/changelog $(docdir)/$(librules_changelog)
- $(gzip) $(docdir)/$(librules_changelog)
-endef
-
-define postbinary
- chmod -R g-s $(rootdir)
- dpkg-gencontrol -isp -p$(package) -P$(rootdir) $(gencontrol_options)
- dpkg --build $(rootdir) ..
-endef
-
-clean-build-std:
- rm -f debian/stamp/build
-
-clean-binary-std:
- rm -f debian/stamp/binary/*
- rm -f debian/files debian/substvars
- rm -rf $(tmpdir)
-
-clean-std:
- rm -rf debian/stamp/
- rm -rf lib/*
-
-# Patching support
-ifeq ($(librules_patch_support),yes)
-debian/stamp/build: debian/stamp/patch
-clean-build: unpatch
-
-debian/stamp/patch:
- $(foreach patch, $(librules_patches), patch -fs < $(patch) && )true
- touch $@
-
-unpatch: debian/stamp/patch
- $(foreach patch, $(librules_patches), patch -fsR < $(patch) && )true
- rm -f debian/stamp/patch
-endif
Deleted: trunk/libgnu-regexp-java/debian/postinst.libgnu-regexp-java
===================================================================
--- trunk/libgnu-regexp-java/debian/postinst.libgnu-regexp-java 2010-05-09 08:47:58 UTC (rev 12374)
+++ trunk/libgnu-regexp-java/debian/postinst.libgnu-regexp-java 2010-05-09 10:17:30 UTC (rev 12375)
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-package=libgnu-regexp-java
-docs="libgnu-regexp-java"
-
-if [ "$1" = "configure" ]; then
- if command -v install-docs >/dev/null 2>&1; then
- for doc in $docs
- do
- install-docs -i /usr/share/doc-base/$doc
- done
- fi
-fi
-
Deleted: trunk/libgnu-regexp-java/debian/prerm.libgnu-regexp-java
===================================================================
--- trunk/libgnu-regexp-java/debian/prerm.libgnu-regexp-java 2010-05-09 08:47:58 UTC (rev 12374)
+++ trunk/libgnu-regexp-java/debian/prerm.libgnu-regexp-java 2010-05-09 10:17:30 UTC (rev 12375)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-package=libgnu-regexp-java
-docs="libgnu-regexp-java"
-
-if [ "$1" = remove -o "$1" = upgrade ]; then
- if command -v install-docs >/dev/null 2>&1; then
- for doc in $docs
- do
- install-docs -r $doc
- done
- fi
-fi
Modified: trunk/libgnu-regexp-java/debian/rules
===================================================================
--- trunk/libgnu-regexp-java/debian/rules 2010-05-09 08:47:58 UTC (rev 12374)
+++ trunk/libgnu-regexp-java/debian/rules 2010-05-09 10:17:30 UTC (rev 12375)
@@ -1,41 +1,16 @@
#!/usr/bin/make -f
-# Written by Antti-Juhani Kaijanaho
-# You may treat this file as if it were in the public domain.
-librules_interface = 1
-include debian/librules.mk
-
-debian/stamp/binary/arch : debian/stamp/binary/libgnu-regexp-java
-
export CLASSPATH=.:/usr/share/java/gnu-getopt.jar
-debian/stamp/build :
+%:
+ dh $@
+
+override_dh_auto_build:
$(MAKE) -C src JAVAC=javac gnu.regexp utils
- touch $@
+ cd lib && jar uf gnu-regexp-1.1.4.jar gnu/regexp/util/*.class
-debian/stamp/clean-build:
- -$(MAKE) -C src clean
+# $(MAKE) -C src clean
-javarep=$(rootdir)/usr/share/java/repository
-javalib=$(rootdir)/usr/share/java
-
-debian/stamp/binary/libgnu-regexp-java : package=libgnu-regexp-java
-debian/stamp/binary/libgnu-regexp-java : debian/stamp/build
- $(prebinary)
- $(install_dir) $(javalib)
- $(install_dir) $(exampledir)
- $(install_dir) $(docbasedir)
- (cd lib ; jar uf gnu-regexp-1.1.4.jar gnu/regexp/util/*.class)
- cp lib/gnu-regexp-1.1.4.jar $(javalib)
- (cd $(javalib) ; ln -s gnu-regexp-1.1.4.jar gnu-regexp.jar )
- cp -r docs/* $(docdir)
- rm -f $(docdir)/changes.html
- $(install_nonex) debian/README.Debian $(docdir)
- $(install_nonex) README TODO $(docdir)
- $(install_nonex) src/gnu/regexp/util/*.java $(exampledir)
- $(install_nonex) debian/libgnu-regexp-java $(docbasedir)
- $(install_nonex) docs/changes.html $(docdir)/changelog.html
- lynx -dump -nolist docs/changes.html > $(docdir)/changelog
- $(gzip) $(docdir)/changelog $(docdir)/changelog.html
- $(postbinary)
- touch $@
+# rm -f $(docdir)/changes.html
+# $(install_nonex) docs/changes.html $(docdir)/changelog.html
+# lynx -dump -nolist docs/changes.html > $(docdir)/changelog
Added: trunk/libgnu-regexp-java/debian/source/format
===================================================================
--- trunk/libgnu-regexp-java/debian/source/format (rev 0)
+++ trunk/libgnu-regexp-java/debian/source/format 2010-05-09 10:17:30 UTC (rev 12375)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list