[SCM] jedit - Java plugin-based editor for programmers branch, master, updated. debian/4.4.2+dfsg-1-23-g998e08e

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit 651920ace78d5295fc627ebb0b16b200858341e2
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Fri Jun 15 14:03:36 2012 +0000

    /build-support dir has been removed upstream. /jEdit/ becomes the new root

diff --git a/debian/README.source b/debian/README.source
index c4a5f56..bd11b98 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,7 +4,7 @@ Information about jedit
 REPACKAGING
 
  jEdit uses a modified version of bsh which has been removed from upstream
- tarball (jEdit/org/gjt/sp/jedit/bsh).
+ tarball (org/gjt/sp/jedit/bsh).
  Build process applies jedit patches to Debian bsh sources (bsh-src).
 
  Patches 00bsh-jedit and 01bsh-jedit-asm document jedit changes.
diff --git a/debian/copyright b/debian/copyright
index 57f303f..a11e702 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,28 +10,28 @@ License: GPL-2+
  License can be found in the `/usr/share/common-licenses/GPL-2'
  file.
 
-Files: jEdit/doc/users-guide/*
+Files: doc/users-guide/*
 Copyright: 2010, Contributors <jedit-devel at lists.sourceforge.net>
 License: GFDL-1.1+
  On Debian systems the full text of the GNU Free
  Documentation License, Version 1.2 License can be found in
  the `/usr/share/common-licenses/GFDL-1.2' file.
 
-Files: jEdit/installer/ConsoleInstall.java
- jEdit/installer/ConsoleProgress.java
- jEdit/installer/Install.java
- jEdit/installer/InstallThread.java
- jEdit/installer/InvalidHeaderException.java
- jEdit/installer/NonInteractiveInstall.java
- jEdit/installer/OperatingSystem.java
- jEdit/installer/Progress.java
- jEdit/installer/SwingInstall.java
- jEdit/installer/TarBuffer.java
- jEdit/installer/TarEntry.java
- jEdit/installer/TarHeader.java
- jEdit/installer/TarInputStream.java
- jEdit/installer/TarOutputStream.java
- jEdit/installer/VariableGridLayout.java
+Files: installer/ConsoleInstall.java
+ installer/ConsoleProgress.java
+ installer/Install.java
+ installer/InstallThread.java
+ installer/InvalidHeaderException.java
+ installer/NonInteractiveInstall.java
+ installer/OperatingSystem.java
+ installer/Progress.java
+ installer/SwingInstall.java
+ installer/TarBuffer.java
+ installer/TarEntry.java
+ installer/TarHeader.java
+ installer/TarInputStream.java
+ installer/TarOutputStream.java
+ installer/VariableGridLayout.java
 Copyright: none
 License: public-domain
  This work has been placed into the public domain. You may use this work in any
@@ -41,10 +41,10 @@ License: public-domain
  _NO_ RESPONSIBILITY FOR ANY CONSEQUENCE RESULTING FROM THE USE, MODIFICATION,
  OR REDISTRIBUTION OF THIS SOFTWARE.
 
-Files: jEdit/installer/BZip2Constants.java
- jEdit/installer/CBZip2InputStream.java
- jEdit/installer/CBZip2OutputStream.java
- jEdit/installer/CRC.java
+Files: installer/BZip2Constants.java
+ installer/CBZip2InputStream.java
+ installer/CBZip2OutputStream.java
+ installer/CRC.java
 Copyright: 2000, The Apache Software Foundation
 License: Apache Software License version 1.1
  Redistribution and use in source and binary forms, with or without
@@ -89,14 +89,14 @@ License: Apache Software License version 1.1
  originally written at the National Center for Supercomputing Applications,
  University of Illinois, Urbana-Champaign.
 
