[Git][java-team/eclipse-cdt][master] 3 commits: Move extra pom fils to Debian

Sudip Mukherjee gitlab at salsa.debian.org
Thu Aug 6 16:02:55 BST 2020 


Sudip Mukherjee pushed to branch master at Debian Java Maintainers / eclipse-cdt


Commits:
e68bed06 by Sudip Mukherjee at 2020-08-06T11:18:22+01:00
Move extra pom fils to Debian

Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>

- - - - -
6073d9df by Sudip Mukherjee at 2020-08-06T15:39:06+01:00
Include missing parent pom

Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>

- - - - -
b726776d by Sudip Mukherjee at 2020-08-06T15:39:14+01:00
Add changelog for 9.9.0-4 release

Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>

- - - - -


7 changed files:

- debian/changelog
- debian/libeclipse-cdt-java.poms
- debian/patches/fix_packaging.patch
- + debian/poms/core_org.eclipse.cdt.core.native_pom.xml
- + debian/poms/core_org.eclipse.cdt.core_pom.xml
- + debian/poms/util_org.eclipse.cdt.util_pom.xml
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+eclipse-cdt (9.9.0-4) unstable; urgency=medium
+
+  * Remove extra poms from patch.
+    - Move them to separate folder.
+  * Add missing parent pom.
+
+ -- Sudip Mukherjee <sudipm.mukherjee at gmail.com>  Thu, 06 Aug 2020 15:38:02 +0100
+
 eclipse-cdt (9.9.0-3) unstable; urgency=medium
 
   * Source only upload.


=====================================
debian/libeclipse-cdt-java.poms
=====================================
@@ -26,6 +26,7 @@
 #     Empty by default. [mh_install]
 #
 pom.xml --has-package-version
+core/pom.xml --has-package-version
 core/org.eclipse.cdt.core.native/pom.xml --has-package-version --java-lib
 core/org.eclipse.cdt.core/pom.xml --has-package-version --java-lib
 debug/org.eclipse.cdt.debug.application.product/pom.xml --ignore


=====================================
debian/patches/fix_packaging.patch
=====================================
@@ -9,59 +9,6 @@ Forwarded: not-needed
 
 ---
 
---- /dev/null
-+++ eclipse-cdt-9.9.0/core/org.eclipse.cdt.core.native/pom.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-+  <modelVersion>4.0.0</modelVersion>
-+  <parent>
-+    <groupId>org.eclipse.cdt</groupId>
-+    <artifactId>org.eclipse.cdt-parent</artifactId>
-+    <version>9.9.0-SNAPSHOT</version>
-+  </parent>
-+  <artifactId>org.eclipse.cdt.core.native</artifactId>
-+  <version>5.10.100-SNAPSHOT</version>
-+  <packaging>jar</packaging>
-+  <name>C/C++ Development Tools Core Native Utilities</name>
-+  <organization>
-+    <name>Eclipse CDT</name>
-+  </organization>
-+  <build>
-+    <sourceDirectory>src</sourceDirectory>
-+  </build>
-+</project>
---- /dev/null
-+++ eclipse-cdt-9.9.0/core/org.eclipse.cdt.core/pom.xml
-@@ -0,0 +1,27 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-+  <modelVersion>4.0.0</modelVersion>
-+  <parent>
-+    <groupId>org.eclipse.cdt</groupId>
-+    <artifactId>org.eclipse.cdt-parent</artifactId>
-+    <version>9.9.0-SNAPSHOT</version>
-+  </parent>
-+  <artifactId>org.eclipse.cdt.core</artifactId>
-+  <version>6.9.0-SNAPSHOT</version>
-+  <packaging>jar</packaging>
-+  <name>C/C++ Development Tools Core</name>
-+  <organization>
-+    <name>Eclipse CDT</name>
-+  </organization>
-+  <build>
-+    <sourceDirectory>.</sourceDirectory>
-+  </build>
-+  <dependencies>
-+    <dependency>
-+      <groupId>org.eclipse.cdt</groupId>
-+      <artifactId>org.eclipse.cdt.core.native</artifactId>
-+      <version>5.10.100-SNAPSHOT</version>
-+    </dependency>
-+  </dependencies>
-+</project>
 --- eclipse-cdt-9.9.0.orig/pom.xml
 +++ eclipse-cdt-9.9.0/pom.xml
 @@ -15,8 +15,10 @@
@@ -76,7 +23,7 @@ Forwarded: not-needed
  		<tycho-extras-version>1.4.0</tycho-extras-version>
  		<cbi-plugins.version>1.1.7</cbi-plugins.version>
  		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-@@ -82,201 +84,8 @@
