[Git][java-team/tuxguitar][master] 3 commits: Refresh patches for whitespace

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / tuxguitar


Commits:
02676ec0 by tony mancill at 2023-01-19T22:24:37-08:00
Refresh patches for whitespace

Gbp-Dch: ignore

- - - - -
a7a3c0b7 by tony mancill at 2023-01-19T22:25:37-08:00
Update 11-eclipse-swt.patch

- - - - -
4b0e9951 by tony mancill at 2023-01-19T22:29:18-08:00
Prepare changelog for upload

- - - - -


4 changed files:

- debian/changelog
- debian/patches/04-hardening-cppflags.patch
- debian/patches/11-eclipse-swt.patch
- debian/patches/13-remove-vst.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+tuxguitar (1.5.6+dfsg1-3) unstable; urgency=medium
+
+  * QA upload.
+  * Update 11-eclipse-swt.patch
+
+ -- tony mancill <tmancill at debian.org>  Thu, 19 Jan 2023 22:25:45 -0800
+
 tuxguitar (1.5.6+dfsg1-2) unstable; urgency=medium
 
   * QA upload.


=====================================
debian/patches/04-hardening-cppflags.patch
=====================================
@@ -6,7 +6,7 @@ Last-Update: 2022-12-01
 
 --- a/TuxGuitar-alsa/jni/GNUmakefile
 +++ b/TuxGuitar-alsa/jni/GNUmakefile
-@@ -11,7 +11,7 @@
+@@ -10,7 +10,7 @@
  OBJECTS=org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o
  
  %.o: %.c
@@ -39,7 +39,7 @@ Last-Update: 2022-12-01
  
 --- a/TuxGuitar-oss/jni/GNUmakefile
 +++ b/TuxGuitar-oss/jni/GNUmakefile
-@@ -11,7 +11,7 @@
+@@ -10,7 +10,7 @@
  OBJECTS=org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o
  
  %.o: %.c


=====================================
debian/patches/11-eclipse-swt.patch
=====================================
@@ -17,53 +17,57 @@ Last-Update: 2022-12-01
  		<profile>
 --- a/TuxGuitar-image/pom.xml
 +++ b/TuxGuitar-image/pom.xml
-@@ -43,8 +43,8 @@
+@@ -43,9 +43,8 @@
  			<scope>provided</scope>
  		</dependency>
  		<dependency>
 -			<groupId>${org.eclipse.swt.groupId}</groupId>
 -			<artifactId>${org.eclipse.swt.artifactId}</artifactId>
+-			<scope>provided</scope>
 +			<groupId>org.eclipse.swt</groupId>
 +			<artifactId>org.eclipse.swt</artifactId>
- 			<scope>provided</scope>
  		</dependency>
  	</dependencies>
+ </project>
 --- a/TuxGuitar-musicxml/pom.xml
 +++ b/TuxGuitar-musicxml/pom.xml
-@@ -38,8 +38,8 @@
+@@ -38,9 +38,8 @@
  			<scope>provided</scope>
  		</dependency>
  		<dependency>
 -			<groupId>${org.eclipse.swt.groupId}</groupId>
 -			<artifactId>${org.eclipse.swt.artifactId}</artifactId>
+-			<scope>provided</scope>
 +			<groupId>org.eclipse.swt</groupId>
 +			<artifactId>org.eclipse.swt</artifactId>
- 			<scope>provided</scope>
  		</dependency>
  		<dependency>
+ 			<groupId>${project.groupId}</groupId>
 --- a/TuxGuitar-tef/pom.xml
 +++ b/TuxGuitar-tef/pom.xml
-@@ -38,8 +38,8 @@
+@@ -38,9 +38,8 @@
  			<scope>provided</scope>
  		</dependency>
  		<dependency>
 -			<groupId>${org.eclipse.swt.groupId}</groupId>
 -			<artifactId>${org.eclipse.swt.artifactId}</artifactId>
+-			<scope>provided</scope>
 +			<groupId>org.eclipse.swt</groupId>
 +			<artifactId>org.eclipse.swt</artifactId>
- 			<scope>provided</scope>
  		</dependency>
  		<dependency>
+ 			<groupId>${project.groupId}</groupId>
 --- a/TuxGuitar-ui-toolkit-swt/pom.xml
 +++ b/TuxGuitar-ui-toolkit-swt/pom.xml
-@@ -33,8 +33,8 @@
+@@ -33,9 +33,8 @@
  			<scope>provided</scope>
  		</dependency>
  		<dependency>
 -			<groupId>${org.eclipse.swt.groupId}</groupId>
 -			<artifactId>${org.eclipse.swt.artifactId}</artifactId>
+-			<scope>provided</scope>
 +			<groupId>org.eclipse.swt</groupId>
 +			<artifactId>org.eclipse.swt</artifactId>
- 			<scope>provided</scope>
  		</dependency>
  	</dependencies>
+ </project>


=====================================
debian/patches/13-remove-vst.patch
=====================================
@@ -6,7 +6,7 @@ Last-Update: 2022-12-01
 
 --- a/build-scripts/tuxguitar-linux-x86_64/pom.xml
 +++ b/build-scripts/tuxguitar-linux-x86_64/pom.xml
-@@ -380,7 +380,6 @@
+@@ -348,7 +348,6 @@
  				<module>../native-modules/tuxguitar-oss-linux-x86_64</module>
  				<module>../native-modules/tuxguitar-fluidsynth-linux-x86_64</module>
  				<module>../native-modules/tuxguitar-synth-lv2-linux-x86_64</module>
@@ -14,7 +14,7 @@ Last-Update: 2022-12-01
  			</modules>
  			
  			<build>
-@@ -411,11 +410,7 @@
+@@ -379,11 +378,7 @@
  										<copy todir="${project.build.directory}/${project.finalName}/">
  											<fileset dir="../native-modules/tuxguitar-synth-lv2-linux-x86_64/target/build" />
  										</copy>



View it on GitLab: https://salsa.debian.org/java-team/tuxguitar/-/compare/c49771827deb088f4e9e37782b1e3c00912fae4c...4b0e9951d9dd7f1dfe818bdc1ae2d05b20acc4ad

-- 
View it on GitLab: https://salsa.debian.org/java-team/tuxguitar/-/compare/c49771827deb088f4e9e37782b1e3c00912fae4c...4b0e9951d9dd7f1dfe818bdc1ae2d05b20acc4ad
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230120/847a4fb6/attachment.htm>