-Files: jEdit/org/gjt/sp/jedit/bsh/*
+Files: org/gjt/sp/jedit/bsh/*
 Copyright: 2000, Pat Niemeyer <pat at pat.net>
 License: LGPL
  On Debian systems the full text of the GNU Lesser General Public
  License can be found in the `/usr/share/common-licenses/LGPL-2'
  file.
 
-Files: jEdit/org/gjt/sp/jedit/bsh/org/objectweb/asm/*
+Files: org/gjt/sp/jedit/bsh/org/objectweb/asm/*
 Copyright: 2000, INRIA France Telecom
            2002, France Telecom
 License: LGPL-2+
@@ -104,7 +104,7 @@ License: LGPL-2+
  License can be found in the `/usr/share/common-licenses/LGPL-2'
  file.
 
-Files: jEdit/com/microstar/xml/*
+Files: com/microstar/xml/*
 Copyright: 1998, Microstar Software Ltd.
 License: other
  AElfred is free for both commercial and non-commercial use and
diff --git a/debian/jedit.docs b/debian/jedit.docs
index 662b329..5a270e2 100644
--- a/debian/jedit.docs
+++ b/debian/jedit.docs
@@ -1 +1 @@
-jEdit/build/doc/*
+build/doc/*
diff --git a/debian/jedit.install b/debian/jedit.install
index 2697ff6..4944e55 100644
--- a/debian/jedit.install
+++ b/debian/jedit.install
@@ -1,8 +1,8 @@
 debian/jedit.sh		usr/share/jedit
-jEdit/build/jedit.jar	usr/share/jedit
-jEdit/build/modes	usr/share/jedit
-jEdit/build/macros	usr/share/jedit
-jEdit/build/properties	usr/share/jedit
-jEdit/build/startup	usr/share/jedit
+build/jedit.jar		usr/share/jedit
+build/modes		usr/share/jedit
+build/macros		usr/share/jedit
+build/properties	usr/share/jedit
+build/startup		usr/share/jedit
 
 debian/lintian/jedit	usr/share/lintian/overrides
diff --git a/debian/jedit.manpages b/debian/jedit.manpages
index 53294fd..7498868 100644
--- a/debian/jedit.manpages
+++ b/debian/jedit.manpages
@@ -1 +1 @@
-jEdit/package-files/linux/jedit.1 
+package-files/linux/jedit.1 
diff --git a/debian/rules b/debian/rules
index c8daf41..f1f9b15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export JAVA_HOME=/usr/lib/jvm/default-java
 VERSION    := $(shell dpkg-parsechangelog|egrep '^Version:'|cut -f2 -d' '|cut -f1 -d+)
 PROPERTIES := $(CURDIR)/debian/build.properties
-ICON       := $(CURDIR)/jEdit/build/doc/jedit.png
+ICON       := $(CURDIR)/build/doc/jedit.png
 DESTDIR    := $(CURDIR)/debian/jedit
 TMPDIR     := get-orig-source-tmp
 
@@ -15,15 +15,15 @@ override_dh_auto_configure:
 	mkdir bsh && cd bsh && tar zxf /usr/src/bsh-src/bsh.tar.gz
 	-mv debian/patches/series.noauto debian/patches/series
 	dh_quilt_patch
-	cp -a bsh/src/bsh jEdit/org/gjt/sp/jedit
-	cp -a bsh/asm/src/bsh/org jEdit/org/gjt/sp/jedit/bsh
+	cp -a bsh/src/bsh org/gjt/sp/jedit
+	cp -a bsh/asm/src/bsh/org org/gjt/sp/jedit/bsh
 
 override_dh_auto_build:
 	# build
-	cd jEdit && ant -propertyfile $(PROPERTIES) build
-	cd jEdit && ant -propertyfile $(PROPERTIES) docs-html
+	ant -propertyfile $(PROPERTIES) build
+	ant -propertyfile $(PROPERTIES) docs-html
 	# upstream changelog
-	cp jEdit/build/doc/CHANGES.txt jEdit/build/doc/changelog
+	cp build/doc/CHANGES.txt build/doc/changelog
 
 override_dh_auto_install:
 	dh_install
@@ -41,28 +41,28 @@ override_dh_auto_install:
 	convert $(ICON) -scale 32x32 \
 		$(DESTDIR)/usr/share/pixmaps/jedit.xpm
 	# desktop
-	cp jEdit/package-files/linux/deb/jedit.desktop debian/jedit.desktop
+	cp package-files/linux/deb/jedit.desktop debian/jedit.desktop
 	sed -i /^Icon/s/=.*/=jedit/ debian/jedit.desktop
 	install -d -m 755 $(DESTDIR)/usr/share/applications
 	install -m 644 debian/jedit.desktop \
 		$(DESTDIR)/usr/share/applications
 	# menu
-	cp jEdit/package-files/linux/deb/jedit debian/jedit.menu
+	cp package-files/linux/deb/jedit debian/jedit.menu
 	sed -i '$$s/$$/ icon="\/usr\/share\/pixmaps\/jedit.xpm"/;s/Apps/Applications/' \
 		debian/jedit.menu
 
 override_dh_auto_clean:
 	-dh_quilt_unpatch
 	-mv debian/patches/series debian/patches/series.noauto
-	cd jEdit && ant clean-all
+	ant clean-all
 	rm -f debian/jedit.menu debian/jedit.desktop
 	# bsh: clean
-	rm -rf jEdit/org/gjt/sp/jedit/bsh bsh
+	rm -rf org/gjt/sp/jedit/bsh bsh
 
 get-orig-source:
 	uscan --verbose --download-version $(VERSION) --force-download --repack --rename
 	-mkdir $(TMPDIR) && tar -C $(TMPDIR) -zxf ../jedit_$(VERSION).orig.tar.gz
 	rm -f ../jedit_$(VERSION).orig.tar.gz
-	cd $(TMPDIR) && tar --exclude jEdit/org/gjt/sp/jedit/bsh \
+	cd $(TMPDIR) && tar --exclude org/gjt/sp/jedit/bsh \
 		-Jcf ../../jedit_$(VERSION)+dfsg.orig.tar.xz *
 	rm -rf $(TMPDIR)

-- 
jedit - Java plugin-based editor for programmers