+@@ -82,201 +84,9 @@
  
  	<modules>
  		<!-- The test plug-ins need to be at the end -->
@@ -115,6 +62,7 @@ Forwarded: not-needed
 -		<module>codan/org.eclipse.cdt.codan.checkers</module>
 -		<module>codan/org.eclipse.cdt.codan.checkers.ui</module>
 -
++		<module>core</module>
  		<module>core/org.eclipse.cdt.core.native</module>
 -		<module>core/org.eclipse.cdt.core.linux</module>
 -		<module>core/org.eclipse.cdt.core.linux.x86_64</module>
@@ -278,7 +226,7 @@ Forwarded: not-needed
  
  		<!-- TODO:  Investigate/Fix hanging before re-enable re-enabling
  		<module>debug/org.eclipse.cdt.debug.application.tests</module>
-@@ -958,4 +767,101 @@
+@@ -958,4 +768,101 @@
  			</plugins>
  		</pluginManagement>
  	</build>
@@ -380,26 +328,3 @@ Forwarded: not-needed
 +		</dependency>
 +	</dependencies>
  </project>
---- /dev/null
-+++ eclipse-cdt-9.9.0/util/org.eclipse.cdt.util/pom.xml
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-+  <modelVersion>4.0.0</modelVersion>
-+  <parent>
-+    <groupId>org.eclipse.cdt</groupId>
-+    <artifactId>org.eclipse.cdt.util-parent</artifactId>
-+    <version>9.9.0-SNAPSHOT</version>
-+  </parent>
-+  <artifactId>org.eclipse.cdt.util</artifactId>
-+  <version>5.0.101-SNAPSHOT</version>
-+  <packaging>jar</packaging>
-+  <name>Eclipse C/C++ Development Tools Utilities</name>
-+  <organization>
-+    <name>Eclipse CDT</name>
-+  </organization>
-+  <build>
-+    <sourceDirectory>src</sourceDirectory>
-+  </build>
-+</project>


=====================================
debian/poms/core_org.eclipse.cdt.core.native_pom.xml
=====================================
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.cdt</groupId>
+    <artifactId>org.eclipse.cdt-parent</artifactId>
+    <version>9.9.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.eclipse.cdt.core.native</artifactId>
+  <version>5.10.100-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <name>C/C++ Development Tools Core Native Utilities</name>
+  <organization>
+    <name>Eclipse CDT</name>
+  </organization>
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+  </build>
+</project>


=====================================
debian/poms/core_org.eclipse.cdt.core_pom.xml
=====================================
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.cdt</groupId>
+    <artifactId>org.eclipse.cdt-parent</artifactId>
+    <version>9.9.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.eclipse.cdt.core</artifactId>
+  <version>6.9.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <name>C/C++ Development Tools Core</name>
+  <organization>
+    <name>Eclipse CDT</name>
+  </organization>
+  <build>
+    <sourceDirectory>.</sourceDirectory>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.cdt</groupId>
+      <artifactId>org.eclipse.cdt.core.native</artifactId>
+      <version>5.10.100-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>


=====================================
debian/poms/util_org.eclipse.cdt.util_pom.xml
=====================================
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.cdt</groupId>
+    <artifactId>org.eclipse.cdt.util-parent</artifactId>
+    <version>9.9.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.eclipse.cdt.util</artifactId>
+  <version>5.0.101-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <name>Eclipse C/C++ Development Tools Utilities</name>
+  <organization>
+    <name>Eclipse CDT</name>
+  </organization>
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+  </build>
+</project>


=====================================
debian/rules
=====================================
@@ -2,3 +2,8 @@
 
 %:
 	dh $@
+
+execute_before_dh_auto_configure:
+	cp debian/poms/core_org.eclipse.cdt.core.native_pom.xml core/org.eclipse.cdt.core.native/pom.xml
+	cp debian/poms/core_org.eclipse.cdt.core_pom.xml core/org.eclipse.cdt.core/pom.xml
+	cp debian/poms/util_org.eclipse.cdt.util_pom.xml util/org.eclipse.cdt.util/pom.xml



View it on GitLab: https://salsa.debian.org/java-team/eclipse-cdt/-/compare/dfadd21067c8cea2b860aae3708265232f58b5c6...b726776dac0b78b187329e32284cf92dc73261e7

-- 
View it on GitLab: https://salsa.debian.org/java-team/eclipse-cdt/-/compare/dfadd21067c8cea2b860aae3708265232f58b5c6...b726776dac0b78b187329e32284cf92dc73261e7
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/20200806/0963fe66/attachment.html>

More information about the pkg-java-commits mailing list